X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fticker.cc;h=e02143e401f1764b8be388e4109e579df11e313e;hb=7239cb09d909b7525c3f901d947484c0768a7ef9;hp=9f58a9cd887ff41fc94bafd2e610448ee6cb2ce0;hpb=ce85a4d847b1b935f42e0643083b1b363cce5a6b;p=ardour.git

diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc
index 9f58a9cd88..e02143e401 100644
--- a/libs/ardour/ticker.cc
+++ b/libs/ardour/ticker.cc
@@ -19,13 +19,13 @@
 #include "pbd/compose.h"
 #include "pbd/stacktrace.h"
 
-#include "midi++/port.h"
-#include "midi++/jack_midi_port.h"
-#include "midi++/manager.h"
-
 #include "evoral/midi_events.h"
 
+#include "ardour/async_midi_port.h"
 #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"
@@ -39,72 +39,80 @@ class MidiClockTicker::Position : public Timecode::BBT_Time
 {
 public:
 
-	Position() : speed(0.0f), frame(0) { }
-	~Position() { }
+    Position() : speed(0.0f), frame(0), midi_beats(0) { }
+    ~Position() { }
 
-	/** Sync timing information taken from the given Session
-		@return True if timings differed */
-	bool sync (Session* s) {
+    /** Sync timing information taken from the given Session
+     * @return True if timings differed
+     */
 
-		bool didit = false;
+    bool sync (Session* s) {
 
-		double     sp = s->transport_speed();
-		framecnt_t fr = s->transport_frame();
+	    bool changed = false;
 
-		if (speed != sp) {
-			speed = sp;
-			didit = true;
-		}
+	    double     sp = s->transport_speed();
+	    framecnt_t fr = s->transport_frame();
 
-		if (frame != fr) {
-			frame = fr;
-			didit = true;
-		}
+	    if (speed != sp) {
+		    speed = sp;
+		    changed = true;
+	    }
 
-		/* Midi beats and clocks always gets updated for now */
+	    if (frame != fr) {
+		    frame = fr;
+		    changed = true;
+	    }
 
-		s->bbt_time (this->frame, *this);
+	    /* Midi beats and clocks always gets updated for now */
 
-		const TempoMap& tempo = s->tempo_map();
+	    s->bbt_time (this->frame, *this);
 
-		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;
+	    const TempoMap& tempo = s->tempo_map();
 
-		/** Midi Beats in terms of Song Position Pointer is equivalent to total
-			sixteenth notes at 'time' */
+	    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;
+	    double mb;
 
-		midi_beats  = (((bars - 1) * divisions) + beats - 1);
-		midi_beats += (double)ticks / (double)Position::ticks_per_beat * qnote_scale;
-		midi_beats *= 16.0f / divisor;
+	    /** Midi Beats in terms of Song Position Pointer is equivalent to total
+	     * sixteenth notes at 'time'
+	     */
 
-		midi_clocks = midi_beats * 6.0f;
+	    mb  = (((bars - 1) * divisions) + beats - 1);
+	    mb += (double)ticks / (double)Position::ticks_per_beat * qnote_scale;
+	    mb *= 16.0f / divisor;
 
-		return didit;
-	}
+	    if (mb != midi_beats) {
+		    midi_beats = mb;
+		    midi_clocks = midi_beats * 6.0f;
+		    changed = true;
+	    }
 
-	double      speed;
-	framecnt_t  frame;
-	double      midi_beats;
-	double      midi_clocks;
+	    return changed;
+    }
 
-	void print (std::ostream& s) {
-		s << "frames: " << frame << " midi beats: " << midi_beats << " speed: " << speed;
-	}
+    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)
+	: _ppqn (24)
 	, _last_tick (0.0)
+	, _send_pos (false)
+	, _send_state (false)
 {
 	_pos.reset (new Position());
 }
 
 MidiClockTicker::~MidiClockTicker()
 {
-	_midi_port = 0;
 	_pos.reset (0);
 }
 
@@ -112,10 +120,9 @@ 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->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));
 
