smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 02:56:35 +01:00
Code Issues Projects Releases Wiki Activity

Fix timing on MIDI import.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3093 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-02-21 00:15:20 +00:00
parent 68bfed0a46
commit 0d0bd81a75
8 changed files with 31 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

21
libs/ardour/smf_source.cc
View file

@ -435,7 +435,7 @@ SMFSource::write_unlocked (MidiRingBuffer& src, nframes_t cnt)
time -= _timeline_position;
const MidiEvent ev(time, size, buf);
append_event_unlocked(ev);
append_event_unlocked(Frames, ev);
if (_model)
_model->append(ev);
@ -454,7 +454,7 @@ SMFSource::write_unlocked (MidiRingBuffer& src, nframes_t cnt)
void
SMFSource::append_event_unlocked(const MidiEvent& ev)
SMFSource::append_event_unlocked(EventTimeUnit unit, const MidiEvent& ev)
{
/*printf("%s - append chan = %u, time = %lf, size = %u, data = ", _path.c_str(),
(unsigned)ev.channel(), ev.time(), ev.size());
@ -466,12 +466,19 @@ SMFSource::append_event_unlocked(const MidiEvent& ev)
assert(ev.time() >= 0);
assert(ev.time() >= _last_ev_time);
// FIXME: assumes tempo never changes after start
const double frames_per_beat = _session.tempo_map().tempo_at(_timeline_position).frames_per_beat(
_session.engine().frame_rate(),
_session.tempo_map().meter_at(_timeline_position));
uint32_t delta_time = 0;
const uint32_t delta_time = (uint32_t)((ev.time() - _last_ev_time) / frames_per_beat * _ppqn);
if (unit == Frames) {
// FIXME: assumes tempo never changes after start
const double frames_per_beat = _session.tempo_map().tempo_at(_timeline_position).frames_per_beat(
_session.engine().frame_rate(),
_session.tempo_map().meter_at(_timeline_position));
delta_time = (uint32_t)((ev.time() - _last_ev_time) / frames_per_beat * _ppqn);
} else {
assert(unit == Beats);
delta_time = (uint32_t)((ev.time() - _last_ev_time) * _ppqn);
}
const size_t stamp_size = write_var_len(delta_time);
fwrite(ev.buffer(), 1, ev.size(), _fd);