X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_midi.cc;h=19fb39ba14348ccbab2dd46d56345fb769b052c4;hb=ca25a664d31aa4d16121aa4b41dad8ac04eafb16;hp=ea6dfe81cf17f6bd5f9bb5542103af04f39a90b5;hpb=59076a7e4c66db12bbbfbf01f012ca2f6ba4bf56;p=ardour.git

diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc
index ea6dfe81cf..19fb39ba14 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;
 	}
@@ -417,7 +432,7 @@ Session::send_full_time_code (framepos_t const t, MIDI::pframes_t nframes)
 	msg[4] = 0x1;
 	msg[9] = 0xf7;
 
-	msg[5] = mtc_timecode_bits | timecode.hours;
+	msg[5] = mtc_timecode_bits | (timecode.hours % 24);
 	msg[6] = timecode.minutes;
 	msg[7] = timecode.seconds;
 	msg[8] = timecode.frames;
@@ -425,7 +440,7 @@ Session::send_full_time_code (framepos_t const t, MIDI::pframes_t nframes)
 	// 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;
@@ -551,6 +566,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,6 +622,7 @@ 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;
@@ -644,3 +670,27 @@ Session::mmc_input_port () const
 {
 	return _midi_ports->mmc_input_port ();
 }
+
+MIDI::Port*
+Session::scene_output_port () const
+{
+	return _midi_ports->scene_output_port ();
+}
+
+MIDI::Port*
+Session::scene_input_port () const
+{
+	return _midi_ports->scene_input_port ();
+}
+
+boost::shared_ptr<MidiPort>
+Session::scene_in () const
+{
+	return _midi_ports->scene_in ();
+}
+
+boost::shared_ptr<MidiPort>
+Session::scene_out () const
+{
+	return _midi_ports->scene_out ();
+}