X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_midi.cc;h=d8859e07c03ca0106201fd258acb946ebaad0b30;hb=4ceac6311669d58390be0ebcc35401c25c148dde;hp=b3a5ec6e01b0d87759f906137ba5f63c6633c84c;hpb=fedf3d34f32264ac57c6a222b678dc90f2bb1a88;p=ardour.git

diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index b3a5ec6e01..d8859e07c0 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -1,6 +1,6 @@
 
 /*
-  Copyright (C) 1999-2002 Paul Davis 
+  Copyright (C) 1999-2002 Paul Davis
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
   along with this program; if not, write to the Free Software
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-  $Id$
 */
 
 #include <string>
@@ -27,21 +26,27 @@
 #include <fcntl.h>
 #include <poll.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 <ardour/configuration.h>
-#include <ardour/audioengine.h>
-#include <ardour/session.h>
-#include <ardour/audio_track.h>
-#include <ardour/audio_diskstream.h>
-#include <ardour/slave.h>
-#include <ardour/cycles.h>
-#include <ardour/smpte.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 "pbd/pthread_utils.h"
+
+#include "ardour/configuration.h"
+#include "ardour/debug.h"
+#include "ardour/audioengine.h"
+#include "ardour/session.h"
+#include "ardour/audio_track.h"
+#include "ardour/midi_track.h"
+#include "ardour/midi_ui.h"
+#include "ardour/audio_diskstream.h"
+#include "ardour/slave.h"
+#include "ardour/cycles.h"
+#include "ardour/timecode.h"
 
 #include "i18n.h"
 
@@ -49,11 +54,26 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace MIDI;
+using namespace Glib;
 
 MachineControl::CommandSignature MMC_CommandSignature;
 MachineControl::ResponseSignature MMC_ResponseSignature;
 
-MultiAllocSingleReleasePool Session::MIDIRequest::pool ("midi", sizeof (Session::MIDIRequest), 1024);
+
+void
+Session::midi_panic()
+{
+	{
+		boost::shared_ptr<RouteList> r = routes.reader ();
+
+		for (RouteList::iterator i = r->begin(); i != r->end(); ++i) {
+			MidiTrack *track = dynamic_cast<MidiTrack*>((*i).get());
+			if (track != 0) {
+				track->midi_panic();
+			}
+		}
+	}
+}
 
 int
 Session::use_config_midi_ports ()
@@ -78,8 +98,14 @@ Session::use_config_midi_ports ()
 		set_midi_port ("");
 	}
 
+	if (default_midi_clock_port) {
+		set_midi_clock_port (default_midi_clock_port->name());
+	} else {
+		set_midi_clock_port ("");
+	}
+
 	return 0;
-}	
+}
 
 
 /***********************************************************************
@@ -89,7 +115,6 @@ Session::use_config_midi_ports ()
 int
 Session::set_mtc_port (string port_tag)
 {
-#if 0
 	MTC_Slave *ms;
 
 	if (port_tag.length() == 0) {
@@ -123,17 +148,34 @@ Session::set_mtc_port (string port_tag)
 	Config->set_mtc_port_name (port_tag);
 
   out:
-	#endif
 	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)
 {
-#if 0
+	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;
@@ -151,58 +193,52 @@ Session::set_mmc_port (string port_tag)
 	_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 = 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_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1));
+	mmc->DeferredPlay.connect_same_thread (*this, boost::bind (&Session::mmc_deferred_play, this, _1));
+	mmc->Stop.connect_same_thread (*this, boost::bind (&Session::mmc_stop, this, _1));
+	mmc->FastForward.connect_same_thread (*this, boost::bind (&Session::mmc_fast_forward, this, _1));
+	mmc->Rewind.connect_same_thread (*this, boost::bind (&Session::mmc_rewind, this, _1));
+	mmc->Pause.connect_same_thread (*this, boost::bind (&Session::mmc_pause, this, _1));
+	mmc->RecordPause.connect_same_thread (*this, boost::bind (&Session::mmc_record_pause, this, _1));
+	mmc->RecordStrobe.connect_same_thread (*this, boost::bind (&Session::mmc_record_strobe, this, _1));
+	mmc->RecordExit.connect_same_thread (*this, boost::bind (&Session::mmc_record_exit, this, _1));
+	mmc->Locate.connect_same_thread (*this, boost::bind (&Session::mmc_locate, this, _1, _2));
+	mmc->Step.connect_same_thread (*this, boost::bind (&Session::mmc_step, this, _1, _2));
+	mmc->Shuttle.connect_same_thread (*this, boost::bind (&Session::mmc_shuttle, this, _1, _2, _3));
+	mmc->TrackRecordStatusChange.connect_same_thread (*this, boost::bind (&Session::mmc_record_enable, this, _1, _2, _3));
 
-	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));
-	
+	_mmc_port->input()->start.connect_same_thread (*this, boost::bind (&Session::spp_start, this, _1, _2));
+	_mmc_port->input()->contineu.connect_same_thread (*this, boost::bind (&Session::spp_continue, this, _1, _2));
+	_mmc_port->input()->stop.connect_same_thread (*this, boost::bind (&Session::spp_stop, this, _1, _2));
+
 	Config->set_mmc_port_name (port_tag);
+
   out:
-#endif
 	MMC_PortChanged(); /* EMIT SIGNAL */
