X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_midi.cc;h=e4fd58dedc34635a93996c3a3cb604fa908b9bd7;hb=bb8cb93789b2eec65e4d82e5ceb64054673cbc4f;hp=25807687a8bd6fc1efba6d4bea78becc6a1454e2;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 25807687a8..e4fd58dedc 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -1,4 +1,3 @@
-
 /*
   Copyright (C) 1999-2002 Paul Davis
 
@@ -23,27 +22,29 @@
 #include <cerrno>
 #include <cassert>
 #include <unistd.h>
-#include <fcntl.h>
-#include <poll.h>
 
 #include <boost/shared_ptr.hpp>
 
+#include <glibmm/main.h>
+
 #include "midi++/mmc.h"
 #include "midi++/port.h"
 #include "midi++/manager.h"
+
 #include "pbd/error.h"
-#include <glibmm/thread.h>
 #include "pbd/pthread_utils.h"
+#include "pbd/timersub.h"
+
+#include "timecode/time.h"
 
-#include "ardour/configuration.h"
-#include "ardour/audioengine.h"
-#include "ardour/session.h"
 #include "ardour/audio_track.h"
+#include "ardour/audioengine.h"
+#include "ardour/debug.h"
 #include "ardour/midi_track.h"
-#include "ardour/audio_diskstream.h"
+#include "ardour/midi_ui.h"
+#include "ardour/session.h"
 #include "ardour/slave.h"
-#include "ardour/cycles.h"
-#include "ardour/smpte.h"
+#include "ardour/ticker.h"
 
 #include "i18n.h"
 
@@ -51,10 +52,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace MIDI;
-
-MachineControl::CommandSignature MMC_CommandSignature;
-MachineControl::ResponseSignature MMC_ResponseSignature;
-
+using namespace Glib;
 
 void
 Session::midi_panic()
@@ -71,414 +69,12 @@ Session::midi_panic()
 	}
 }
 
-int
-Session::use_config_midi_ports ()
-{
-	string port_name;
-
-	if (default_mmc_port) {
-		set_mmc_port (default_mmc_port->name());
-	} else {
-		set_mmc_port ("");
-	}
-
-	if (default_mtc_port) {
-		set_mtc_port (default_mtc_port->name());
-	} else {
-		set_mtc_port ("");
-	}
-
-	if (default_midi_port) {
-		set_midi_port (default_midi_port->name());
-	} else {
-		set_midi_port ("");
-	}
-
-	if (default_midi_clock_port) {
-		set_midi_clock_port (default_midi_clock_port->name());
-	} else {
-		set_midi_clock_port ("");
-	}
-
-	return 0;
-}
-
-
-/***********************************************************************
- MTC, MMC, etc.
-**********************************************************************/
-
-int
-Session::set_mtc_port (string port_tag)
-{
-	MTC_Slave *ms;
-
-	if (port_tag.length() == 0) {
-
-		if (_slave && ((ms = dynamic_cast<MTC_Slave*> (_slave)) != 0)) {
-			error << _("Ardour is slaved to MTC - port cannot be reset") << endmsg;
-			return -1;
-		}
-
-		if (_mtc_port == 0) {
-			return 0;
-		}
-
-		_mtc_port = 0;
-		goto out;
-	}
-
-	MIDI::Port* port;
-
-	if ((port = MIDI::Manager::instance()->port (port_tag)) == 0) {
-		error << string_compose (_("unknown port %1 requested for MTC"), port_tag) << endl;
-		return -1;
-	}
-
-	_mtc_port = port;
-
-	if (_slave && ((ms = dynamic_cast<MTC_Slave*> (_slave)) != 0)) {
-		ms->rebind (*port);
-	}
-
-	Config->set_mtc_port_name (port_tag);
-
-  out:
-	MTC_PortChanged(); /* EMIT SIGNAL */
-	change_midi_ports ();
-	set_dirty();
-	return 0;
-}
-
-void
-Session::set_mmc_receive_device_id (uint32_t device_id)
-{
-	if (mmc) {
-		mmc->set_receive_device_id (device_id);
-	}
-}
-
-void
-Session::set_mmc_send_device_id (uint32_t device_id)
-{
-	if (mmc) {
-		mmc->set_send_device_id (device_id);
-	}
-}
-
-int
-Session::set_mmc_port (string port_tag)
-{
-	MIDI::byte old_recv_device_id = 0;
-	MIDI::byte old_send_device_id = 0;
-	bool reset_id = false;
-
-	if (port_tag.length() == 0) {
-		if (_mmc_port == 0) {
-			return 0;
-		}
-		_mmc_port = 0;
-		goto out;
-	}
-
-	MIDI::Port* port;
-
-	if ((port = MIDI::Manager::instance()->port (port_tag)) == 0) {
-		return -1;
-	}
-
-	_mmc_port = port;
-
-	if (mmc) {
-		old_recv_device_id = mmc->receive_device_id();
-		old_recv_device_id = mmc->send_device_id();
-		reset_id = true;
-		delete mmc;
-	}
-
-	mmc = new MIDI::MachineControl (*_mmc_port, 1.0,
-					MMC_CommandSignature,
-					MMC_ResponseSignature);
-
-	if (reset_id) {
-		mmc->set_receive_device_id (old_recv_device_id);
-		mmc->set_send_device_id (old_send_device_id);
-	}
-
-	mmc->Play.connect
-		(mem_fun (*this, &Session::mmc_deferred_play));
-	mmc->DeferredPlay.connect
-		(mem_fun (*this, &Session::mmc_deferred_play));
-	mmc->Stop.connect
-		(mem_fun (*this, &Session::mmc_stop));
-	mmc->FastForward.connect
-		(mem_fun (*this, &Session::mmc_fast_forward));
-	mmc->Rewind.connect
-		(mem_fun (*this, &Session::mmc_rewind));
-	mmc->Pause.connect
-		(mem_fun (*this, &Session::mmc_pause));
-	mmc->RecordPause.connect
-		(mem_fun (*this, &Session::mmc_record_pause));
-	mmc->RecordStrobe.connect
-		(mem_fun (*this, &Session::mmc_record_strobe));
-	mmc->RecordExit.connect
-		(mem_fun (*this, &Session::mmc_record_exit));
-	mmc->Locate.connect
-		(mem_fun (*this, &Session::mmc_locate));
-	mmc->Step.connect
-		(mem_fun (*this, &Session::mmc_step));
-	mmc->Shuttle.connect
-		(mem_fun (*this, &Session::mmc_shuttle));
-	mmc->TrackRecordStatusChange.connect
-		(mem_fun (*this, &Session::mmc_record_enable));
-
-
-	/* also handle MIDI SPP because its so common */
-
-	_mmc_port->input()->start.connect (mem_fun (*this, &Session::spp_start));
-	_mmc_port->input()->contineu.connect (mem_fun (*this, &Session::spp_continue));
-	_mmc_port->input()->stop.connect (mem_fun (*this, &Session::spp_stop));
-
-	Config->set_mmc_port_name (port_tag);
-
-  out:
-	MMC_PortChanged(); /* EMIT SIGNAL */
-	change_midi_ports ();
-	set_dirty();
-	return 0;
-}
-
-int
-Session::set_midi_port (string /*port_tag*/)
-{
-#if 0
-	if (port_tag.length() == 0) {
-		if (_midi_port == 0) {
-			return 0;
-		}
-		_midi_port = 0;
-		goto out;
-	}
-
-	MIDI::Port* port;
-
-	if ((port = MIDI::Manager::instance()->port (port_tag)) == 0) {
-		return -1;
-	}
-
-	_midi_port = port;
-
-	/* XXX need something to forward this to control protocols ? or just
-	   use the signal below
-	*/
-
-	Config->set_midi_port_name (port_tag);
-
-  out:
-#endif
-	MIDI_PortChanged(); /* EMIT SIGNAL */
-	change_midi_ports ();
-	set_dirty();
-	return 0;
-}
-
-int
-Session::set_midi_clock_port (string port_tag)
-{
-	MIDIClock_Slave *ms;
-
-	if (port_tag.length() == 0) {
-
-		if (_slave && ((ms = dynamic_cast<MIDIClock_Slave*> (_slave)) != 0)) {
-			error << _("Ardour is slaved to MIDI Clock - port cannot be reset") << endmsg;
-			return -1;
-		}
-
-		if (_midi_clock_port == 0) {
-			return 0;
-		}
-
-		_midi_clock_port = 0;
-		goto out;
-	}
-
-	MIDI::Port* port;
-
-	if ((port = MIDI::Manager::instance()->port (port_tag)) == 0) {
-		error << string_compose (_("unknown port %1 requested for MIDI Clock"), port_tag) << endl;
-		return -1;
-	}
-
-	_midi_clock_port = port;
-
-	if (_slave && ((ms = dynamic_cast<MIDIClock_Slave*> (_slave)) != 0)) {
-		ms->rebind (*port);
-	}
-
-	Config->set_midi_clock_port_name (port_tag);
-
-  out:
-	MIDIClock_PortChanged(); /* EMIT SIGNAL */
-	change_midi_ports ();
-	set_dirty();
-	return 0;
-}
-
-void
-Session::set_trace_midi_input (bool yn, MIDI::Port* port)
-{
-	MIDI::Parser* input_parser;
-
-	cerr << "enabling tracing: " << yn << " for input port " << port->name() << endl;
-
-	if (port) {
-		if ((input_parser = port->input()) != 0) {
-			input_parser->trace (yn, &cout, "input: ");
-		}
-	} else {
-
-		if (_mmc_port) {
-			if ((input_parser = _mmc_port->input()) != 0) {
-				input_parser->trace (yn, &cout, "input: ");
-			}
-		}
-
-		if (_mtc_port && _mtc_port != _mmc_port) {
-			if ((input_parser = _mtc_port->input()) != 0) {
-				input_parser->trace (yn, &cout, "input: ");
-			}
-		}
-
-		if (_midi_port && _midi_port != _mmc_port && _midi_port != _mtc_port  ) {
-			if ((input_parser = _midi_port->input()) != 0) {
-				input_parser->trace (yn, &cout, "input: ");
-			}
-		}
-
-		if (_midi_clock_port
-			&& _midi_clock_port != _mmc_port
-			&& _midi_clock_port != _mtc_port
-			&& _midi_clock_port != _midi_port) {
-			if ((input_parser = _midi_clock_port->input()) != 0) {
-				input_parser->trace (yn, &cout, "input: ");
-			}
-		}
-	}
-
-	Config->set_trace_midi_input (yn);
-}
-
-void
-Session::set_trace_midi_output (bool yn, MIDI::Port* port)
-{
-	MIDI::Parser* output_parser;
-
-	if (port) {
-		if ((output_parser = port->output()) != 0) {
-			output_parser->trace (yn, &cout, "output: ");
-		}
-	} else {
-		if (_mmc_port) {
-			if ((output_parser = _mmc_port->output()) != 0) {
-				output_parser->trace (yn, &cout, "output: ");
-			}
-		}
-
-		if (_mtc_port && _mtc_port != _mmc_port) {
-			if ((output_parser = _mtc_port->output()) != 0) {
-				output_parser->trace (yn, &cout, "output: ");
-			}
-		}
-
-		if (_midi_port && _midi_port != _mmc_port && _midi_port != _mtc_port  ) {
-			if ((output_parser = _midi_port->output()) != 0) {
-				output_parser->trace (yn, &cout, "output: ");
-			}
-		}
-
-	}
-
-	Config->set_trace_midi_output (yn);
-}
-
-bool
-Session::get_trace_midi_input(MIDI::Port *port)
-{
-	MIDI::Parser* input_parser;
-	if (port) {
-		if ((input_parser = port->input()) != 0) {
-			return input_parser->tracing();
-		}
-	}
-	else {
-		if (_mmc_port) {
-			if ((input_parser = _mmc_port->input()) != 0) {
-				return input_parser->tracing();
-			}
-		}
-
-		if (_mtc_port) {
-			if ((input_parser = _mtc_port->input()) != 0) {
-				return input_parser->tracing();
-			}
-		}
-
-		if (_midi_port) {
-			if ((input_parser = _midi_port->input()) != 0) {
-				return input_parser->tracing();
-			}
-		}
-	}
-
-	return false;
-}
-
-bool
-Session::get_trace_midi_output(MIDI::Port *port)
-{
-	MIDI::Parser* output_parser;
-	if (port) {
-		if ((output_parser = port->output()) != 0) {
-			return output_parser->tracing();
-		}
-	}
-	else {
-		if (_mmc_port) {
-			if ((output_parser = _mmc_port->output()) != 0) {
-				return output_parser->tracing();
-			}
-		}
-
-		if (_mtc_port) {
-			if ((output_parser = _mtc_port->output()) != 0) {
-				return output_parser->tracing();
-			}
-		}
-
-		if (_midi_port) {
-			if ((output_parser = _midi_port->output()) != 0) {
-				return output_parser->tracing();
-			}
-		}
-	}
-
-	return false;
-
-}
-
 void
 Session::setup_midi_control ()
 {
-	outbound_mtc_smpte_frame = 0;
+	outbound_mtc_timecode_frame = 0;
 	next_quarter_frame_to_send = 0;
 
-	/* setup the MMC buffer */
-
-	mmc_buffer[0] = 0xf0; // SysEx
-	mmc_buffer[1] = 0x7f; // Real Time SysEx ID for MMC
-	mmc_buffer[2] = (mmc ? mmc->send_device_id() : 0x7f);
-	mmc_buffer[3] = 0x6;  // MCC
-
 	/* Set up the qtr frame message */
 
 	mtc_msg[0] = 0xf1;
@@ -492,54 +88,31 @@ Session::setup_midi_control ()
 }
 
 void
