diff options
| author | David Robillard <d@drobilla.net> | 2008-09-22 16:59:32 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-09-22 16:59:32 +0000 |
| commit | a23d6cd50cddc3a4db9a34bb7805d12771ebacb9 (patch) | |
| tree | 8b2bd62688a4de03752f771f4abfe4ae463e569a /libs | |
| parent | f8e50ac938e94c000b0e3d0e792630bdfdce7a3c (diff) | |
Fix loading midi controller data.
git-svn-id: svn://localhost/ardour2/branches/3.0@3788 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ardour/smf_source.cc | 1 | ||||
| -rw-r--r-- | libs/evoral/src/ControlList.cpp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index 03a8b98199..7b579c1fb4 100644 --- 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 63d96083d4..b84586ab73 100644 --- 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) ); |