-	change_midi_ports ();
 	set_dirty();
 	return 0;
 }
 
 int
-Session::set_midi_port (string port_tag)
+Session::set_midi_port (string /*port_tag*/)
 {
 #if 0
 	if (port_tag.length() == 0) {
@@ -220,9 +256,9 @@ Session::set_midi_port (string port_tag)
 	}
 
 	_midi_port = port;
-	
+
 	/* XXX need something to forward this to control protocols ? or just
-	   use the signal below 
+	   use the signal below
 	*/
 
 	Config->set_midi_port_name (port_tag);
@@ -230,7 +266,47 @@ Session::set_midi_port (string 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 */
 	set_dirty();
 	return 0;
 }
@@ -238,9 +314,10 @@ Session::set_midi_port (string port_tag)
 void
 Session::set_trace_midi_input (bool yn, MIDI::Port* port)
 {
-#if 0
 	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: ");
@@ -252,7 +329,7 @@ Session::set_trace_midi_input (bool yn, MIDI::Port* port)
 				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: ");
@@ -264,8 +341,16 @@ Session::set_trace_midi_input (bool yn, MIDI::Port* port)
 				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: ");
+			}
+		}
 	}
-#endif
 
 	Config->set_trace_midi_input (yn);
 }
@@ -273,7 +358,6 @@ Session::set_trace_midi_input (bool yn, MIDI::Port* port)
 void
 Session::set_trace_midi_output (bool yn, MIDI::Port* port)
 {
-#if 0
 	MIDI::Parser* output_parser;
 
 	if (port) {
@@ -286,7 +370,7 @@ Session::set_trace_midi_output (bool yn, MIDI::Port* port)
 				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: ");
@@ -300,7 +384,6 @@ Session::set_trace_midi_output (bool yn, MIDI::Port* port)
 		}
 
 	}
-#endif
 
 	Config->set_trace_midi_output (yn);
 }
@@ -308,7 +391,6 @@ Session::set_trace_midi_output (bool yn, MIDI::Port* port)
 bool
 Session::get_trace_midi_input(MIDI::Port *port)
 {
-#if 0
 	MIDI::Parser* input_parser;
 	if (port) {
 		if ((input_parser = port->input()) != 0) {
@@ -321,7 +403,7 @@ Session::get_trace_midi_input(MIDI::Port *port)
 				return input_parser->tracing();
 			}
 		}
-		
+
 		if (_mtc_port) {
 			if ((input_parser = _mtc_port->input()) != 0) {
 				return input_parser->tracing();
@@ -334,7 +416,6 @@ Session::get_trace_midi_input(MIDI::Port *port)
 			}
 		}
 	}
-#endif
 
 	return false;
 }
