X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_midi.cc;h=e5f4b9cd6e43ff25c52413e644fd4d6357d58463;hb=80ec3fb37e0156cf02a25e9b353879819b66057d;hp=1f8f28cfc16dd5c86365d3300baa676ef7556ec0;hpb=bde4d3f3412e16543faff7bd489beb040311b781;p=ardour.git

diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 1f8f28cfc1..e5f4b9cd6e 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -1,4 +1,3 @@
-
 /*
   Copyright (C) 1999-2002 Paul Davis
 
@@ -33,9 +32,12 @@
 #include "midi++/mmc.h"
 #include "midi++/port.h"
 #include "midi++/manager.h"
+
 #include "pbd/error.h"
 #include "pbd/pthread_utils.h"
 
+#include "timecode/time.h"
+
 #include "ardour/configuration.h"
 #include "ardour/debug.h"
 #include "ardour/audioengine.h"
@@ -46,7 +48,6 @@
 #include "ardour/audio_diskstream.h"
 #include "ardour/slave.h"
 #include "ardour/cycles.h"
-#include "ardour/timecode.h"
 
 #include "i18n.h"
 
@@ -71,298 +72,6 @@ Session::midi_panic()
 	}
 }
 
-int
-Session::use_config_midi_ports ()
-{
-	string port_name;
-
-	if (default_mmc_port) {
-		_mmc->set_port (default_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 << string_compose (_("%1 is slaved to MTC - port cannot be reset"), PROGRAM_NAME) << 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 */
-	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 */
-	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 << string_compose (_("%1 is slaved to MIDI Clock - port cannot be reset"), PROGRAM_NAME) << 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;
-}
-
-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 ()
 {
@@ -382,23 +91,23 @@ Session::setup_midi_control ()
 }
 
 void
-Session::spp_start (Parser &, nframes_t /*timestamp*/)
+Session::spp_start (Parser &, framepos_t /*timestamp*/)
 {
-	if (Config->get_mmc_control() && (!config.get_external_sync() || config.get_sync_source() != JACK)) {
+	if (Config->get_mmc_control ()) {
 		request_transport_speed (1.0);
 	}
 }
 
 void
-Session::spp_continue (Parser& ignored, nframes_t timestamp)
+Session::spp_continue (Parser& ignored, framepos_t timestamp)
 {
 	spp_start (ignored, timestamp);
 }
 
 void
-Session::spp_stop (Parser&, nframes_t /*timestamp*/)
+Session::spp_stop (Parser&, framepos_t /*timestamp*/)
 {
-	if (Config->get_mmc_control()) {
+	if (Config->get_mmc_control ()) {
 		request_stop ();
 	}
 }
@@ -406,7 +115,7 @@ Session::spp_stop (Parser&, nframes_t /*timestamp*/)
 void
 Session::mmc_deferred_play (MIDI::MachineControl &/*mmc*/)
 {
-	if (Config->get_mmc_control() && (!config.get_external_sync() || (config.get_sync_source() != JACK))) {
+	if (Config->get_mmc_control ()) {
 		request_transport_speed (1.0);
 	}
 }
@@ -414,7 +123,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();
 	}
 }
@@ -422,8 +131,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 */
 
@@ -450,7 +160,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);
 	}
 }
@@ -458,7 +168,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 ();
 	}
 }
@@ -466,7 +176,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
@@ -486,7 +196,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;
 	}
 
@@ -525,7 +235,7 @@ 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) {
@@ -541,7 +251,7 @@ Session::mmc_step (MIDI::MachineControl &/*mmc*/, int steps)
 void
 Session::mmc_rewind (MIDI::MachineControl &/*mmc*/)
 {
-	if (Config->get_mmc_control()) {
+	if (Config->get_mmc_control ()) {
 		request_transport_speed(-8.0f);
 	}
 }
@@ -549,7 +259,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);
 	}
 }
@@ -557,11 +267,11 @@ 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;
+	framepos_t target_frame;
 	Timecode::Time timecode;
 
 	timecode.hours = mmc_tc[0] & 0xf;
@@ -574,8 +284,8 @@ Session::mmc_locate (MIDI::MachineControl &/*mmc*/, const MIDI::byte* mmc_tc)
 	// 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
@@ -598,7 +308,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;
 	}
 
@@ -607,28 +317,29 @@ 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;
 			}
 		}
 	}
@@ -637,9 +348,10 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled)
 /** 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] */
@@ -649,25 +361,25 @@ Session::send_full_time_code(nframes_t /*nframes*/)
 
 	_send_timecode_update = false;
 
