Fix loading midi controller data.

git-svn-id: svn://localhost/ardour2/branches/3.0@3788 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc
index 03a8b98199343bce9289065704f375c8a4e6fa23..7b579c1fb48640a03be1c204ba6e89c16990e488 100644 (file)
--- a/libs/ardour/smf_source.cc
+++ b/libs/ardour/smf_source.cc
@@ -952,6 +952,7 @@ SMFSource::load_model(bool lock, bool force_reload)
                if (ret > 0) { // didn't skip (meta) event
                        // make ev.time absolute time in frames
                        ev.time() = (double)time * frames_per_beat / (double)_ppqn;
+                       ev.set_event_type(EventTypeMap::instance().midi_event_type(buf[0]));
                        _model->append(ev);
                }
 

diff --git a/libs/evoral/src/ControlList.cpp b/libs/evoral/src/ControlList.cpp
index 63d96083d4e078fa34b2a150ad79f1ba611b64f1..b84586ab738473b32a860d91f4958e7056d9ba41 100644 (file)
--- a/libs/evoral/src/ControlList.cpp
+++ b/libs/evoral/src/ControlList.cpp
@@ -1100,9 +1100,9 @@ ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, d
                        x = first->when + (y - first->value) / (double)slope;
                }
 
-               cerr << first->value << " @ " << first->when << " ... "
+               /*cerr << first->value << " @ " << first->when << " ... "
                                << next->value << " @ " << next->when
-                               << " = " << y << " @ " << x << endl;
+                               << " = " << y << " @ " << x << endl;*/
 
                assert(    (y >= first->value && y <= next->value)
                                || (y <= first->value && y >= next->value) );