X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_events.cc;h=e529c1b94af13f746fb5b552eedb91ed9f70c478;hb=d2fa2450aa287b45d9b58c5ba3cb54544891cdb2;hp=28d1b556f5383e055e9433bc3ea4dfb01e1825cd;hpb=796f6e1302d7c8a7c1c4c3ce35c67923461fd25a;p=ardour.git diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc index 28d1b556f5..e529c1b94a 100644 --- a/libs/ardour/session_events.cc +++ b/libs/ardour/session_events.cc @@ -115,7 +115,7 @@ SessionEventManager::replace_event (SessionEvent::Type type, framepos_t frame, f void SessionEventManager::clear_events (SessionEvent::Type type) { - SessionEvent* ev = new SessionEvent (type, SessionEvent::Clear, 0, 0, 0); + SessionEvent* ev = new SessionEvent (type, SessionEvent::Clear, SessionEvent::Immediate, 0, 0); queue_event (ev); } @@ -125,7 +125,8 @@ SessionEventManager::dump_events () const { cerr << "EVENT DUMP" << endl; for (Events::const_iterator i = events.begin(); i != events.end(); ++i) { - cerr << "\tat " << (*i)->action_frame << ' ' << (*i)->type << " target = " << (*i)->target_frame << endl; + + cerr << "\tat " << (*i)->action_frame << ' ' << enum_2_string ((*i)->type) << " target = " << (*i)->target_frame << endl; } cerr << "Next event: "; @@ -133,12 +134,12 @@ SessionEventManager::dump_events () const cerr << "none" << endl; } else { cerr << "at " << (*next_event)->action_frame << ' ' - << (*next_event)->type << " target = " + << enum_2_string ((*next_event)->type) << " target = " << (*next_event)->target_frame << endl; } cerr << "Immediate events pending:\n"; for (Events::const_iterator i = immediate_events.begin(); i != immediate_events.end(); ++i) { - cerr << "\tat " << (*i)->action_frame << ' ' << (*i)->type << " target = " << (*i)->target_frame << endl; + cerr << "\tat " << (*i)->action_frame << ' ' << enum_2_string((*i)->type) << " target = " << (*i)->target_frame << endl; } cerr << "END EVENT_DUMP" << endl; } @@ -167,7 +168,7 @@ SessionEventManager::merge_event (SessionEvent* ev) /* try to handle immediate events right here */ - if (ev->action_frame == 0) { + if (ev->action_frame == SessionEvent::Immediate) { process_event (ev); return; }