smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 09:06:33 +01:00
Code Issues Projects Releases Wiki Activity

Fix loading midi controller data.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3788 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-09-22 16:59:32 +00:00
parent f8e50ac938
commit a23d6cd50c
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/ardour/smf_source.cc
View file

@ -952,6 +952,7 @@ SMFSource::load_model(bool lock, bool force_reload)
if (ret > 0) { // didn't skip (meta) event if (ret > 0) { // didn't skip (meta) event
// make ev.time absolute time in frames // make ev.time absolute time in frames
ev.time() = (double)time * frames_per_beat / (double)_ppqn; ev.time() = (double)time * frames_per_beat / (double)_ppqn;
ev.set_event_type(EventTypeMap::instance().midi_event_type(buf[0]));
_model->append(ev); _model->append(ev);
} }

4
libs/evoral/src/ControlList.cpp
View file

@ -1100,9 +1100,9 @@ ControlList::rt_safe_earliest_event_linear_unlocked (double start, double end, d
x = first->when + (y - first->value) / (double)slope; x = first->when + (y - first->value) / (double)slope;
} }
cerr << first->value << " @ " << first->when << " ... " /*cerr << first->value << " @ " << first->when << " ... "
<< next->value << " @ " << next->when << next->value << " @ " << next->when
<< " = " << y << " @ " << x << endl; << " = " << y << " @ " << x << endl;*/
assert( (y >= first->value && y <= next->value) assert( (y >= first->value && y <= next->value)
|| (y <= first->value && y >= next->value) ); || (y <= first->value && y >= next->value) );