projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c361322
)
Prevent assertion failure if _jack_output_port is 0, which can happen if JACK is...
author
Carl Hetherington
<carl@carlh.net>
Mon, 5 Jul 2010 01:13:52 +0000
(
01:13
+0000)
committer
Carl Hetherington
<carl@carlh.net>
Mon, 5 Jul 2010 01:13:52 +0000
(
01:13
+0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@7371
d708f5d6
-7413-0410-9779-
e7cbd77b26cf
libs/midi++2/jack_midiport.cc
patch
|
blob
|
history
diff --git
a/libs/midi++2/jack_midiport.cc
b/libs/midi++2/jack_midiport.cc
index eb8b6a072a0e5b49537c3f7bad60ee821234187a..07b044f077dfa0ee785634228d2efd436127987f 100644
(file)
--- a/
libs/midi++2/jack_midiport.cc
+++ b/
libs/midi++2/jack_midiport.cc
@@
-132,6
+132,10
@@
JACK_MidiPort::write(byte * msg, size_t msglen, timestamp_t timestamp)
{
int ret = 0;
+ if (!_jack_output_port) {
+ return ret;
+ }
+
if (!is_process_thread()) {
Glib::Mutex::Lock lm (output_fifo_lock);
@@
-162,8
+166,6
@@
JACK_MidiPort::write(byte * msg, size_t msglen, timestamp_t timestamp)
} else {
- assert(_jack_output_port);
-
// XXX This had to be temporarily commented out to make export work again
if (!(timestamp < _nframes_this_cycle)) {
std::cerr << "assertion timestamp < _nframes_this_cycle failed!" << std::endl;