Fix off-by-one in body_range().

[ardour.git] / libs / ardour / midi_clock_slave.cc

diff --git a/libs/ardour/midi_clock_slave.cc b/libs/ardour/midi_clock_slave.cc
index 588f7c63d613f0f9a9e8c996b0346573b2f804e8..05c0e9e2ac866570b1396e46dc5a0526fe1cbc51 100644 (file)
--- a/libs/ardour/midi_clock_slave.cc
+++ b/libs/ardour/midi_clock_slave.cc
@@ -26,17 +26,14 @@
 #include "pbd/error.h"
 #include "pbd/failed_constructor.h"
 #include "pbd/pthread_utils.h"
+#include "pbd/convert.h"
 
 #include "midi++/port.h"
 
 #include "ardour/debug.h"
 #include "ardour/slave.h"
-#include "ardour/session.h"
-#include "ardour/audioengine.h"
-#include "ardour/cycles.h"
 #include "ardour/tempo.h"
 
-
 #include "i18n.h"
 
 using namespace std;
@@ -86,10 +83,7 @@ void
 MIDIClock_Slave::calculate_one_ppqn_in_frames_at(framepos_t time)
 {
        const Tempo& current_tempo = session->tempo_map().tempo_at(time);
-       const Meter& current_meter = session->tempo_map().meter_at(time);
-       double frames_per_beat =
-               current_tempo.frames_per_beat(session->frame_rate(),
-                                             current_meter);
+       double frames_per_beat = current_tempo.frames_per_beat(session->frame_rate());
 
        double quarter_notes_per_beat = 4.0 / current_tempo.note_type();
        double frames_per_quarter_note = frames_per_beat / quarter_notes_per_beat;
@@ -182,7 +176,7 @@ MIDIClock_Slave::update_midi_clock (Parser& /*parser*/, framepos_t timestamp)
                                                       t1 * session->frame_rate(),
                                                       session->frame_rate(),
                                                       ((t1 - t0) * session->frame_rate()) / one_ppqn_in_frames));
-       
+
        last_timestamp = timestamp;
 }
 
@@ -209,7 +203,7 @@ MIDIClock_Slave::reset ()
 
        _starting = true;
        _started  = true;
-       
+
        // session->request_locate(0, false);
 }
 
@@ -332,7 +326,7 @@ MIDIClock_Slave::speed_and_position (double& speed, framepos_t& pos)
 
        // calculate speed
        speed = ((t1 - t0) * session->frame_rate()) / one_ppqn_in_frames;
-       
+
        // provide a 3% deadzone to lock the speed
        if (fabs(speed - 1.0) <= 0.03)
                speed = 1.0;