ardour/livetrax
13
0
Fork 0
Code

Prevent assertion failure if _jack_output_port is 0, which can happen if JACK is disconnected. Improves #3301.

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@7371 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2010-07-05 01:13:52 +00:00
parent c36132271b
commit 839402778f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/midi++2/jack_midiport.cc
View File

@ -132,6 +132,10 @@ JACK_MidiPort::write(byte * msg, size_t msglen, timestamp_t timestamp)
{ {
int ret = 0; int ret = 0;
if (!_jack_output_port) {
return ret;
}
if (!is_process_thread()) { if (!is_process_thread()) {
Glib::Mutex::Lock lm (output_fifo_lock); Glib::Mutex::Lock lm (output_fifo_lock);
@ -162,8 +166,6 @@ JACK_MidiPort::write(byte * msg, size_t msglen, timestamp_t timestamp)
} else { } else {
assert(_jack_output_port);
// XXX This had to be temporarily commented out to make export work again // 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 << "assertion timestamp < _nframes_this_cycle failed!" << std::endl; std::cerr << "assertion timestamp < _nframes_this_cycle failed!" << std::endl;