@@ -342,7 +423,6 @@ Session::get_trace_midi_input(MIDI::Port *port)
 bool
 Session::get_trace_midi_output(MIDI::Port *port)
 {
-#if 0
 	MIDI::Parser* output_parser;
 	if (port) {
 		if ((output_parser = port->output()) != 0) {
@@ -355,7 +435,7 @@ Session::get_trace_midi_output(MIDI::Port *port)
 				return output_parser->tracing();
 			}
 		}
-		
+
 		if (_mtc_port) {
 			if ((output_parser = _mtc_port->output()) != 0) {
 				return output_parser->tracing();
@@ -368,7 +448,6 @@ Session::get_trace_midi_output(MIDI::Port *port)
 			}
 		}
 	}
-#endif
 
 	return false;
 
@@ -377,18 +456,18 @@ Session::get_trace_midi_output(MIDI::Port *port)
 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] = 0x7f; // "broadcast" device ID
+	mmc_buffer[2] = (mmc ? mmc->send_device_id() : 0x7f);
 	mmc_buffer[3] = 0x6;  // MCC
 
 	/* Set up the qtr frame message */
-	
+
 	mtc_msg[0] = 0xf1;
 	mtc_msg[2] = 0xf1;
 	mtc_msg[4] = 0xf1;
@@ -397,82 +476,24 @@ Session::setup_midi_control ()
 	mtc_msg[10] = 0xf1;
 	mtc_msg[12] = 0xf1;
 	mtc_msg[14] = 0xf1;
-
-	if (_mmc_port != 0) {
-
-		Config->set_send_mmc (session_send_mmc);
-
-	} else {
-
-		mmc = 0;
-		session_send_mmc = false;
-	}
-
-	if (_mtc_port != 0) {
-
-		Config->set_send_mtc (session_send_mtc);
-
-	} else {
-		session_send_mtc = false;
-	}
-}
-
-#if 0
-int
-Session::midi_read (MIDI::Port* port)
-{
-	MIDI::byte buf[512];
-	
-	/* reading from the MIDI port activates the Parser
-	   that in turn generates signals that we care
-	   about. the port is already set to NONBLOCK so that
-	   can read freely here.
-	*/
-	
-	while (1) {
-		
-		// cerr << "+++ READ ON " << port->name() << endl;
-		
-		int nread = port->read (buf, sizeof (buf));
-
-		// cerr << "-- READ (" << nread << " ON " << port->name() << endl;
-		
-		if (nread > 0) {
-			if ((size_t) nread < sizeof (buf)) {
-				break;
-			} else {
-				continue;
-			}
-		} else if (nread == 0) {
-			break;
-		} else if (errno == EAGAIN) {
-			break;
-		} else {
-			fatal << string_compose(_("Error reading from MIDI port %1"), port->name()) << endmsg;
-			/*NOTREACHED*/
-		}
-	}
-
-	return 0;
 }
-#endif
 
 void
