diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-17 08:44:51 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-09-17 08:44:51 +0000 |
| commit | 1c299d5a5c493986ca4a19bd55a69281dabada86 (patch) | |
| tree | dae18913a2261a157ba32308ef804050e1232542 /libs/midi++2/jack_midiport.cc | |
| parent | 8e9a83dfdc233898e7c470667c7c9b797c83fe8b (diff) | |
merge Sakari's (sbergen) branch back into 3.0, removing libsndfile and adding taglib
git-svn-id: svn://localhost/ardour2/branches/3.0@3736 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/midi++2/jack_midiport.cc')
| -rw-r--r-- | libs/midi++2/jack_midiport.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libs/midi++2/jack_midiport.cc b/libs/midi++2/jack_midiport.cc index 5b9fb79a4f..bcaa683bf8 100644 --- a/libs/midi++2/jack_midiport.cc +++ b/libs/midi++2/jack_midiport.cc @@ -116,7 +116,11 @@ JACK_MidiPort::write(byte * msg, size_t msglen, timestamp_t timestamp) } else { assert(_jack_output_port); - assert(timestamp < _nframes_this_cycle); + + // 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; + } if (_currently_in_cycle) { if (timestamp == 0) { |