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

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

diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc
index 9b1ba935acc65cc1d98f3d43f81d0aaf85158e30..db33902fd3bf44318e13e524081c53330a66dc59 100644 (file)
--- a/libs/ardour/midi_clock_slave.cc
+++ b/libs/ardour/midi_clock_slave.cc
@@ -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;