-Session::spp_start (Parser& ignored)
+Session::spp_start (Parser &, nframes_t /*timestamp*/)
 {
-	if (Config->get_mmc_control() && (Config->get_slave_source() != MTC)) {
+	if (Config->get_mmc_control() && (!config.get_external_sync() || config.get_sync_source() != JACK)) {
 		request_transport_speed (1.0);
 	}
 }
 
 void
-Session::spp_continue (Parser& ignored)
+Session::spp_continue (Parser& ignored, nframes_t timestamp)
 {
-	spp_start (ignored);
+	spp_start (ignored, timestamp);
 }
 
 void
-Session::spp_stop (Parser& ignored)
+Session::spp_stop (Parser&, nframes_t /*timestamp*/)
 {
 	if (Config->get_mmc_control()) {
 		request_stop ();
@@ -480,15 +501,15 @@ Session::spp_stop (Parser& ignored)
 }
 
 void
-Session::mmc_deferred_play (MIDI::MachineControl &mmc)
+Session::mmc_deferred_play (MIDI::MachineControl &/*mmc*/)
 {
-	if (Config->get_mmc_control() && (Config->get_slave_source() != MTC)) {
+	if (Config->get_mmc_control() && (!config.get_external_sync() || (config.get_sync_source() != JACK))) {
 		request_transport_speed (1.0);
 	}
 }
 
 void
-Session::mmc_record_pause (MIDI::MachineControl &mmc)
+Session::mmc_record_pause (MIDI::MachineControl &/*mmc*/)
 {
 	if (Config->get_mmc_control()) {
 		maybe_enable_record();
@@ -496,9 +517,9 @@ Session::mmc_record_pause (MIDI::MachineControl &mmc)
 }
 
 void
-Session::mmc_record_strobe (MIDI::MachineControl &mmc)
+Session::mmc_record_strobe (MIDI::MachineControl &/*mmc*/)
 {
-	if (!Config->get_mmc_control()) 
+	if (!Config->get_mmc_control())
 		return;
 
 	/* record strobe does an implicit "Play" command */
@@ -510,11 +531,11 @@ Session::mmc_record_strobe (MIDI::MachineControl &mmc)
 		   its not the same as maybe_enable_record() though, because
 		   that *can* switch to Recording, which we do not want.
 		*/
-		
+
 		save_state ("", true);
 		g_atomic_int_set (&_record_status, Enabled);
 		RecordStateChanged (); /* EMIT SIGNAL */
-		
+
 		request_transport_speed (1.0);
 
 	} else {
@@ -524,7 +545,7 @@ Session::mmc_record_strobe (MIDI::MachineControl &mmc)
 }
 
 void
-Session::mmc_record_exit (MIDI::MachineControl &mmc)
+Session::mmc_record_exit (MIDI::MachineControl &/*mmc*/)
 {
 	if (Config->get_mmc_control()) {
 		disable_record (false);
@@ -532,7 +553,7 @@ Session::mmc_record_exit (MIDI::MachineControl &mmc)
 }
 
 void
-Session::mmc_stop (MIDI::MachineControl &mmc)
+Session::mmc_stop (MIDI::MachineControl &/*mmc*/)
 {
 	if (Config->get_mmc_control()) {
 		request_stop ();
@@ -540,7 +561,7 @@ Session::mmc_stop (MIDI::MachineControl &mmc)
 }
 
 void
-Session::mmc_pause (MIDI::MachineControl &mmc)
+Session::mmc_pause (MIDI::MachineControl &/*mmc*/)
 {
 	if (Config->get_mmc_control()) {
 
@@ -560,7 +581,7 @@ Session::mmc_pause (MIDI::MachineControl &mmc)
 static bool step_queued = false;
 
 void
-Session::mmc_step (MIDI::MachineControl &mmc, int steps)
+Session::mmc_step (MIDI::MachineControl &/*mmc*/, int steps)
 {
 	if (!Config->get_mmc_control()) {
 		return;
@@ -570,7 +591,7 @@ Session::mmc_step (MIDI::MachineControl &mmc, int steps)
 	struct timeval diff = { 0, 0 };
 
 	gettimeofday (&now, 0);
-	
+
 	timersub (&now, &last_mmc_step, &diff);
 
 	gettimeofday (&now, 0);
@@ -579,10 +600,10 @@ Session::mmc_step (MIDI::MachineControl &mmc, int steps)
 	if (last_mmc_step.tv_sec != 0 && (diff.tv_usec + (diff.tv_sec * 1000000)) < _engine.usecs_per_cycle()) {
 		return;
 	}
-	
+
 	double diff_secs = diff.tv_sec + (diff.tv_usec / 1000000.0);
-	double cur_speed = (((steps * 0.5) * Config->get_smpte_frames_per_second()) / diff_secs) / Config->get_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 */
 		step_speed = cur_speed;
@@ -593,25 +614,29 @@ Session::mmc_step (MIDI::MachineControl &mmc, int steps)
 	step_speed *= 0.25;
 
 #if 0
-	cerr << "delta = " << diff_secs 
+	cerr << "delta = " << diff_secs
 	     << " ct = " << _transport_speed
 	     << " steps = " << steps
-	     << " new speed = " << cur_speed 
+	     << " new speed = " << cur_speed
 	     << " speed = " << step_speed
 	     << endl;
-#endif	
+#endif
 
 	request_transport_speed (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)
+Session::mmc_rewind (MIDI::MachineControl &/*mmc*/)
 {
 	if (Config->get_mmc_control()) {
 		request_transport_speed(-8.0f);
@@ -619,7 +644,7 @@ Session::mmc_rewind (MIDI::MachineControl &mmc)
 }
 
 void
-Session::mmc_fast_forward (MIDI::MachineControl &mmc)
+Session::mmc_fast_forward (MIDI::MachineControl &/*mmc*/)
 {
 	if (Config->get_mmc_control()) {
 		request_transport_speed(8.0f);
@@ -627,23 +652,25 @@ Session::mmc_fast_forward (MIDI::MachineControl &mmc)
 }
 
 void
-Session::mmc_locate (MIDI::MachineControl &mmc, const MIDI::byte* mmc_tc)
+Session::mmc_locate (MIDI::MachineControl &/*mmc*/, const MIDI::byte* mmc_tc)
 {
 	if (!Config->get_mmc_control()) {
 		return;
 	}
 
 	nframes_t target_frame;
-	SMPTE::Time smpte;
-
-	smpte.hours = mmc_tc[0] & 0xf;
-	smpte.minutes = mmc_tc[1];
-	smpte.seconds = mmc_tc[2];
-	smpte.frames = mmc_tc[3];
-  
-	// Also takes smpte offset into account:
-	smpte_to_sample( smpte, target_frame, true /* use_offset */, false /* use_subframes */ );
-	
+	Timecode::Time timecode;
+
+	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 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;
 	}
@@ -666,7 +693,7 @@ Session::mmc_locate (MIDI::MachineControl &mmc, const MIDI::byte* mmc_tc)
 }
 
 void
-Session::mmc_shuttle (MIDI::MachineControl &mmc, float speed, bool forw)
+Session::mmc_shuttle (MIDI::MachineControl &/*mmc*/, float speed, bool forw)
 {
 	if (!Config->get_mmc_control()) {
 		return;
@@ -690,7 +717,7 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled)
 
 		RouteList::iterator i;
 		boost::shared_ptr<RouteList> r = routes.reader();
-		
+
 		for (i = r->begin(); i != r->end(); ++i) {
 			AudioTrack *at;
 
@@ -704,60 +731,44 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled)
 	}
 }
 
-
-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.
- *
- * Audio thread only, realtime safe.  MIDI::Manager::cycle_start must
- * have been called with the appropriate nframes parameter this cycle.
  */
 int
-Session::send_full_time_code(jack_nframes_t nframes)
+Session::send_full_time_code(nframes_t /*nframes*/)
 {
 	/* 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) {
 		return 0;
 	}
-	
-	// Get smpte time for this transport frame
-	sample_to_smpte(_transport_frame, smpte, true /* use_offset */, false /* no subframes */);
 
-	transmitting_smpte_time = smpte;
-	outbound_mtc_smpte_frame = _transport_frame;
+	// Get timecode time for this transport frame
+	sample_to_timecode(_transport_frame, timecode, true /* use_offset */, false /* no subframes */);
+
+	transmitting_timecode_time = timecode;
+	outbound_mtc_timecode_frame = _transport_frame;
 
 	// I don't understand this bit yet.. [DR]
-	if (((mtc_smpte_bits >> 5) != MIDI::MTC_25_FPS) && (transmitting_smpte_time.frames % 2)) {
+	if (((mtc_timecode_bits >> 5) != MIDI::MTC_25_FPS) && (transmitting_timecode_time.frames % 2)) {
 		// start MTC quarter frame transmission on an even frame
-		SMPTE::increment( transmitting_smpte_time );
-		outbound_mtc_smpte_frame += (jack_nframes_t) _frames_per_smpte_frame;
+		Timecode::increment( transmitting_timecode_time, config.get_subframes_per_frame() );
+		outbound_mtc_timecode_frame += (nframes_t) _frames_per_timecode_frame;
 	}
 
 	// Compensate for audio latency
-	outbound_mtc_smpte_frame += _worst_output_latency;
+	outbound_mtc_timecode_frame += _worst_output_latency;
 
 	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;
@@ -765,15 +776,15 @@ Session::send_full_time_code(jack_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;
+	msg[5] = mtc_timecode_bits | timecode.hours;
+	msg[6] = timecode.minutes;
+	msg[7] = timecode.seconds;
+	msg[8] = timecode.frames;
 
-	cerr << "MTC: Sending full time code at " << outbound_mtc_smpte_frame << endl;
+	cerr << "MTC: Sending full time code at " << outbound_mtc_timecode_frame << endl;
 
 	// Send message at offset 0, sent time is for the start of this cycle
-	if (!_mtc_port->midimsg (msg, sizeof (msg), 0)) {
+	if (_mtc_port->midimsg (msg, sizeof (msg), 0)) {
 		error << _("Session: could not send full MIDI time code") << endmsg;
 		return -1;
 	}
@@ -781,113 +792,107 @@ Session::send_full_time_code(jack_nframes_t nframes)
 	return 0;
 }
 
-
-/** Sends MTC (quarter-frame) messages for this cycle.
+/** 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
+ * 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(jack_nframes_t nframes)
-{	
+Session::send_midi_time_code_for_cycle(nframes_t nframes)
+{
 	assert (next_quarter_frame_to_send >= 0);
 	assert (next_quarter_frame_to_send <= 7);
-	
-	if (next_quarter_frame_to_send < 0)
-	{
-		printf("Negative????\n");
-	}
 
-	if (_mtc_port == 0 || !session_send_mtc || transmitting_smpte_time.negative
-			/*|| (next_quarter_frame_to_send < 0)*/ ) {
-		//printf("(MTC) Not sending MTC\n");
+	if (_mtc_port == 0 || !session_send_mtc || transmitting_timecode_time.negative
+	    /*|| (next_quarter_frame_to_send < 0)*/ ) {
+		// cerr << "(MTC) Not sending MTC\n";
 		return 0;
 	}
-	
+
 	/* Duration of one quarter frame */
-	jack_nframes_t quarter_frame_duration = ((long) _frames_per_smpte_frame) >> 2;
-	
-	//cerr << "(MTC) TR: " << _transport_frame << " - SF: " << outbound_mtc_smpte_frame
-	//<< " - NQ: " << next_quarter_frame_to_send << " - FD" << quarter_frame_duration << endl;
-		
+	nframes_t quarter_frame_duration = ((long) _frames_per_timecode_frame) >> 2;
+
+	DEBUG_TRACE (DEBUG::MTC, string_compose ("TF %1 SF %2 NQ %3 FD %\4n",  _transport_frame, outbound_mtc_timecode_frame,
+						 next_quarter_frame_to_send, quarter_frame_duration));
+
 	// FIXME: this should always be true
-	//assert((outbound_mtc_smpte_frame + (next_quarter_frame_to_send * quarter_frame_duration))
+	//assert((outbound_mtc_timecode_frame + (next_quarter_frame_to_send * quarter_frame_duration))
 	//		> _transport_frame);
 
-	
+
 	// Send quarter frames for this cycle
-	while (_transport_frame + nframes > (outbound_mtc_smpte_frame +
+	while (_transport_frame + nframes > (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 jack_nframes_t msg_time = (outbound_mtc_smpte_frame
+		}
+
+		const nframes_t msg_time = (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);
 
-		jack_nframes_t out_stamp = msg_time - _transport_frame;
+		nframes_t out_stamp = msg_time - _transport_frame;
 		assert(out_stamp < nframes);
 
-		if (!_mtc_port->midimsg (mtc_msg, 2, out_stamp)) {
-			error << string_compose(_("Session: cannot send quarter-frame MTC message (%1)"), strerror (errno)) 
-				<< endmsg;
+		if (_mtc_port->midimsg (mtc_msg, 2, out_stamp)) {
+			error << string_compose(_("Session: cannot send quarter-frame MTC message (%1)"), strerror (errno))
+			      << 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++;
 
 		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 );
-			SMPTE::increment( transmitting_smpte_time );        
+			// 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;
+			//timecode_to_sample( transmitting_timecode_time, outbound_mtc_timecode_frame, true /* use_offset */, false );
+			outbound_mtc_timecode_frame += 8 * quarter_frame_duration;
 			// Compensate for audio latency
-			outbound_mtc_smpte_frame += _worst_output_latency;
+			outbound_mtc_timecode_frame += _worst_output_latency;
 		}
 	}
 
@@ -897,58 +902,34 @@ Session::send_midi_time_code_for_cycle(jack_nframes_t nframes)
 /***********************************************************************
  OUTBOUND MMC STUFF
 **********************************************************************/
-/*
-void
-Session::send_mmc_in_another_thread (MIDI::MachineControl::Command cmd, nframes_t target_frame)
-{
-	MIDIRequest* request;
-
-	if (_mtc_port == 0 || !session_send_mmc) {
-		return;
-	}
-
-	request = new MIDIRequest;
-	request->type = MIDIRequest::SendMMC;
-	request->mmc_cmd = cmd;
-	request->locate_frame = target_frame;
-
-	midi_requests.write (&request, 1);
-	poke_midi_thread ();
-}
-*/
 
-/** Send an MMC command at the given absolute timestamp (@a where).
- *
- * This must be called in the process thread, and @a where must fall within
- * this process cycle or horrible things will happen.
- */
 void
 Session::deliver_mmc (MIDI::MachineControl::Command cmd, nframes_t where)
 {
 	using namespace MIDI;
 	int nbytes = 4;
-	SMPTE::Time smpte;
+	Timecode::Time timecode;
 
 	if (_mmc_port == 0 || !session_send_mmc) {
-		//cerr << "Not delivering MMC " << _mmc_port << " - " << send_mmc << endl;
+		// cerr << "Not delivering MMC " << _mmc_port << " - " << session_send_mmc << endl;
 		return;
 	}
 
 	mmc_buffer[nbytes++] = cmd;
 
-	//cerr << "delivering MMC, cmd = " << hex << (int) cmd << dec << endl;
-	
+	// cerr << "delivering MMC, cmd = " << hex << (int) cmd << dec << endl;
+
 	switch (cmd) {
 	case MachineControl::cmdLocate:
-		smpte_time_subframes (where, smpte);
+		timecode_time_subframes (where, timecode);
 
 		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;
+		mmc_buffer[nbytes++] = timecode.hours;
+		mmc_buffer[nbytes++] = timecode.minutes;
+		mmc_buffer[nbytes++] = timecode.seconds;
+		mmc_buffer[nbytes++] = timecode.frames;
+		mmc_buffer[nbytes++] = timecode.subframes;
 		break;
 
 	case MachineControl::cmdStop:
@@ -980,14 +961,9 @@ Session::deliver_mmc (MIDI::MachineControl::Command cmd, nframes_t where)
 
 		mmc_buffer[nbytes++] = 0xf7; // terminate SysEx/MMC message
 
-		assert(where >= _transport_frame);
-
-		// FIXME: timestamp correct? [DR]
-		if (!_mmc_port->midimsg (mmc_buffer, sizeof (mmc_buffer), where - _transport_frame)) {
+		if (_mmc_port->midimsg (mmc_buffer, nbytes, 0)) {
 			error << string_compose(_("MMC: cannot send command %1%2%3"), &hex, cmd, &dec) << endmsg;
-		} /*else {
-			cerr << "Sending MMC\n";
-		}*/
+		}
 	}
 }
 
@@ -1020,359 +996,24 @@ Session::mmc_step_timeout ()
 	return true;
 }
 
-
-void
-Session::send_midi_message (MIDI::Port * port, MIDI::eventType ev, MIDI::channel_t ch, MIDI::EventTwoBytes data)
-{
-	// in another thread, really
-	/*
-	MIDIRequest* request = new MIDIRequest;
-
-	request->type = MIDIRequest::SendMessage;
-	request->port = port;
-	request->ev = ev;
-	request->chan = ch;
-	request->data = data;
-	
-	midi_requests.write (&request, 1);
-	poke_midi_thread ();
-	*/
-}
-
-void
-Session::deliver_midi (MIDI::Port * port, MIDI::byte* buf, int32_t bufsize)
-{
-	// in another thread, really
-	/*
-	MIDIRequest* request = new MIDIRequest;
-
-	request->type = MIDIRequest::Deliver;
-	request->port = port;
-	request->buf = buf;
-	request->size = bufsize;
-	
-	midi_requests.write (&request, 1);
-	poke_midi_thread ();
-	*/
-}
-
-#if 0
-
-This is aaalll gone. 
-
-
-void
-Session::deliver_midi_message (MIDI::Port * port, MIDI::eventType ev, MIDI::channel_t ch, MIDI::EventTwoBytes data)
-{
-	if (port == 0 || ev == MIDI::none) {
-		return;
-	}
-
-	midi_msg[0] = (ev & 0xF0) | (ch & 0xF); 
-	midi_msg[1] = data.controller_number;
-	midi_msg[2] = data.value;
-
-	port->write (midi_msg, 3);
-}
-
-void
-Session::deliver_data (MIDI::Port * port, MIDI::byte* buf, int32_t size)
-{
-	if (port) {
-		port->write (buf, size);
-	}
-
-	/* this is part of the semantics of the Deliver request */
-
-	delete [] buf;
-}
-#endif
-
-
 /*---------------------------------------------------------------------------
-  MIDI THREAD 
+  MIDI THREAD
   ---------------------------------------------------------------------------*/
 
-#if 0
 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;
-	}
-
-	// pthread_detach (midi_thread);
-
+	midi_control_ui = new MidiControlUI (*this);
+	midi_control_ui->run ();
 	return 0;
 }
 
 void
 Session::terminate_midi_thread ()
 {
-	MIDIRequest* request = new MIDIRequest;
-	void* status;
-
-	request->type = MIDIRequest::Quit;
-
-	midi_requests.write (&request, 1);
-	poke_midi_thread ();
-
-	pthread_join (midi_thread, &status);
-}
-
-void
-Session::poke_midi_thread ()
-{
-	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_control_ui) {
+		midi_control_ui->quit ();
 	}
 }
 
-void *
-Session::_midi_thread_work (void* arg)
-{
-	pthread_setcancelstate (PTHREAD_CANCEL_ENABLE, 0);
-	pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, 0);
-
-	((Session *) arg)->midi_thread_work ();
-	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::ThreadCreatedWithRequestSize (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; 4 is the largest possible size for now */
-
-	ports.push_back (0);
-	ports.push_back (0);
-	ports.push_back (0);
-	ports.push_back (0);
-
-	while (1) {
-
-		nfds = 0;
-
-		pfd[nfds].fd = midi_request_pipe[0];
-		pfd[nfds].events = POLLIN|POLLHUP|POLLERR;
-		nfds++;
-
-		/* if we are using MMC control, we obviously have to listen
-		   on the appropriate port.
-		*/
-
-		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;
-			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;
-			nfds++;
-		}
-
-		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;
-			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;
-		restart = false;
-
-		/* 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::SendFullMTC:
-					// cerr << "send full MTC\n";
-					send_full_time_code ();
-					// cerr << "... done\n";
-					break;
-					
-				case MIDIRequest::SendMTC:
-					// cerr << "send qtr MTC\n";
-					send_midi_time_code ();
-					// cerr << "... done\n";
-					break;
-					
-				case MIDIRequest::SendMMC:
-					// cerr << "send MMC\n";
-					deliver_mmc (request->mmc_cmd, request->locate_frame);
-					// cerr << "... done\n";
-					break;
-
-				case MIDIRequest::SendMessage:
-					// cerr << "send Message\n";
-					deliver_midi_message (request->port, request->ev, request->chan, request->data);
-					// cerr << "... done\n";
-					break;
-					
-				case MIDIRequest::Deliver:
-					// cerr << "deliver\n";
-					deliver_data (_midi_port, request->buf, request->size);
-					// cerr << "... done\n";
-					break;
-						
-				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++;
-				midi_read (ports[p]);
-			}
-		}
-
-		/* 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;
-			}
-		}
-	}
-}
-#endif