major design changes: use glib event loop for MIDI thread/UI; rework design of BaseUI...
[ardour.git] / libs / ardour / session_midi.cc
index 6c0c48f50ec18b6f3e1585f6bae61ab244671872..4388fe6dca6d437fbe208315d36518d5d53e361a 100644 (file)
 
 #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 "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/smpte.h"
+#include "ardour/timecode.h"
 
 #include "i18n.h"
 
@@ -51,6 +54,7 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace MIDI;
+using namespace Glib;
 
 MachineControl::CommandSignature MMC_CommandSignature;
 MachineControl::ResponseSignature MMC_ResponseSignature;
@@ -145,7 +149,6 @@ Session::set_mtc_port (string port_tag)
 
   out:
        MTC_PortChanged(); /* EMIT SIGNAL */
-       change_midi_ports ();
        set_dirty();
        return 0;
 }
@@ -243,13 +246,12 @@ Session::set_mmc_port (string port_tag)
 
   out:
        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) {
@@ -277,7 +279,6 @@ Session::set_midi_port (string port_tag)
   out:
 #endif
        MIDI_PortChanged(); /* EMIT SIGNAL */
-       change_midi_ports ();
        set_dirty();
        return 0;
 }
@@ -319,7 +320,6 @@ Session::set_midi_clock_port (string port_tag)
 
   out:
        MIDIClock_PortChanged(); /* EMIT SIGNAL */
-       change_midi_ports ();
        set_dirty();
        return 0;
 }
@@ -330,7 +330,7 @@ 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: ");
@@ -354,10 +354,10 @@ 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 
+
+               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: ");
@@ -469,7 +469,7 @@ 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 */
@@ -492,9 +492,9 @@ Session::setup_midi_control ()
 }
 
 void
-Session::spp_start (Parser& ignored, nframes_t timestamp)
+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);
        }
 }
@@ -506,46 +506,23 @@ Session::spp_continue (Parser& ignored, nframes_t timestamp)
 }
 
 void
-Session::spp_stop (Parser& ignored, nframes_t timestamp)
+Session::spp_stop (Parser&, nframes_t /*timestamp*/)
 {
        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)
+Session::mmc_deferred_play (MIDI::MachineControl &/*mmc*/)
 {
-       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() && (!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();
@@ -553,7 +530,7 @@ 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())
                return;
@@ -581,7 +558,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);
@@ -589,7 +566,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 ();
@@ -597,7 +574,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()) {
 
@@ -617,7 +594,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;
@@ -638,7 +615,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 */
@@ -662,13 +639,17 @@ Session::mmc_step (MIDI::MachineControl &mmc, int steps)
        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 (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);
@@ -676,7 +657,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);
@@ -684,24 +665,24 @@ 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;
+       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;
@@ -725,7 +706,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;
@@ -763,54 +744,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.
  */
 int
-Session::send_full_time_code(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 */);
+       // Get timecode time for this transport frame
+       sample_to_timecode(_transport_frame, timecode, true /* use_offset */, false /* no subframes */);
 
-       transmitting_smpte_time = smpte;
-       outbound_mtc_smpte_frame = _transport_frame;
+       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, config.get_subframes_per_frame() );
-               outbound_mtc_smpte_frame += (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;
@@ -818,12 +789,12 @@ 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;
+       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)) {
@@ -836,9 +807,9 @@ Session::send_full_time_code(nframes_t nframes)
 
 /** 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
@@ -847,57 +818,57 @@ 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 (_mtc_port == 0 || !session_send_mtc || transmitting_smpte_time.negative
+       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 */
-       nframes_t quarter_frame_duration = ((long) _frames_per_smpte_frame) >> 2;
+       nframes_t quarter_frame_duration = ((long) _frames_per_timecode_frame) >> 2;
 
-       // cerr << "(MTC) TR: " << _transport_frame << " - SF: " << outbound_mtc_smpte_frame
-       // << " - NQ: " << next_quarter_frame_to_send << " - FD" << quarter_frame_duration << endl;
+       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 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
@@ -913,13 +884,12 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes)
                        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_SET(foo,"sending ");
+               DEBUG_STR(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 +897,14 @@ 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;
+                       //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;
                }
        }
 
@@ -950,7 +920,7 @@ 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 << " - " << session_send_mmc << endl;
@@ -963,15 +933,15 @@ Session::deliver_mmc (MIDI::MachineControl::Command cmd, nframes_t where)
 
        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:
@@ -1045,257 +1015,17 @@ Session::mmc_step_timeout ()
 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;
-       }
-
+       midi_control_ui = new MidiControlUI (*this);
+       midi_control_ui->run ();
        return 0;
 }
 
 void
 Session::terminate_midi_thread ()
 {
-       if (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::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;
-                       }
-               }
-       }
-}