-	if (_mtc_port == 0 || !session_send_mtc || _slave) {
+	if (!Config->get_send_mtc() || _slave) {
 		return 0;
 	}
 
-	// Get timecode time for this transport frame
-	sample_to_timecode(_transport_frame, timecode, 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_timecode_time = timecode;
-	outbound_mtc_timecode_frame = _transport_frame;
+	outbound_mtc_timecode_frame = t;
 
 	// I don't understand this bit yet.. [DR]
 	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 += (nframes_t) _frames_per_timecode_frame;
+		outbound_mtc_timecode_frame += _frames_per_timecode_frame;
 	}
 
 	// Compensate for audio latency
-	outbound_mtc_timecode_frame += _worst_output_latency;
+	outbound_mtc_timecode_frame += worst_playback_latency();
 	next_quarter_frame_to_send = 0;
 
 	// Sync slave to the same Timecode time as we are on
@@ -684,25 +396,26 @@ Session::send_full_time_code(nframes_t /*nframes*/)
 	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.
+ * 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 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)
 {
-	if (_mtc_port == 0 || _slave || !session_send_mtc || transmitting_timecode_time.negative || (next_quarter_frame_to_send < 0)) {
+	if (_slave || !_send_qf_mtc || transmitting_timecode_time.negative || (next_quarter_frame_to_send < 0)) {
 		// cerr << "(MTC) Not sending MTC\n";
 		return 0;
 	}
@@ -711,59 +424,56 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes)
 	assert (next_quarter_frame_to_send <= 7);
 
 	/* Duration of one quarter frame */
-	nframes_t quarter_frame_duration = ((long) _frames_per_timecode_frame) >> 2;
+	framecnt_t const quarter_frame_duration = ((framecnt_t) _frames_per_timecode_frame) >> 2;
 
-	DEBUG_TRACE (DEBUG::MTC, string_compose ("TF %1 SF %2 NQ %3 FD %4\n",  _transport_frame, outbound_mtc_timecode_frame,
+	DEBUG_TRACE (DEBUG::MTC, string_compose ("TF %1 SF %2 NQ %3 FD %4\n", start_frame, outbound_mtc_timecode_frame,
 						 next_quarter_frame_to_send, quarter_frame_duration));
 
-	assert((outbound_mtc_timecode_frame + (next_quarter_frame_to_send * quarter_frame_duration))
-			>= _transport_frame);
-
+	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_timecode_frame +
-				(next_quarter_frame_to_send * quarter_frame_duration))) {
+	/* Send quarter frames for this cycle */
+	while (end_frame > (outbound_mtc_timecode_frame + (next_quarter_frame_to_send * quarter_frame_duration))) {
 
 		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_timecode_time.frames & 0xf);
+				mtc_msg[1] = 0x00 | (transmitting_timecode_time.frames & 0xf);
 				break;
 			case 1:
-				mtc_msg[1] =  0x10 | ((transmitting_timecode_time.frames & 0xf0) >> 4);
+				mtc_msg[1] = 0x10 | ((transmitting_timecode_time.frames & 0xf0) >> 4);
 				break;
 			case 2:
-				mtc_msg[1] =  0x20 | (transmitting_timecode_time.seconds & 0xf);
+				mtc_msg[1] = 0x20 | (transmitting_timecode_time.seconds & 0xf);
 				break;
 			case 3:
-				mtc_msg[1] =  0x30 | ((transmitting_timecode_time.seconds & 0xf0) >> 4);
+				mtc_msg[1] = 0x30 | ((transmitting_timecode_time.seconds & 0xf0) >> 4);
 				break;
 			case 4:
-				mtc_msg[1] =  0x40 | (transmitting_timecode_time.minutes & 0xf);
+				mtc_msg[1] = 0x40 | (transmitting_timecode_time.minutes & 0xf);
 				break;
 			case 5:
 				mtc_msg[1] = 0x50 | ((transmitting_timecode_time.minutes & 0xf0) >> 4);
 				break;
 			case 6:
-				mtc_msg[1] = 0x60 | ((mtc_timecode_bits|transmitting_timecode_time.hours) & 0xf);
+				mtc_msg[1] = 0x60 | ((mtc_timecode_bits | transmitting_timecode_time.hours) & 0xf);
 				break;
 			case 7:
-				mtc_msg[1] = 0x70 | (((mtc_timecode_bits|transmitting_timecode_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_timecode_frame
-			+ (quarter_frame_duration * next_quarter_frame_to_send));
+		const framepos_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);
+		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;
 			return -1;
@@ -784,8 +494,8 @@ Session::send_midi_time_code_for_cycle(nframes_t nframes)
 			// Wrap quarter frame counter
 			next_quarter_frame_to_send = 0;
 			// Increment timecode time twice
-			Timecode::increment( transmitting_timecode_time, config.get_subframes_per_frame() );
-			Timecode::increment( transmitting_timecode_time, config.get_subframes_per_frame() );
+			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
 			//timecode_to_sample( transmitting_timecode_time, outbound_mtc_timecode_frame, true /* use_offset */, false );
 			outbound_mtc_timecode_frame += 8 * quarter_frame_duration;
@@ -825,7 +535,7 @@ Session::mmc_step_timeout ()
 
 	/* slow it down */
 
-	request_transport_speed (_transport_speed * 0.75);
+	request_transport_speed_nonzero (_transport_speed * 0.75);
 	return true;
 }