X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fticker.cc;h=def219a4331654aea57d154fc2ce808c7318ddc3;hp=15326af88242485d28c2122098f7e7719b3aac49;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=658bb3ccd43658de18fbd43cd91a8e66650e27a7

diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index 15326af882..def219a433 100644
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -25,6 +25,7 @@
 #include "ardour/audioengine.h"
 #include "ardour/midi_buffer.h"
 #include "ardour/midi_port.h"
+#include "ardour/lmath.h"
 #include "ardour/ticker.h"
 #include "ardour/session.h"
 #include "ardour/tempo.h"
@@ -40,18 +41,18 @@ public:
 
     Position() : speed(0.0f), frame(0), midi_beats(0) { }
     ~Position() { }
-    
+
     /** Sync timing information taken from the given Session
-     * @return True if timings differed 
+     * @return True if timings differed
      */
 
     bool sync (Session* s) {
 
 	    bool changed = false;
-	    
+
 	    double     sp = s->transport_speed();
 	    framecnt_t fr = s->transport_frame();
-	    
+
 	    if (speed != sp) {
 		    speed = sp;
 		    changed = true;
@@ -67,14 +68,15 @@ public:
 	    s->bbt_time (this->frame, *this);
 
 	    const TempoMap& tempo = s->tempo_map();
+	    const Meter& meter = tempo.meter_at_frame (frame);
 
-	    const double divisions   = tempo.meter_at(frame).divisions_per_bar();
-	    const double divisor     = tempo.meter_at(frame).note_divisor();
+	    const double divisions   = meter.divisions_per_bar();
+	    const double divisor     = meter.note_divisor();
 	    const double qnote_scale = divisor * 0.25f;
 	    double mb;
 
 	    /** Midi Beats in terms of Song Position Pointer is equivalent to total
-	     * sixteenth notes at 'time' 
+	     * sixteenth notes at 'time'
 	     */
 
 	    mb  = (((bars - 1) * divisions) + beats - 1);
@@ -94,7 +96,7 @@ public:
     framecnt_t  frame;
     double      midi_beats;
     double      midi_clocks;
-    
+
     void print (std::ostream& s) {
 	    s << "frames: " << frame << " midi beats: " << midi_beats << " speed: " << speed;
     }
@@ -119,7 +121,7 @@ void
 MidiClockTicker::set_session (Session* s)
 {
 	SessionHandlePtr::set_session (s);
-	
+
 	 if (_session) {
 		 _session->TransportStateChange.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_state_changed, this));
 		 _session->TransportLooped.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_looped, this));
@@ -229,7 +231,7 @@ MidiClockTicker::tick (const framepos_t& /* transport_frame */, pframes_t nframe
 			send_position_event (llrint (_pos->midi_beats), 0, nframes);
 		} else if (_pos->speed == 1.0f) {
 			send_stop_event (0, nframes);
-			
+
 			if (_pos->frame == 0) {
 				send_start_event (0, nframes);
 			} else {
@@ -248,21 +250,21 @@ MidiClockTicker::tick (const framepos_t& /* transport_frame */, pframes_t nframe
 		if (_pos->speed == 1.0f) {
 			if (_session->get_play_loop()) {
 				assert(_session->locations()->auto_loop_location());
-				
+
 				if (_pos->frame == _session->locations()->auto_loop_location()->start()) {
 					send_start_event (0, nframes);
 				} else {
 					send_continue_event (0, nframes);
 				}
-				
+
 			} else if (_pos->frame == 0) {
 				send_start_event (0, nframes);
 			} else {
 				send_continue_event (0, nframes);
 			}
-			
+
 			// send_midi_clock_event (0);
-			
+
 		} else if (_pos->speed == 0.0f) {
 			send_stop_event (0, nframes);
 			send_position_event (llrint (_pos->midi_beats), 0, nframes);
@@ -306,8 +308,8 @@ MidiClockTicker::tick (const framepos_t& /* transport_frame */, pframes_t nframe
 double
 MidiClockTicker::one_ppqn_in_frames (framepos_t transport_position)
 {
-	const Tempo& current_tempo = _session->tempo_map().tempo_at (transport_position);
-	double frames_per_beat = current_tempo.frames_per_beat (_session->nominal_frame_rate());
+	const Tempo& current_tempo = _session->tempo_map().tempo_at_frame (transport_position);
+	double frames_per_beat = _session->tempo_map().frames_per_beat_at (transport_position, _session->nominal_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;