diff options
| author | David Robillard <d@drobilla.net> | 2007-01-09 23:24:54 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-01-09 23:24:54 +0000 |
| commit | 532f6aad4ac79ca15d69deccd18fca90e444c437 (patch) | |
| tree | 0d4ca5449af8eb48ad56e163efcab42c4656e8de /libs/midi++2 | |
| parent | ef6b25432d9c46d71b08c0f7d5f2686df428c4e8 (diff) | |
Merged with trunk R1283.
NOTE: Compiles, but broken (crash on adding MIDI track).
git-svn-id: svn://localhost/ardour2/branches/midi@1292 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2')
| -rw-r--r-- | libs/midi++2/SConscript | 2 | ||||
| -rw-r--r-- | libs/midi++2/jack_midiport.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/midi++2/SConscript b/libs/midi++2/SConscript index 477d49c6ca..e9fbc0abf5 100644 --- a/libs/midi++2/SConscript +++ b/libs/midi++2/SConscript @@ -57,7 +57,7 @@ libmidi2 = midi2.SharedLibrary('midi++', [ sources, sysdep_src ]) Default(libmidi2) -env.Alias('install', env.Install(os.path.join(install_prefix, 'lib/ardour2'), libmidi2)) +env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libmidi2)) env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript' ] + sources + sysdep_sources + diff --git a/libs/midi++2/jack_midiport.cc b/libs/midi++2/jack_midiport.cc index 4fc24e8711..2aad0e072d 100644 --- a/libs/midi++2/jack_midiport.cc +++ b/libs/midi++2/jack_midiport.cc @@ -109,7 +109,7 @@ 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_reset_new_port( + jack_midi_clear_buffer( jack_port_get_buffer(_jack_output_port, nframes), nframes); ret = ret && (_jack_output_port != NULL); } @@ -118,7 +118,7 @@ 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_reset_new_port( + jack_midi_clear_buffer( jack_port_get_buffer(_jack_input_port, nframes), nframes); ret = ret && (_jack_input_port != NULL); } |