1 files changed, 164 insertions, 50 deletions

diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index 4f66128943..0a4081bec7 100644
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -32,12 +32,80 @@
 #include "ardour/debug.h"
 
 using namespace ARDOUR;
+using namespace PBD;
+
+/** MIDI Clock Position tracking */
+class MidiClockTicker::Position : public Timecode::BBT_Time
+{
+public:
+
+	Position() : speed(0.0f), frame(0) { }
+	~Position() { }
+
+	/** Sync timing information taken from the given Session
+		@return True if timings differed */
+	bool sync (Session* s) {
+
+		bool didit = false;
+
+		double     sp = s->transport_speed();
+		framecnt_t fr = s->transport_frame();
+
+		if (speed != sp) {
+			speed = sp;
+			didit = true;
+		}
+
+		if (frame != fr) {
+			frame = fr;
+			didit = true;
+		}
+
+		/* Midi beats and clocks always gets updated for now */
+
+		s->bbt_time (this->frame, *this);
+
+		const TempoMap& tempo = s->tempo_map();
+
+		const double divisions   = tempo.meter_at(frame).divisions_per_bar();
+		const double divisor     = tempo.meter_at(frame).note_divisor();
+		const double qnote_scale = divisor * 0.25f;
+
+		/** Midi Beats in terms of Song Position Pointer is equivalent to total
+			sixteenth notes at 'time' */
+
+		midi_beats  = (((bars - 1) * divisions) + beats - 1);
+		midi_beats += (double)ticks / (double)Position::ticks_per_beat * qnote_scale;
+		midi_beats *= 16.0f / divisor;
+
+		midi_clocks = midi_beats * 6.0f;
+
+		return didit;
+	}
+
+	double      speed;
+	framecnt_t  frame;
+	double      midi_beats;
+	double      midi_clocks;
+
+	void print (std::ostream& s) {
+		s << "frames: " << frame << " midi beats: " << midi_beats << " speed: " << speed;
+	}
+};
+
 
 MidiClockTicker::MidiClockTicker ()
 	: _midi_port (0)
 	, _ppqn (24)
 	, _last_tick (0.0)
 {
+	_pos.reset (new Position());
+}
+
+MidiClockTicker::~MidiClockTicker()
+{
+	_midi_port = 0;
+	_pos.reset (0);
 }
 
 void
@@ -49,11 +117,53 @@ MidiClockTicker::set_session (Session* s)
 		 _session->TransportStateChange.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_state_changed, this));
 		 _session->PositionChanged.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::position_changed, this, _1));
 		 _session->TransportLooped.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::transport_looped, this));
+		 _session->Located.connect_same_thread (_session_connections, boost::bind (&MidiClockTicker::session_located, this));
+
 		 update_midi_clock_port();
+		 _pos->sync (_session);
 	 }
 }
 
 void
+MidiClockTicker::session_located()
+{
+	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Session Located: %1, speed: %2\n", _session->transport_frame(), _session->transport_speed()));
+
+	if (0 == _session || ! _pos->sync (_session)) {
+		return;
+	}
+
+	_last_tick = _pos->frame;
+
+	if (!Config->get_send_midi_clock()) {
+		return;
+	}
+
+	if (_pos->speed == 0.0f) {
+		uint32_t where = llrint (_pos->midi_beats);
+		send_position_event (where, 0);
+	} else if (_pos->speed == 1.0f) {
+#if 1
+		/* Experimental.  To really do this and have accuracy, the
+		   stop/locate/continue sequence would need queued to send immediately
+		   before the next midi clock. */
+
+		send_stop_event (0);
+
+		if (_pos->frame == 0) {
+			send_start_event (0);
+		} else {
+			uint32_t where = llrint (_pos->midi_beats);
+			send_position_event (where, 0);
+			send_continue_event (0);
+		}
+#endif
+	} else {
+		/* Varispeed not supported */
+	}
+}
+
+void
 MidiClockTicker::session_going_away ()
 {
 	SessionHandlePtr::session_going_away();
@@ -79,56 +189,61 @@ MidiClockTicker::transport_state_changed()
 		return;
 	}
 
