diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-11 15:54:41 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-11 15:54:41 +0000 |
| commit | 0c7bd6e333459d7e92ae43bd88d9dba85fac1fc3 (patch) | |
| tree | ba02a4c0f77c550297a0093adfb35220085d4573 | |
| parent | 414cc08d6aac297e560ce67e539e215733b41739 (diff) | |
fix uninitialized variable causing error delivering various MIDI messages at frame zero
git-svn-id: svn://localhost/ardour2/branches/3.0@13640 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/midi++2/jack_midi_port.cc | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/libs/midi++2/jack_midi_port.cc b/libs/midi++2/jack_midi_port.cc index ff26a84e4b..05df3171fa 100644 --- a/libs/midi++2/jack_midi_port.cc +++ b/libs/midi++2/jack_midi_port.cc @@ -54,6 +54,7 @@ JackMIDIPort::JackMIDIPort (string const & name, Flags flags, jack_client_t* jac , _nframes_this_cycle (0) , _jack_client (jack_client) , _jack_port (0) + , _last_write_timestamp (0) , output_fifo (512) , input_fifo (1024) , xthread (true) @@ -68,6 +69,7 @@ JackMIDIPort::JackMIDIPort (const XMLNode& node, jack_client_t* jack_client) , _nframes_this_cycle (0) , _jack_client (jack_client) , _jack_port (0) + , _last_write_timestamp (0) , output_fifo (512) , input_fifo (1024) , xthread (true) @@ -255,8 +257,7 @@ JackMIDIPort::write (const byte * msg, size_t msglen, timestamp_t timestamp) } else { - // XXX This had to be temporarily commented out to make export work again - if (!(timestamp < _nframes_this_cycle)) { + if (timestamp >= _nframes_this_cycle) { std::cerr << "attempting to write MIDI event of " << msglen << " bytes at time " << timestamp << " of " << _nframes_this_cycle << " (this will not work - needs a code fix)" @@ -268,17 +269,21 @@ JackMIDIPort::write (const byte * msg, size_t msglen, timestamp_t timestamp) timestamp = _last_write_timestamp; } - if (jack_midi_event_write (jack_port_get_buffer (_jack_port, _nframes_this_cycle), - timestamp, msg, msglen) == 0) { + if ((ret = jack_midi_event_write (jack_port_get_buffer (_jack_port, _nframes_this_cycle), + timestamp, msg, msglen)) == 0) { ret = msglen; _last_write_timestamp = timestamp; } else { - ret = 0; - cerr << "write of " << msglen << " failed, port holds " + cerr << "write of " << msglen << " @ " << timestamp << " failed, port holds " << jack_midi_get_event_count (jack_port_get_buffer (_jack_port, _nframes_this_cycle)) - << endl; - // PBD::stacktrace (cerr, 20); + << " port is " << _jack_port + << " ntf = " << _nframes_this_cycle + << " buf = " << jack_port_get_buffer (_jack_port, _nframes_this_cycle) + << " ret = " << ret + << endl; + PBD::stacktrace (cerr, 20); + ret = 0; } } else { cerr << "write to JACK midi port failed: not currently in a process cycle." << endl; |