summaryrefslogtreecommitdiff
path: root/libs/ardour/midi_model.cc
diff options
context:
space:
mode:
authorHans Baier <hansfbaier@googlemail.com>2008-05-06 10:49:16 +0000
committerHans Baier <hansfbaier@googlemail.com>2008-05-06 10:49:16 +0000
commit98e653714ee1a5a23c69aa6957b3b04455415777 (patch)
treed8485a2c3cb59728d094a7b0e3ca9d48c2933b69 /libs/ardour/midi_model.cc
parent8c0e27928ab450a6dc73773aaecf11e22811d823 (diff)
* enabled some debugging output :|
git-svn-id: svn://localhost/ardour2/branches/3.0@3321 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/midi_model.cc')
-rw-r--r--libs/ardour/midi_model.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc
index 8545e7cd95..d26630abf8 100644
--- a/libs/ardour/midi_model.cc
+++ b/libs/ardour/midi_model.cc
@@ -161,18 +161,18 @@ const MidiModel::const_iterator& MidiModel::const_iterator::operator++()
assert((_event.is_note() || _event.is_cc() || _event.is_pgm_change() || _event.is_pitch_bender() || _event.is_channel_aftertouch()));
// Increment past current control event
- if (!_event.is_note() && _control_iter != _control_iters.end() && _control_iter->automation_list) {
- double x, y;
- cerr << "control_iter x:" << _control_iter->x << " y:" << _control_iter->y << endl;
+ if (!_event.is_note() && _control_iter != _control_iters.end() && _control_iter->automation_list.get()) {
+ double x = 0.0, y = 0.0;
const bool ret = _control_iter->automation_list->rt_safe_earliest_event_unlocked(
_control_iter->x, DBL_MAX, x, y, false);
+ cerr << "control_iter x:" << _control_iter->x << " y:" << _control_iter->y << endl;
if (ret) {
- //cerr << "Incremented " << _control_iter->automation_list->parameter().id() << " to " << x << endl;
+ cerr << "Incremented " << _control_iter->automation_list->parameter().id() << " to " << x << endl;
_control_iter->x = x;
_control_iter->y = y;
} else {
- //cerr << "Hit end of " << _control_iter->automation_list->parameter().id() << endl;
+ cerr << "Hit end of " << _control_iter->automation_list->parameter().id() << endl;
_control_iter->automation_list.reset();
_control_iter->x = DBL_MAX;
}