-Session::spp_start (Parser &, nframes_t /*timestamp*/)
+Session::spp_start ()
 {
-	if (Config->get_mmc_control() && (Config->get_slave_source() != MTC)) {
+	if (Config->get_mmc_control ()) {
 		request_transport_speed (1.0);
 	}
 }
 
 void
-Session::spp_continue (Parser& ignored, nframes_t timestamp)
+Session::spp_continue ()
 {
-	spp_start (ignored, timestamp);
+	spp_start ();
 }
 
 void
-Session::spp_stop (Parser&, nframes_t /*timestamp*/)
+Session::spp_stop ()
 {
-	if (Config->get_mmc_control()) {
+	if (Config->get_mmc_control ()) {
 		request_stop ();
 	}
 }
-/*
-void
-Session::midi_clock_start (Parser& ignored, nframes_t timestamp)
-{
-	if (Config->get_slave_source() == MIDIClock) {
-		request_transport_speed (1.0);
-	}
-}
-
-void
-Session::midi_clock_continue (Parser& parser, nframes_t timestamp)
-{
-	midi_clock_start (parser, 0);
-}
-
-void
-Session::midi_clock_stop (Parser& ignored, nframes_t timestamp)
-{
-	if (Config->get_slave_source() == MIDIClock) {
-		request_stop ();
-	}
-}
-*/
 
 void
 Session::mmc_deferred_play (MIDI::MachineControl &/*mmc*/)
 {
-	if (Config->get_mmc_control() && (Config->get_slave_source() != MTC)) {
+	if (Config->get_mmc_control ()) {
 		request_transport_speed (1.0);
 	}
 }
@@ -547,7 +120,7 @@ Session::mmc_deferred_play (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_record_pause (MIDI::MachineControl &/*mmc*/)
 {
-	if (Config->get_mmc_control()) {
+	if (Config->get_mmc_control ()) {
 		maybe_enable_record();
 	}
 }
@@ -555,8 +128,9 @@ Session::mmc_record_pause (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_record_strobe (MIDI::MachineControl &/*mmc*/)
 {
-	if (!Config->get_mmc_control())
+	if (!Config->get_mmc_control() || (_step_editors > 0)) {
 		return;
+	}
 
 	/* record strobe does an implicit "Play" command */
 
@@ -583,7 +157,7 @@ Session::mmc_record_strobe (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_record_exit (MIDI::MachineControl &/*mmc*/)
 {
-	if (Config->get_mmc_control()) {
+	if (Config->get_mmc_control ()) {
 		disable_record (false);
 	}
 }
@@ -591,7 +165,7 @@ Session::mmc_record_exit (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_stop (MIDI::MachineControl &/*mmc*/)
 {
-	if (Config->get_mmc_control()) {
+	if (Config->get_mmc_control ()) {
 		request_stop ();
 	}
 }
@@ -599,7 +173,7 @@ Session::mmc_stop (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_pause (MIDI::MachineControl &/*mmc*/)
 {
-	if (Config->get_mmc_control()) {
+	if (Config->get_mmc_control ()) {
 
 		/* We support RECORD_PAUSE, so the spec says that
 		   we must interpret PAUSE like RECORD_PAUSE if
@@ -619,7 +193,7 @@ static bool step_queued = false;
 void
 Session::mmc_step (MIDI::MachineControl &/*mmc*/, int steps)
 {
-	if (!Config->get_mmc_control()) {
+	if (!Config->get_mmc_control ()) {
 		return;
 	}
 
@@ -638,7 +212,7 @@ Session::mmc_step (MIDI::MachineControl &/*mmc*/, int steps)
 	}
 
 	double diff_secs = diff.tv_sec + (diff.tv_usec / 1000000.0);
-	double cur_speed = (((steps * 0.5) * smpte_frames_per_second()) / diff_secs) / smpte_frames_per_second();
+	double cur_speed = (((steps * 0.5) * timecode_frames_per_second()) / diff_secs) / timecode_frames_per_second();
 
 	if (_transport_speed == 0 || cur_speed * _transport_speed < 0) {
 		/* change direction */
@@ -658,19 +232,23 @@ Session::mmc_step (MIDI::MachineControl &/*mmc*/, int steps)
 	     << endl;
 #endif
 
-	request_transport_speed (step_speed);
+	request_transport_speed_nonzero (step_speed);
 	last_mmc_step = now;
 
 	if (!step_queued) {
-		midi_timeouts.push_back (mem_fun (*this, &Session::mmc_step_timeout));
-		step_queued = true;
+		if (midi_control_ui) {
+			RefPtr<TimeoutSource> tsrc = TimeoutSource::create (100);
+			tsrc->connect (sigc::mem_fun (*this, &Session::mmc_step_timeout));
+			tsrc->attach (midi_control_ui->main_loop()->get_context());
+			step_queued = true;
+		}
 	}
 }
 
 void
 Session::mmc_rewind (MIDI::MachineControl &/*mmc*/)
 {
-	if (Config->get_mmc_control()) {
+	if (Config->get_mmc_control ()) {
 		request_transport_speed(-8.0f);
 	}
 }
@@ -678,7 +256,7 @@ Session::mmc_rewind (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_fast_forward (MIDI::MachineControl &/*mmc*/)
 {
-	if (Config->get_mmc_control()) {
+	if (Config->get_mmc_control ()) {
 		request_transport_speed(8.0f);
 	}
 }
@@ -686,25 +264,25 @@ Session::mmc_fast_forward (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_locate (MIDI::MachineControl &/*mmc*/, const MIDI::byte* mmc_tc)
 {
-	if (!Config->get_mmc_control()) {
+	if (!Config->get_mmc_control ()) {
 		return;
 	}
 
-	nframes_t target_frame;
-	SMPTE::Time smpte;
+	framepos_t target_frame;
+	Timecode::Time timecode;
 
-	smpte.hours = mmc_tc[0] & 0xf;
-	smpte.minutes = mmc_tc[1];
-	smpte.seconds = mmc_tc[2];
-	smpte.frames = mmc_tc[3];
-	smpte.rate = smpte_frames_per_second();
-	smpte.drop = smpte_drop_frames();
+	timecode.hours = mmc_tc[0] & 0xf;
+	timecode.minutes = mmc_tc[1];
+	timecode.seconds = mmc_tc[2];
+	timecode.frames = mmc_tc[3];
+	timecode.rate = timecode_frames_per_second();
+	timecode.drop = timecode_drop_frames();
 
-	// Also takes smpte offset into account:
-	smpte_to_sample( smpte, target_frame, true /* use_offset */, false /* use_subframes */ );
+	// Also takes timecode offset into account:
+	timecode_to_sample( timecode, target_frame, true /* use_offset */, false /* use_subframes */ );
 
-	if (target_frame > max_frames) {
-		target_frame = max_frames;
+	if (target_frame > max_framepos) {
+		target_frame = max_framepos;
 	}
 
 	/* Some (all?) MTC/MMC devices do not send a full MTC frame
@@ -727,7 +305,7 @@ Session::mmc_locate (MIDI::MachineControl &/*mmc*/, const MIDI::byte* mmc_tc)
 void
 Session::mmc_shuttle (MIDI::MachineControl &/*mmc*/, float speed, bool forw)
 {
-	if (!Config->get_mmc_control()) {
+	if (!Config->get_mmc_control ()) {
 		return;
 	}
 
@@ -736,81 +314,102 @@ Session::mmc_shuttle (MIDI::MachineControl &/*mmc*/, float speed, bool forw)
 	}
 
 	if (forw) {
-		request_transport_speed (speed);
+		request_transport_speed_nonzero (speed);
 	} else {
-		request_transport_speed (-speed);
+		request_transport_speed_nonzero (-speed);
 	}
 }
 
 void
 Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled)
 {
-	if (Config->get_mmc_control()) {
+	if (!Config->get_mmc_control ()) {
+		return;
+	}
 
-		RouteList::iterator i;
-		boost::shared_ptr<RouteList> r = routes.reader();
+	RouteList::iterator i;
+	boost::shared_ptr<RouteList> r = routes.reader();
 
-		for (i = r->begin(); i != r->end(); ++i) {
-			AudioTrack *at;
+	for (i = r->begin(); i != r->end(); ++i) {
+		AudioTrack *at;
 
-			if ((at = dynamic_cast<AudioTrack*>((*i).get())) != 0) {
-				if (trk == at->remote_control_id()) {
-					at->set_record_enable (enabled, &mmc);
-					break;
-				}
+		if ((at = dynamic_cast<AudioTrack*>((*i).get())) != 0) {
+			if (trk == at->remote_control_id()) {
+				at->set_record_enabled (enabled, &mmc);
+				break;
 			}
 		}
 	}
 }
 
-void
-Session::change_midi_ports ()
-{
-	MIDIRequest* request = new MIDIRequest;
-
-	request->type = MIDIRequest::PortChange;
-	midi_requests.write (&request, 1);
-	poke_midi_thread ();
-}
-
-/** Send MTC Full Frame message (complete SMPTE time) for the start of this cycle.
+/** Send MTC Full Frame message (complete Timecode time) for the start of this cycle.
  * This resets the MTC code, the next quarter frame message that is sent will be
  * the first one with the beginning of this cycle as the new start point.
+ * @param t time to send.
  */
 int
-Session::send_full_time_code(nframes_t /*nframes*/)
+Session::send_full_time_code (framepos_t const t)
 {
 	/* This function could easily send at a given frame offset, but would
 	 * that be useful?  Does ardour do sub-block accurate locating? [DR] */
 
 	MIDI::byte msg[10];
-	SMPTE::Time smpte;
+	Timecode::Time timecode;
 
-	_send_smpte_update = false;
+	_send_timecode_update = false;
 
-	if (_mtc_port == 0 || !session_send_mtc) {
+	if (_engine.freewheeling() || !Config->get_send_mtc()) {
+		return 0;
+	}
+	if (_slave && !_slave->locked()) {
 		return 0;
 	}
 
-	// Get smpte time for this transport frame
-	sample_to_smpte(_transport_frame, smpte, true /* use_offset */, false /* no subframes */);
+	// Get timecode time for the given time
+	sample_to_timecode (t, timecode, true /* use_offset */, false /* no subframes */);
 
-	transmitting_smpte_time = smpte;
-	outbound_mtc_smpte_frame = _transport_frame;
+	// sample-align outbound to rounded (no subframes) timecode
+	framepos_t mtc_tc;
+	timecode_to_sample(timecode, mtc_tc, true, false);
+	outbound_mtc_timecode_frame = mtc_tc;
 
-	// I don't understand this bit yet.. [DR]
-	if (((mtc_smpte_bits >> 5) != MIDI::MTC_25_FPS) && (transmitting_smpte_time.frames % 2)) {
-		// start MTC quarter frame transmission on an even frame
-		SMPTE::increment( transmitting_smpte_time, config.get_subframes_per_frame() );
-		outbound_mtc_smpte_frame += (nframes_t) _frames_per_smpte_frame;
+	transmitting_timecode_time = timecode;
+
+	double const quarter_frame_duration = ((framecnt_t) _frames_per_timecode_frame) / 4.0;
+	if (ceil((t - mtc_tc) / quarter_frame_duration) > 0) {
+		Timecode::increment (transmitting_timecode_time, config.get_subframes_per_frame());
+		outbound_mtc_timecode_frame += _frames_per_timecode_frame;
 	}
 
-	// Compensate for audio latency
-	outbound_mtc_smpte_frame += _worst_output_latency;
+	DEBUG_TRACE (DEBUG::MTC, string_compose ("Full MTC TC %1\n", outbound_mtc_timecode_frame));
 
+	// I don't understand this bit yet.. [DR]
+	// I do [rg]:
+	// according to MTC spec 24, 30 drop and 30 non-drop TC, the frame-number represented by 8 quarter frames must be even.
+	if (((mtc_timecode_bits >> 5) != MIDI::MTC_25_FPS) && (transmitting_timecode_time.frames % 2)) {
+		// start MTC quarter frame transmission on an even frame
+		Timecode::increment (transmitting_timecode_time, config.get_subframes_per_frame());
+		outbound_mtc_timecode_frame += _frames_per_timecode_frame;
+	}
+
+#if 0 // compensate for audio latency  -- disabled [rg]
+	/* this needs more thought and work.
+	 * the proper solution will be to just offset MTC by the MIDI port's latency.
+	 *
+	 * using worst_playback_latency() is wrong when the generated MTC is used to sync
+	 * clients which send audio to Ardour for recording.
+	 * worst_capture_latency() vs. worst_playback_latency()
+	 *
+	 * NB. similarly to session_ltc, the offset should be subtracted from the timecode to send,
+	 * instead of being added to timestamp when to send the timecode.
+	 * Otherwise the timestamp may not fall into the jack-cycle of the current _transport frame.
+	 * and no MTC QF will be sent.
+	 */
+	outbound_mtc_timecode_frame += worst_playback_latency();
+#endif
 	next_quarter_frame_to_send = 0;
 
-	// Sync slave to the same SMPTE time as we are on
+	// Sync slave to the same Timecode time as we are on
 	msg[0] = 0xf0;
 	msg[1] = 0x7f;
 	msg[2] = 0x7f;
@@ -818,108 +417,117 @@ Session::send_full_time_code(nframes_t /*nframes*/)
 	msg[4] = 0x1;
 	msg[9] = 0xf7;
 
-	msg[5] = mtc_smpte_bits | smpte.hours;
-	msg[6] = smpte.minutes;
-	msg[7] = smpte.seconds;
-	msg[8] = smpte.frames;
-
-	cerr << "MTC: Sending full time code at " << outbound_mtc_smpte_frame << endl;
+	msg[5] = mtc_timecode_bits | timecode.hours;
+	msg[6] = timecode.minutes;
+	msg[7] = timecode.seconds;
+	msg[8] = timecode.frames;
 
 	// Send message at offset 0, sent time is for the start of this cycle
-	if (_mtc_port->midimsg (msg, sizeof (msg), 0)) {
+	if (MIDI::Manager::instance()->mtc_output_port()->midimsg (msg, sizeof (msg), 0)) {
 		error << _("Session: could not send full MIDI time code") << endmsg;
 		return -1;
 	}
 
+	_pframes_since_last_mtc = 0;
 	return 0;
 }
 
 /** Send MTC (quarter-frame) messages for this cycle.
- * Must be called exactly once per cycle from the audio thread.  Realtime safe.
- * This function assumes the state of full SMPTE is sane, eg. the slave is
+ * Must be called exactly once per cycle from the process thread.  Realtime safe.
+ * This function assumes the state of full Timecode is sane, eg. the slave is
  * expecting quarter frame messages and has the right frame of reference (any
- * full MTC SMPTE time messages that needed to be sent should have been sent
+ * full MTC Timecode time messages that needed to be sent should have been sent
  * earlier already this cycle by send_full_time_code)
  */
 int
-Session::send_midi_time_code_for_cycle(nframes_t nframes)
+Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_frame, pframes_t nframes)
 {
-	assert (next_quarter_frame_to_send >= 0);
-	assert (next_quarter_frame_to_send <= 7);
-
-	if (_mtc_port == 0 || !session_send_mtc || transmitting_smpte_time.negative
-	    /*|| (next_quarter_frame_to_send < 0)*/ ) {
+	if (_engine.freewheeling() || !_send_qf_mtc || transmitting_timecode_time.negative || (next_quarter_frame_to_send < 0)) {
 		// cerr << "(MTC) Not sending MTC\n";
 		return 0;
 	}
+	if (_slave && !_slave->locked()) {
+		return 0;
+	}
 
-	/* Duration of one quarter frame */
-	nframes_t quarter_frame_duration = ((long) _frames_per_smpte_frame) >> 2;
+	/* MTC is max. 30 fps - assert() below will fail
+	 * TODO actually limit it to 24,25,29df,30fps
+	 * talk to oofus, first.
+	 */
+	if (Timecode::timecode_to_frames_per_second(config.get_timecode_format()) > 30) {
+		return 0;
+	}
 
-	// cerr << "(MTC) TR: " << _transport_frame << " - SF: " << outbound_mtc_smpte_frame
-	// << " - NQ: " << next_quarter_frame_to_send << " - FD" << quarter_frame_duration << endl;
+	assert (next_quarter_frame_to_send >= 0);
+	assert (next_quarter_frame_to_send <= 7);
 
-	// FIXME: this should always be true
-	//assert((outbound_mtc_smpte_frame + (next_quarter_frame_to_send * quarter_frame_duration))
-	//		> _transport_frame);
+	/* Duration of one quarter frame */
+	double const quarter_frame_duration = _frames_per_timecode_frame / 4.0;
 
+	DEBUG_TRACE (DEBUG::MTC, string_compose ("TF %1 SF %2 MT %3 QF %4 QD %5\n",
+				_transport_frame, start_frame, outbound_mtc_timecode_frame,
+				next_quarter_frame_to_send, quarter_frame_duration));
 
-	// Send quarter frames for this cycle
-	while (_transport_frame + nframes > (outbound_mtc_smpte_frame +
-				(next_quarter_frame_to_send * quarter_frame_duration))) {
+	if (rint(outbound_mtc_timecode_frame + (next_quarter_frame_to_send * quarter_frame_duration)) < _transport_frame) {
+		send_full_time_code (_transport_frame);
+		return 0;
+	}
+
+	/* Send quarter frames for this cycle */
+	while (end_frame > rint(outbound_mtc_timecode_frame + (next_quarter_frame_to_send * quarter_frame_duration))) {
 
-		// cerr << "(MTC) Next frame to send: " << next_quarter_frame_to_send << endl;
+		DEBUG_TRACE (DEBUG::MTC, string_compose ("next frame to send: %1\n", next_quarter_frame_to_send));
 
 		switch (next_quarter_frame_to_send) {
 			case 0:
-				mtc_msg[1] =  0x00 | (transmitting_smpte_time.frames & 0xf);
+				mtc_msg[1] = 0x00 | (transmitting_timecode_time.frames & 0xf);
 				break;
 			case 1:
-				mtc_msg[1] =  0x10 | ((transmitting_smpte_time.frames & 0xf0) >> 4);
+				mtc_msg[1] = 0x10 | ((transmitting_timecode_time.frames & 0xf0) >> 4);
 				break;
 			case 2:
-				mtc_msg[1] =  0x20 | (transmitting_smpte_time.seconds & 0xf);
+				mtc_msg[1] = 0x20 | (transmitting_timecode_time.seconds & 0xf);
 				break;
 			case 3:
-				mtc_msg[1] =  0x30 | ((transmitting_smpte_time.seconds & 0xf0) >> 4);
+				mtc_msg[1] = 0x30 | ((transmitting_timecode_time.seconds & 0xf0) >> 4);
 				break;
 			case 4:
-				mtc_msg[1] =  0x40 | (transmitting_smpte_time.minutes & 0xf);
+				mtc_msg[1] = 0x40 | (transmitting_timecode_time.minutes & 0xf);
 				break;
 			case 5:
-				mtc_msg[1] = 0x50 | ((transmitting_smpte_time.minutes & 0xf0) >> 4);
+				mtc_msg[1] = 0x50 | ((transmitting_timecode_time.minutes & 0xf0) >> 4);
 				break;
 			case 6:
-				mtc_msg[1] = 0x60 | ((mtc_smpte_bits|transmitting_smpte_time.hours) & 0xf);
+				mtc_msg[1] = 0x60 | ((mtc_timecode_bits | transmitting_timecode_time.hours) & 0xf);
 				break;
 			case 7:
-				mtc_msg[1] = 0x70 | (((mtc_smpte_bits|transmitting_smpte_time.hours) & 0xf0) >> 4);
+				mtc_msg[1] = 0x70 | (((mtc_timecode_bits | transmitting_timecode_time.hours) & 0xf0) >> 4);
 				break;
 		}
 
-		const nframes_t msg_time = (outbound_mtc_smpte_frame
-			+ (quarter_frame_duration * next_quarter_frame_to_send));
+		const framepos_t msg_time = rint(outbound_mtc_timecode_frame	+ (quarter_frame_duration * next_quarter_frame_to_send));
 
 		// This message must fall within this block or something is broken
-		assert(msg_time >= _transport_frame);
-		assert(msg_time < _transport_frame + nframes);
+		assert (msg_time >= start_frame);
+		assert (msg_time < end_frame);
 
-		nframes_t out_stamp = msg_time - _transport_frame;
-		assert(out_stamp < nframes);
+		/* convert from session frames back to JACK frames using the transport speed */
+		pframes_t const out_stamp = (msg_time - start_frame) / _transport_speed;
+		assert (out_stamp < nframes);
 
-		if (_mtc_port->midimsg (mtc_msg, 2, out_stamp)) {
+		if (MIDI::Manager::instance()->mtc_output_port()->midimsg (mtc_msg, 2, out_stamp)) {
 			error << string_compose(_("Session: cannot send quarter-frame MTC message (%1)"), strerror (errno))
-			      << endmsg;
+						<< endmsg;
 			return -1;
 		}
 
-		/*cerr << "(MTC) SMPTE: " << transmitting_smpte_time.hours
-			<< ":" << transmitting_smpte_time.minutes
-			<< ":" << transmitting_smpte_time.seconds
-			<< ":" << transmitting_smpte_time.frames
-			<< ", qfm = " << next_quarter_frame_to_send
-			<< ", stamp = " << out_stamp
-			<< ", delta = " << _transport_frame + out_stamp - last_time << endl;*/
+#ifndef NDEBUG
+		DEBUG_STR_DECL(foo)
+		DEBUG_STR_APPEND(foo,"sending ");
+		DEBUG_STR_APPEND(foo, transmitting_timecode_time);
+		DEBUG_TRACE (DEBUG::MTC, string_compose ("%1 qfm = %2, stamp = %3\n", DEBUG_STR(foo).str(), next_quarter_frame_to_send,
+							 out_stamp));
+#endif
 
 		// Increment quarter frame counter
 		next_quarter_frame_to_send++;
@@ -927,14 +535,12 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes)
 		if (next_quarter_frame_to_send >= 8) {
 			// Wrap quarter frame counter
 			next_quarter_frame_to_send = 0;
-			// Increment smpte time twice
-			SMPTE::increment( transmitting_smpte_time, config.get_subframes_per_frame() );
-			SMPTE::increment( transmitting_smpte_time, config.get_subframes_per_frame() );
+			// Increment timecode time twice
+			Timecode::increment (transmitting_timecode_time, config.get_subframes_per_frame());
+			Timecode::increment (transmitting_timecode_time, config.get_subframes_per_frame());
 			// Re-calculate timing of first quarter frame
-			//smpte_to_sample( transmitting_smpte_time, outbound_mtc_smpte_frame, true /* use_offset */, false );
-			outbound_mtc_smpte_frame += 8 * quarter_frame_duration;
-			// Compensate for audio latency
-			outbound_mtc_smpte_frame += _worst_output_latency;
+			//timecode_to_sample( transmitting_timecode_time, outbound_mtc_timecode_frame, true /* use_offset */, false );
+			outbound_mtc_timecode_frame += 2.0 * _frames_per_timecode_frame;
 		}
 	}
 
@@ -945,69 +551,6 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes)
  OUTBOUND MMC STUFF
 **********************************************************************/
 
-void
-Session::deliver_mmc (MIDI::MachineControl::Command cmd, nframes_t where)
-{
-	using namespace MIDI;
-	int nbytes = 4;
-	SMPTE::Time smpte;
-
-	if (_mmc_port == 0 || !session_send_mmc) {
-		// cerr << "Not delivering MMC " << _mmc_port << " - " << session_send_mmc << endl;
-		return;
-	}
-
-	mmc_buffer[nbytes++] = cmd;
-
-	// cerr << "delivering MMC, cmd = " << hex << (int) cmd << dec << endl;
-
-	switch (cmd) {
-	case MachineControl::cmdLocate:
-		smpte_time_subframes (where, smpte);
-
-		mmc_buffer[nbytes++] = 0x6; // byte count
-		mmc_buffer[nbytes++] = 0x1; // "TARGET" subcommand
-		mmc_buffer[nbytes++] = smpte.hours;
-		mmc_buffer[nbytes++] = smpte.minutes;
-		mmc_buffer[nbytes++] = smpte.seconds;
-		mmc_buffer[nbytes++] = smpte.frames;
-		mmc_buffer[nbytes++] = smpte.subframes;
-		break;
-
-	case MachineControl::cmdStop:
-		break;
-
-	case MachineControl::cmdPlay:
-		/* always convert Play into Deferred Play */
-		/* Why? [DR] */
-		mmc_buffer[4] = MachineControl::cmdDeferredPlay;
-		break;
-
-	case MachineControl::cmdDeferredPlay:
-		break;
-
-	case MachineControl::cmdRecordStrobe:
-		break;
-
-	case MachineControl::cmdRecordExit:
-		break;
-
-	case MachineControl::cmdRecordPause:
-		break;
-
-	default:
-		nbytes = 0;
-	};
-
-	if (nbytes) {
-
-		mmc_buffer[nbytes++] = 0xf7; // terminate SysEx/MMC message
-
-		if (_mmc_port->midimsg (mmc_buffer, nbytes, 0)) {
-			error << string_compose(_("MMC: cannot send command %1%2%3"), &hex, cmd, &dec) << endmsg;
-		}
-	}
-}
 
 bool
 Session::mmc_step_timeout ()
@@ -1034,268 +577,28 @@ Session::mmc_step_timeout ()
 
 	/* slow it down */
 
-	request_transport_speed (_transport_speed * 0.75);
+	request_transport_speed_nonzero (_transport_speed * 0.75);
 	return true;
 }
 
-/*---------------------------------------------------------------------------
-  MIDI THREAD
-  ---------------------------------------------------------------------------*/
-
-int
-Session::start_midi_thread ()
-{
-	if (pipe (midi_request_pipe)) {
-		error << string_compose(_("Cannot create transport request signal pipe (%1)"), strerror (errno)) << endmsg;
-		return -1;
-	}
-
-	if (fcntl (midi_request_pipe[0], F_SETFL, O_NONBLOCK)) {
-		error << string_compose(_("UI: cannot set O_NONBLOCK on "    "signal read pipe (%1)"), strerror (errno)) << endmsg;
-		return -1;
-	}
-
-	if (fcntl (midi_request_pipe[1], F_SETFL, O_NONBLOCK)) {
-		error << string_compose(_("UI: cannot set O_NONBLOCK on "    "signal write pipe (%1)"), strerror (errno)) << endmsg;
-		return -1;
-	}
-
-	if (pthread_create_and_store ("transport", &midi_thread, 0, _midi_thread_work, this)) {
-		error << _("Session: could not create transport thread") << endmsg;
-		return -1;
-	}
-
-	return 0;
-}
-
-void
-Session::terminate_midi_thread ()
-{
-	if (midi_thread) {
-
-		MIDIRequest* request = new MIDIRequest;
-		void* status;
-
-		request->type = MIDIRequest::Quit;
+/***********************************************************************
+ OUTBOUND SYSTEM COMMON STUFF
+**********************************************************************/
 
-		midi_requests.write (&request, 1);
-		poke_midi_thread ();
-
-		pthread_join (midi_thread, &status);
-	}
-}
 
 void
-Session::poke_midi_thread ()
+Session::send_song_position_pointer (framepos_t t)
 {
-	static char c = 0;
-
-	if (write (midi_request_pipe[1], &c, 1) != 1) {
-		error << string_compose(_("cannot send signal to midi thread! (%1)"), strerror (errno)) << endmsg;
+	if (midi_clock) {
+		midi_clock->position_changed (t);
 	}
 }
 
-void *
-Session::_midi_thread_work (void* arg)
+int
+Session::start_midi_thread ()
 {
-	pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, 0);
-	pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);
-
-	((Session *) arg)->midi_thread_work ();
+	midi_control_ui = new MidiControlUI (*this);
+	midi_control_ui->run ();
 	return 0;
 }
 
-void
-Session::midi_thread_work ()
-{
-	MIDIRequest* request;
-	struct pollfd pfd[4];
-	int nfds = 0;
-	int timeout;
-	int fds_ready;
-	struct sched_param rtparam;
-	int x;
-	bool restart;
-	vector<MIDI::Port*> ports;
-
-	PBD::notify_gui_about_thread_creation (pthread_self(), X_("MIDI"), 2048);
-
-	memset (&rtparam, 0, sizeof (rtparam));
-	rtparam.sched_priority = 9; /* XXX should be relative to audio (JACK) thread */
-
-	if ((x = pthread_setschedparam (pthread_self(), SCHED_FIFO, &rtparam)) != 0) {
-		// do we care? not particularly.
-	}
-
-	/* set up the port vector; 5 is the largest possible size for now */
-
-	ports.assign (5, (MIDI::Port*) 0);
-
-	while (1) {
-
-		nfds = 0;
-
-		pfd[nfds].fd = midi_request_pipe[0];
-		pfd[nfds].events = POLLIN|POLLHUP|POLLERR;
-		nfds++;
-
-		if (Config->get_mmc_control() && _mmc_port && _mmc_port->selectable() >= 0) {
-			pfd[nfds].fd = _mmc_port->selectable();
-			pfd[nfds].events = POLLIN|POLLHUP|POLLERR;
-			ports[nfds] = _mmc_port;
-			//cerr << "MIDI port " << nfds << " = MMC @ " << _mmc_port << endl;
-			nfds++;
-		}
-
-		/* if MTC is being handled on a different port from MMC
-		   or we are not handling MMC at all, poll
-		   the relevant port.
-		*/
-
-		if (_mtc_port && (_mtc_port != _mmc_port || !Config->get_mmc_control()) && _mtc_port->selectable() >= 0) {
-			pfd[nfds].fd = _mtc_port->selectable();
-			pfd[nfds].events = POLLIN|POLLHUP|POLLERR;
-			ports[nfds] = _mtc_port;
-			//cerr << "MIDI port " << nfds << " = MTC @ " << _mtc_port << endl;
-			nfds++;
-		}
-
-		if (_midi_clock_port && (_midi_clock_port != _mmc_port || !Config->get_mmc_control()) && _midi_clock_port->selectable() >= 0) {
-			pfd[nfds].fd = _midi_clock_port->selectable();
-			pfd[nfds].events = POLLIN|POLLHUP|POLLERR;
-			ports[nfds] = _midi_clock_port;
-			nfds++;
-		}
-
-		/* if we are using MMC control, we obviously have to listen
-		   the relevant port.
-		*/
-
-		if (_midi_port && (_midi_port != _mmc_port || !Config->get_mmc_control()) && (_midi_port != _mtc_port) && _midi_port->selectable() >= 0) {
-			pfd[nfds].fd = _midi_port->selectable();
-			pfd[nfds].events = POLLIN|POLLHUP|POLLERR;
-			ports[nfds] = _midi_port;
-			// cerr << "MIDI port " << nfds << " = MIDI @ " << _midi_port << endl;
-			nfds++;
-		}
-
-		if (!midi_timeouts.empty()) {
-			timeout = 100; /* 10msecs */
-		} else {
-			timeout = -1; /* if there is no data, we don't care */
-		}
-
-	  again:
-		// cerr << "MIDI poll on " << nfds << " for " << timeout << endl;
-		if (poll (pfd, nfds, timeout) < 0) {
-			if (errno == EINTR) {
-				/* gdb at work, perhaps */
-				goto again;
-			}
-
-			error << string_compose(_("MIDI thread poll failed (%1)"), strerror (errno)) << endmsg;
-
-			break;
-		}
-		// cerr << "MIDI thread wakes at " << get_cycles () << endl;
-
-		fds_ready = 0;
-
-		/* check the transport request pipe */
-
-		if (pfd[0].revents & ~POLLIN) {
-			error << _("Error on transport thread request pipe") << endmsg;
-			break;
-		}
-
-		if (pfd[0].revents & POLLIN) {
-
-			char foo[16];
-
-			// cerr << "MIDI request FIFO ready\n";
-			fds_ready++;
-
-			/* empty the pipe of all current requests */
-
-			while (1) {
-				size_t nread = read (midi_request_pipe[0], &foo, sizeof (foo));
-
-				if (nread > 0) {
-					if ((size_t) nread < sizeof (foo)) {
-						break;
-					} else {
-						continue;
-					}
-				} else if (nread == 0) {
-					break;
-				} else if (errno == EAGAIN) {
-					break;
-				} else {
-					fatal << _("Error reading from transport request pipe") << endmsg;
-					/*NOTREACHED*/
-				}
-			}
-
-			while (midi_requests.read (&request, 1) == 1) {
-
-				switch (request->type) {
-				case MIDIRequest::PortChange:
-					/* restart poll with new ports */
-					// cerr << "rebind\n";
-					restart = true;
-					break;
-
-				case MIDIRequest::Quit:
-					delete request;
-					pthread_exit_pbd (0);
-					/*NOTREACHED*/
-					break;
-
-				default:
-					break;
-				}
-
-
-				delete request;
-			}
-
-		}
-
-		if (restart) {
-			continue;
-		}
-
-		/* now read the rest of the ports */
-
-		for (int p = 1; p < nfds; ++p) {
-			if ((pfd[p].revents & ~POLLIN)) {
-				// error << string_compose(_("Transport: error polling MIDI port %1 (revents =%2%3%4"), p, &hex, pfd[p].revents, &dec) << endmsg;
-				break;
-			}
-
-			if (pfd[p].revents & POLLIN) {
-				fds_ready++;
-				ports[p]->parse ();
-			}
-		}
-
-		/* timeout driven */
-
-		if (fds_ready < 2 && timeout != -1) {
-
-			for (MidiTimeoutList::iterator i = midi_timeouts.begin(); i != midi_timeouts.end(); ) {
-
-				MidiTimeoutList::iterator tmp;
-				tmp = i;
-				++tmp;
-
-				if (!(*i)()) {
-					midi_timeouts.erase (i);
-				}
-
-				i = tmp;
-			}
-		}
-	}
-}
-