diff options
author | David Robillard <d@drobilla.net> | 2007-04-14 18:39:01 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-04-14 18:39:01 +0000 |
commit | 2e8f80e37a7d20deb3f138cd72c26f8c6de9d1ab (patch) | |
tree | a1c6a75636e5119f854155dc718bc9d2cbe6ba93 /libs/midi++2/jack_midiport.cc | |
parent | 959a7909c1adca430a63f783fd16687242a7be3d (diff) |
Merged with trunk R1719.
Updated for Jack MIDI SVN branch (required for now).
git-svn-id: svn://localhost/ardour2/branches/midi@1720 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2/jack_midiport.cc')
-rw-r--r-- | libs/midi++2/jack_midiport.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libs/midi++2/jack_midiport.cc b/libs/midi++2/jack_midiport.cc index 2aad0e072d..4b2808a698 100644 --- a/libs/midi++2/jack_midiport.cc +++ b/libs/midi++2/jack_midiport.cc @@ -15,8 +15,6 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - - $Id: alsa_sequencer_midiport.cc 244 2006-01-06 04:59:17Z essej $ */ #include <fcntl.h> @@ -58,7 +56,7 @@ JACK_MidiPort::cycle_start (nframes_t nframes) Port::cycle_start(nframes); assert(_nframes_this_cycle == nframes); _last_read_index = 0; - jack_midi_clear_buffer(jack_port_get_buffer(_jack_output_port, nframes), nframes); + jack_midi_clear_buffer(jack_port_get_buffer(_jack_output_port, nframes)); } int @@ -71,7 +69,7 @@ JACK_MidiPort::write(byte * msg, size_t msglen, timestamp_t timestamp) // FIXME: return value correct? return jack_midi_event_write ( jack_port_get_buffer(_jack_output_port, _nframes_this_cycle), - timestamp, msg, msglen, _nframes_this_cycle); + timestamp, msg, msglen); } int @@ -85,7 +83,7 @@ JACK_MidiPort::read(byte * buf, size_t max, timestamp_t timestamp) int err = jack_midi_event_get (&ev, jack_port_get_buffer(_jack_input_port, _nframes_this_cycle), - _last_read_index++, _nframes_this_cycle); + _last_read_index++); if (!err) { memcpy(buf, ev.buffer, ev.size); @@ -110,7 +108,7 @@ JACK_MidiPort::create_ports(PortRequest & req) 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), nframes); + jack_port_get_buffer(_jack_output_port, nframes)); ret = ret && (_jack_output_port != NULL); } @@ -119,7 +117,7 @@ JACK_MidiPort::create_ports(PortRequest & req) 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), nframes); + jack_port_get_buffer(_jack_input_port, nframes)); ret = ret && (_jack_input_port != NULL); } |