ardour/livetrax
13
0
Fork 0
Code

* I probably better should consult the nominal frame rate to calculate ppqn intervals

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@3666 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Baier 2008-08-06 23:47:21 +00:00
parent 0d077ee676
commit 1d015715a5
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libs/ardour/midi_clock_slave.cc
View File

@ -82,7 +82,7 @@ MIDIClock_Slave::update_midi_clock (Parser& parser)
const Tempo& current_tempo = session.tempo_map().tempo_at(now);
const Meter& current_meter = session.tempo_map().meter_at(now);
double frames_per_beat =
current_tempo.frames_per_beat(session.frame_rate(),
current_tempo.frames_per_beat(session.nominal_frame_rate(),
current_meter);
double quarter_notes_per_beat = 4.0 / current_tempo.note_type();
@ -97,11 +97,9 @@ MIDIClock_Slave::update_midi_clock (Parser& parser)
midi_clock_frame += (long) (one_ppqn_in_frames)
+ session.worst_output_latency();
/*
std::cerr << "got MIDI Clock message at time " << now
<< " result: " << midi_clock_frame
<< " open_ppqn_in_frames: " << one_ppqn_in_frames << std::endl;
*/
<< " midi_clock_frame: " << midi_clock_frame
<< " one_ppqn_in_frames: " << one_ppqn_in_frames << std::endl;
if (first_midi_clock_frame == 0) {
first_midi_clock_frame = midi_clock_frame;