-	float      speed    = _session->transport_speed();
-	framepos_t position = _session->transport_frame();
+	if (! _pos->sync (_session)) {
+		return;
+	}
 
-	DEBUG_TRACE (PBD::DEBUG::MidiClock,
-		 string_compose ("Transport state change @ %4, speed: %1 position: %2 play loop: %3\n", speed, position, _session->get_play_loop(), position)
+	DEBUG_TRACE (DEBUG::MidiClock,
+		 string_compose ("Transport state change @ %4, speed: %1 position: %2 play loop: %3\n",
+							_pos->speed, _pos->frame, _session->get_play_loop(), _pos->frame)
 	);
 
-	if (speed == 1.0f) {
-		_last_tick = position;
+	_last_tick = _pos->frame;
+
+	if (! Config->get_send_midi_clock()) {
+		return;
+	}
 
-		if (!Config->get_send_midi_clock())
-			return;
+	if (_pos->speed == 1.0f) {
 
 		if (_session->get_play_loop()) {
 			assert(_session->locations()->auto_loop_location());
-			if (position == _session->locations()->auto_loop_location()->start()) {
+
+			if (_pos->frame == _session->locations()->auto_loop_location()->start()) {
 				send_start_event(0);
 			} else {
 				send_continue_event(0);
 			}
-		} else if (position == 0) {
+
+		} else if (_pos->frame == 0) {
 			send_start_event(0);
 		} else {
 			send_continue_event(0);
 		}
 
-		send_midi_clock_event(0);
+		// send_midi_clock_event (0);
 
-	} else if (speed == 0.0f) {
-		if (!Config->get_send_midi_clock())
-			return;
-
-		send_stop_event(0);
-		send_position_event (position, 0);
+	} else if (_pos->speed == 0.0f) {
+		send_stop_event (0);
+		send_position_event (llrint (_pos->midi_beats), 0);
 	}
 
-	tick (position);
+	// tick (_pos->frame);
 }
 
 void
-MidiClockTicker::position_changed (framepos_t position)
+MidiClockTicker::position_changed (framepos_t)
 {
+#if 0
 	const double speed = _session->transport_speed();
-	DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Transport Position Change: %1, speed: %2\n", position, speed));
+	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Transport Position Change: %1, speed: %2\n", position, speed));
 
 	if (speed == 0.0f && Config->get_send_midi_clock()) {
 		send_position_event (position, 0);
 	}
 
 	_last_tick = position;
+#endif
 }
 
 void
@@ -137,7 +252,7 @@ MidiClockTicker::transport_looped()
 	Location* loop_location = _session->locations()->auto_loop_location();
 	assert(loop_location);
 
-	DEBUG_TRACE (PBD::DEBUG::MidiClock,
+	DEBUG_TRACE (DEBUG::MidiClock,
 		     string_compose ("Transport looped, position: %1, loop start: %2, loop end: %3, play loop: %4\n",
 				     _session->transport_frame(), loop_location->start(), loop_location->end(), _session->get_play_loop())
 		);
@@ -155,23 +270,28 @@ MidiClockTicker::transport_looped()
 }
 
 void
-MidiClockTicker::tick (const framepos_t& transport_frame)
+MidiClockTicker::tick (const framepos_t& /* transport_frame */)
 {
 	if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0) {
 		return;
 	}
 
+	MIDI::JackMIDIPort* mp = dynamic_cast<MIDI::JackMIDIPort*> (_midi_port);
+	if (! mp) {
+		return;
+	}
+
+	const framepos_t end = _pos->frame + mp->nframes_this_cycle();
+	double iter = _last_tick;
+
 	while (true) {
-		double next_tick = _last_tick + one_ppqn_in_frames (transport_frame);
-		frameoffset_t next_tick_offset = llrint (next_tick) - transport_frame;
+		double clock_delta = one_ppqn_in_frames (llrint (iter));
+		double next_tick   = iter + clock_delta;
+		frameoffset_t next_tick_offset = llrint (next_tick) - end;
 
-		MIDI::JackMIDIPort* mp = dynamic_cast<MIDI::JackMIDIPort*> (_midi_port);
-		
-		/*
-		DEBUG_TRACE (PBD::DEBUG::MidiClock,
-			     string_compose ("Transport: %1, last tick time: %2, next tick time: %3, offset: %4, cycle length: %5\n",
-					     transport_frame, _last_tick, next_tick, next_tick_offset, mp ? mp->nframes_this_cycle() : 0));
-		*/
+		DEBUG_TRACE (DEBUG::MidiClock,
+				 string_compose ("Tick: iter: %1, last tick time: %2, next tick time: %3, offset: %4, cycle length: %5\n",
+						 iter, _last_tick, next_tick, next_tick_offset, mp ? mp->nframes_this_cycle() : 0));
 
 		if (!mp || (next_tick_offset >= mp->nframes_this_cycle())) {
 			break;
@@ -181,10 +301,14 @@ MidiClockTicker::tick (const framepos_t& transport_frame)
 			send_midi_clock_event (next_tick_offset);
 		}
 
-		_last_tick = next_tick;
+		iter = next_tick;
 	}
+
+	_last_tick  = iter;
+	_pos->frame = end;
 }
 
+
 double
 MidiClockTicker::one_ppqn_in_frames (framepos_t transport_position)
 {
@@ -204,7 +328,7 @@ MidiClockTicker::send_midi_clock_event (pframes_t offset)
 		return;
 	}
 
-	// DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Tick with offset %1\n", offset));
+	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Tick with offset %1\n", offset));
 
 	static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CLOCK };
 	_midi_port->write (_midi_clock_tick, 1, offset);