@@ -129,7 +136,7 @@ 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)) {
+	if (!_session || !_pos->sync (_session)) {
 		return;
 	}
 
@@ -139,41 +146,20 @@ MidiClockTicker::session_located()
 		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 */
-	}
+	_send_pos = true;
 }
 
 void
 MidiClockTicker::session_going_away ()
 {
 	SessionHandlePtr::session_going_away();
-	_midi_port = 0;
+	_midi_port.reset ();
 }
 
 void
 MidiClockTicker::update_midi_clock_port()
 {
-	_midi_port = MIDI::Manager::instance()->midi_clock_output_port();
+	_midi_port = _session->midi_clock_output_port();
 }
 
 void
@@ -193,7 +179,7 @@ MidiClockTicker::transport_state_changed()
 		return;
 	}
 
-	DEBUG_TRACE (PBD::DEBUG::MidiClock,
+	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)
 	);
@@ -204,55 +190,18 @@ MidiClockTicker::transport_state_changed()
 		return;
 	}
 
-	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);
-			} else {
-				send_continue_event(0);
-			}
-
-		} else if (_pos->frame == 0) {
-			send_start_event(0);
-		} else {
-			send_continue_event(0);
-		}
-
-		// send_midi_clock_event (0);
-
-	} else if (_pos->speed == 0.0f) {
-		send_stop_event (0);
-		send_position_event (llrint (_pos->midi_beats), 0);
-	}
+	_send_state = true;
 
 	// tick (_pos->frame);
 }
 
-void
-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));
-
-	if (speed == 0.0f && Config->get_send_midi_clock()) {
-		send_position_event (position, 0);
-	}
-
-	_last_tick = position;
-#endif
-}
-
 void
 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())
 		);
@@ -270,18 +219,65 @@ MidiClockTicker::transport_looped()
 }
 
 void
-MidiClockTicker::tick (const framepos_t& /* transport_frame */)
+MidiClockTicker::tick (const framepos_t& /* transport_frame */, pframes_t nframes)
 {
-	if (!Config->get_send_midi_clock() || _session == 0 || _session->transport_speed() != 1.0f || _midi_port == 0) {
+	if (!Config->get_send_midi_clock() || _session == 0 || _midi_port == 0) {
 		return;
 	}
 
-	MIDI::JackMIDIPort* mp = dynamic_cast<MIDI::JackMIDIPort*> (_midi_port);
-	if (! mp) {
+	if (_send_pos) {
+		if (_pos->speed == 0.0f) {
+			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 {
+				send_position_event (llrint (_pos->midi_beats), 0, nframes);
+				send_continue_event (0, nframes);
+			}
+		} else {
+			/* Varispeed not supported */
+		}
+
+		_send_pos = false;
+	}
+
+
+	if (_send_state) {
+		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);
+		}
+
+		_send_state = false;
+	}
+
+	if (_session->transport_speed() != 1.0f) {
+		/* no varispeed support and nothing to do after this if stopped */
 		return;
 	}
 
-	const framepos_t end = _pos->frame + mp->nframes_this_cycle();
+	const framepos_t end = _pos->frame + nframes;
 	double iter = _last_tick;
 
 	while (true) {
@@ -291,14 +287,14 @@ MidiClockTicker::tick (const framepos_t& /* transport_frame */)
 
 		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));
+						 iter, _last_tick, next_tick, next_tick_offset, nframes));
 
-		if (!mp || (next_tick_offset >= mp->nframes_this_cycle())) {
+		if (next_tick_offset >= nframes) {
 			break;
 		}
 
 		if (next_tick_offset >= 0) {
-			send_midi_clock_event (next_tick_offset);
+			send_midi_clock_event (next_tick_offset, nframes);
 		}
 
 		iter = next_tick;
@@ -308,7 +304,6 @@ MidiClockTicker::tick (const framepos_t& /* transport_frame */)
 	_pos->frame = end;
 }
 
-
 double
 MidiClockTicker::one_ppqn_in_frames (framepos_t transport_position)
 {
@@ -322,59 +317,64 @@ MidiClockTicker::one_ppqn_in_frames (framepos_t transport_position)
 }
 
 void
