diff options
| author | David Robillard <d@drobilla.net> | 2007-05-04 02:50:31 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-05-04 02:50:31 +0000 |
| commit | b8e9b3f071e294488eb03f9e13adc333352909bb (patch) | |
| tree | a242bef63b3ead0d86ab258cc50ba32bb7e250f5 /libs/midi++2 | |
| parent | acdfe9857a7b84ca151f3ab696ea696d6c778dca (diff) | |
Real fix for Jack MIDI crash. Maybe!
git-svn-id: svn://localhost/ardour2/branches/midi@1782 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2')
| -rw-r--r-- | libs/midi++2/jack_midiport.cc | 10 | ||||
| -rw-r--r-- | libs/midi++2/midi++/jackcompat.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libs/midi++2/jack_midiport.cc b/libs/midi++2/jack_midiport.cc index 98d29351b5..3db96a214c 100644 --- a/libs/midi++2/jack_midiport.cc +++ b/libs/midi++2/jack_midiport.cc @@ -100,7 +100,7 @@ JACK_MidiPort::create_ports(PortRequest & req) assert(!_jack_input_port); assert(!_jack_output_port); - //jack_nframes_t nframes = jack_get_buffer_size(_jack_client); + jack_nframes_t nframes = jack_get_buffer_size(_jack_client); bool ret = true; @@ -108,8 +108,8 @@ JACK_MidiPort::create_ports(PortRequest & req) _jack_output_port = jack_port_register(_jack_client, string(req.tagname).append("_out").c_str(), JACK_DEFAULT_MIDI_TYPE, JackPortIsOutput, 0); - //jack_midi_clear_buffer( - // jack_port_get_buffer(_jack_output_port, nframes)); + jack_midi_clear_buffer( + jack_port_get_buffer(_jack_output_port, nframes)); ret = ret && (_jack_output_port != NULL); } @@ -117,8 +117,8 @@ JACK_MidiPort::create_ports(PortRequest & req) _jack_input_port = jack_port_register(_jack_client, string(req.tagname).append("_in").c_str(), JACK_DEFAULT_MIDI_TYPE, JackPortIsInput, 0); - //jack_midi_clear_buffer( - // jack_port_get_buffer(_jack_input_port, nframes)); + jack_midi_clear_buffer( + jack_port_get_buffer(_jack_input_port, nframes)); ret = ret && (_jack_input_port != NULL); } diff --git a/libs/midi++2/midi++/jackcompat.h b/libs/midi++2/midi++/jackcompat.h index f1b748ea66..bf179f7333 100644 --- a/libs/midi++2/midi++/jackcompat.h +++ b/libs/midi++2/midi++/jackcompat.h @@ -18,7 +18,7 @@ #ifndef JACK_COMPAT_H #define JACK_COMPAT_H -#define JACK_MIDI_NEEDS_NFRAMES +//#define JACK_MIDI_NEEDS_NFRAMES #if defined(JACK_MIDI_NEEDS_NFRAMES) |