@@ -217,7 +341,7 @@ MidiClockTicker::send_start_event (pframes_t offset)
 		return;
 	}
 
-	DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Start %1\n", _last_tick));
+	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Start %1\n", _last_tick));
 
 	static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_START };
 	_midi_port->write (_midi_clock_tick, 1, offset);
@@ -230,7 +354,7 @@ MidiClockTicker::send_continue_event (pframes_t offset)
 		return;
 	}
 
-	DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Continue %1\n", _last_tick));
+	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Continue %1\n", _last_tick));
 
 	static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CONTINUE };
 	_midi_port->write (_midi_clock_tick, 1, offset);
@@ -243,29 +367,19 @@ MidiClockTicker::send_stop_event (pframes_t offset)
 		return;
 	}
 
-	DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Stop %1\n", _last_tick));
+	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Stop %1\n", _last_tick));
 
 	static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_STOP };
 	_midi_port->write (_midi_clock_tick, 1, offset);
 }
 
 void
-MidiClockTicker::send_position_event (framepos_t transport_position, pframes_t offset)
+MidiClockTicker::send_position_event (uint32_t midi_beats, pframes_t offset)
 {
-	if (_midi_port == 0 || _session == 0 || _session->engine().freewheeling()) {
+	if (!_midi_port) {
 		return;
 	}
 
-	const TempoMap& tempo = _session->tempo_map();
-
-	Timecode::BBT_Time time;
-	_session->bbt_time (transport_position, time);
-	const double beats_per_bar = tempo.meter_at(transport_position).divisions_per_bar();
-
-	/* Midi Beats in terms of Song Position Pointer is equivalent to total
-	   sixteenth notes at 'time' */
-	const uint32_t midi_beats = 4 * (((time.bars - 1) * beats_per_bar) + time.beats - 1);
-
 	/* can only use 14bits worth */
 	if (midi_beats > 0x3fff) {
 		return;
@@ -278,7 +392,7 @@ MidiClockTicker::send_position_event (framepos_t transport_position, pframes_t o
 		midi_beats & 0x3f80
 	};
 
-	DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Song Position: %1\n", midi_beats));
-
 	_midi_port->midimsg (msg, sizeof (msg), offset);
+
+	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Song Position Sent: %1\n", midi_beats));
 }