X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_midi.cc;h=baff2c7bfec9b5140de01d5727977b26f40e5b32;hb=bc0bb9662e939c1b37f4335c05292a7b0ad21a20;hp=639ea399d317a9983c5b456b75f2de393ce1d19a;hpb=438179d278559bcb41a8abdadfb5e6b2e1e89d2d;p=ardour.git

diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index 639ea399d3..baff2c7bfe 100644
--- a/libs/ardour/session_midi.cc
+++ b/libs/ardour/session_midi.cc
@@ -33,6 +33,7 @@
 #include "pbd/error.h"
 #include "pbd/pthread_utils.h"
 #include "pbd/timersub.h"
+#include "pbd/stacktrace.h"
 
 #include "timecode/time.h"
 
@@ -42,6 +43,7 @@
 #include "ardour/midi_port.h"
 #include "ardour/midi_track.h"
 #include "ardour/midi_ui.h"
+#include "ardour/profile.h"
 #include "ardour/session.h"
 #include "ardour/slave.h"
 #include "ardour/ticker.h"
@@ -128,6 +130,19 @@ Session::mmc_record_pause (MIDI::MachineControl &/*mmc*/)
 void
 Session::mmc_record_strobe (MIDI::MachineControl &/*mmc*/)
 {
+	if (Profile->get_trx()) {
+
+		/* In Tracks Live, there is no concept of punch, so we just
+		   treat RecordStrobe like RecordPause. This violates the MMC
+		   specification.
+		*/
+
+		if (Config->get_mmc_control()) {
+			maybe_enable_record();
+		}
+		return;
+	}
+
 	if (!Config->get_mmc_control() || (_step_editors > 0)) {
 		return;
 	}
@@ -335,7 +350,7 @@ Session::mmc_record_enable (MIDI::MachineControl &mmc, size_t trk, bool enabled)
 
 		if ((at = dynamic_cast<AudioTrack*>((*i).get())) != 0) {
 			if (trk == at->remote_control_id()) {
-				at->set_record_enabled (enabled, &mmc);
+				at->set_record_enabled (enabled, Controllable::UseGroup);
 				break;
 			}
 		}
@@ -423,9 +438,9 @@ Session::send_full_time_code (framepos_t const t, MIDI::pframes_t nframes)
 	msg[8] = timecode.frames;
 
 	// Send message at offset 0, sent time is for the start of this cycle
-	
+
 	MidiBuffer& mb (_midi_ports->mtc_output_port()->get_midi_buffer (nframes));
-	mb.push_back (0, sizeof (msg), msg);
+	mb.push_back (Port::port_offset(), sizeof (msg), msg);
 
 	_pframes_since_last_mtc = 0;
 	return 0;
@@ -522,11 +537,13 @@ Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_f
 		}
 
 #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));
+		if (DEBUG_ENABLED(DEBUG::MTC)) {
+			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
@@ -551,6 +568,16 @@ Session::send_midi_time_code_for_cycle (framepos_t start_frame, framepos_t end_f
  OUTBOUND MMC STUFF
 **********************************************************************/
 
+void
+Session::send_immediate_mmc (MachineControlCommand c)
+{
+	if (AudioEngine::instance()->in_process_thread()) {
+		_mmc->send (c, Port::port_offset());
+	} else {
+		_mmc->send (c, 0);
+	}
+
+}
 
 bool
 Session::mmc_step_timeout ()
@@ -597,74 +624,67 @@ Session::send_song_position_pointer (framepos_t)
 int
 Session::start_midi_thread ()
 {
+	if (midi_control_ui) { return 0; }
 	midi_control_ui = new MidiControlUI (*this);
 	midi_control_ui->run ();
 	return 0;
 }
 
-MIDI::Port* 
+boost::shared_ptr<ARDOUR::Port>
 Session::midi_input_port () const
 {
 	return _midi_ports->midi_input_port ();
 }
-MIDI::Port* 
+
+boost::shared_ptr<ARDOUR::Port>
 Session::midi_output_port () const
 {
 	return _midi_ports->midi_output_port ();
 }
-boost::shared_ptr<MidiPort> 
-Session::midi_clock_output_port () const
-{
-	return _midi_ports->midi_clock_output_port ();
-}
-boost::shared_ptr<MidiPort> 
-Session::midi_clock_input_port () const
-{
-	return _midi_ports->midi_clock_input_port ();
-}
-boost::shared_ptr<MidiPort> 
-Session::mtc_output_port () const
-{
-	return _midi_ports->mtc_output_port ();
-}
-boost::shared_ptr<MidiPort> 
-Session::mtc_input_port () const
-{
-	return _midi_ports->mtc_input_port ();
-}
 
-MIDI::Port*
+boost::shared_ptr<ARDOUR::Port>
 Session::mmc_output_port () const
 {
 	return _midi_ports->mmc_output_port ();
 }
 
-MIDI::Port*
+boost::shared_ptr<ARDOUR::Port>
 Session::mmc_input_port () const
 {
 	return _midi_ports->mmc_input_port ();
 }
 
-MIDI::Port*
+boost::shared_ptr<ARDOUR::Port>
 Session::scene_output_port () const
 {
 	return _midi_ports->scene_output_port ();
 }
 
-MIDI::Port*
+boost::shared_ptr<ARDOUR::Port>
 Session::scene_input_port () const
 {
 	return _midi_ports->scene_input_port ();
 }
 
 boost::shared_ptr<MidiPort>
-Session::scene_in () const
+Session::midi_clock_output_port () const
 {
-	return _midi_ports->scene_in ();
+	return _midi_ports->midi_clock_output_port ();
 }
 
 boost::shared_ptr<MidiPort>
-Session::scene_out () const
+Session::midi_clock_input_port () const
 {
-	return _midi_ports->scene_out ();
+	return _midi_ports->midi_clock_input_port ();
 }
+boost::shared_ptr<MidiPort>
+Session::mtc_output_port () const
+{
+	return _midi_ports->mtc_output_port ();
+}
+boost::shared_ptr<MidiPort>
+Session::mtc_input_port () const
+{
+	return _midi_ports->mtc_input_port ();
+}
+