-MidiClockTicker::send_midi_clock_event (pframes_t offset)
+MidiClockTicker::send_midi_clock_event (pframes_t offset, pframes_t nframes)
 {
 	if (!_midi_port) {
 		return;
 	}
 
-	// DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Tick with offset %1\n", offset));
+	static uint8_t msg = MIDI_CMD_COMMON_CLOCK;
+
+	MidiBuffer& mb (_midi_port->get_midi_buffer (nframes));
+	mb.push_back (offset, 1, &msg);
 
-	static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CLOCK };
-	_midi_port->write (_midi_clock_tick, 1, offset);
+	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Tick with offset %1\n", offset));
 }
 
 void
-MidiClockTicker::send_start_event (pframes_t offset)
+MidiClockTicker::send_start_event (pframes_t offset, pframes_t nframes)
 {
 	if (!_midi_port) {
 		return;
 	}
 
-	DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Start %1\n", _last_tick));
+	static uint8_t msg = { MIDI_CMD_COMMON_START };
+	MidiBuffer& mb (_midi_port->get_midi_buffer (nframes));
+	mb.push_back (offset, 1, &msg);
 
-	static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_START };
-	_midi_port->write (_midi_clock_tick, 1, offset);
+	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Start %1\n", _last_tick));
 }
 
 void
-MidiClockTicker::send_continue_event (pframes_t offset)
+MidiClockTicker::send_continue_event (pframes_t offset, pframes_t nframes)
 {
 	if (!_midi_port) {
 		return;
 	}
 
-	DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Continue %1\n", _last_tick));
+	static uint8_t msg = { MIDI_CMD_COMMON_CONTINUE };
+	MidiBuffer& mb (_midi_port->get_midi_buffer (nframes));
+	mb.push_back (offset, 1, &msg);
 
-	static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_CONTINUE };
-	_midi_port->write (_midi_clock_tick, 1, offset);
+	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Continue %1\n", _last_tick));
 }
 
 void
-MidiClockTicker::send_stop_event (pframes_t offset)
+MidiClockTicker::send_stop_event (pframes_t offset, pframes_t nframes)
 {
 	if (!_midi_port) {
 		return;
 	}
 
-	DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Stop %1\n", _last_tick));
+	static uint8_t msg = MIDI_CMD_COMMON_STOP;
+	MidiBuffer& mb (_midi_port->get_midi_buffer (nframes));
+	mb.push_back (offset, 1, &msg);
 
-	static uint8_t _midi_clock_tick[1] = { MIDI_CMD_COMMON_STOP };
-	_midi_port->write (_midi_clock_tick, 1, offset);
+	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Stop %1\n", _last_tick));
 }
 
 void
-MidiClockTicker::send_position_event (uint32_t midi_beats, pframes_t offset)
+MidiClockTicker::send_position_event (uint32_t midi_beats, pframes_t offset, pframes_t nframes)
 {
 	if (!_midi_port) {
 		return;
@@ -386,13 +386,15 @@ MidiClockTicker::send_position_event (uint32_t midi_beats, pframes_t offset)
 	}
 
 	/* split midi beats into a 14bit value */
-	MIDI::byte msg[3] = {
-		MIDI_CMD_COMMON_SONG_POS,
-		midi_beats & 0x007f,
-		midi_beats & 0x3f80
-	};
+	MIDI::byte msg[3];
+	msg[0] = MIDI_CMD_COMMON_SONG_POS;
+	msg[1] = midi_beats & 0x007f;
+	msg[2] = midi_beats >> 7;
+
+	MidiBuffer& mb (_midi_port->get_midi_buffer (nframes));
+	mb.push_back (offset, 3, &msg[0]);
 
-	_midi_port->midimsg (msg, sizeof (msg), offset);
+	DEBUG_TRACE (DEBUG::MidiClock, string_compose ("Song Position Sent: %1 to %2 (events now %3, buf = %4)\n", midi_beats, _midi_port->name(),
+						       mb.size(), &mb));
 
-	DEBUG_TRACE (PBD::DEBUG::MidiClock, string_compose ("Song Position Sent: %1\n", midi_beats));
 }