X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fmidi%2B%2B2%2Fmmc.cc;h=06eadb5b34adcead348030f8061b05d769cc5b02;hb=acb795980b5cc5bd1d52ccabaab64e4f135e8888;hp=c16b243a16689dd2718a9d049150533a5e69c01d;hpb=b65f8073ba306ac2d85133875746767e7c6b0eb6;p=ardour.git

diff --git a/libs/midi++2/mmc.cc b/libs/midi++2/mmc.cc
index c16b243a16..06eadb5b34 100644
--- a/libs/midi++2/mmc.cc
+++ b/libs/midi++2/mmc.cc
@@ -18,12 +18,16 @@
     $Id$
 */
 
+#include <fcntl.h>
 #include <map>
 
+#include "timecode/time.h"
 #include "pbd/error.h"
 #include "midi++/mmc.h"
 #include "midi++/port.h"
+#include "midi++/jack_midi_port.h"
 #include "midi++/parser.h"
+#include "midi++/manager.h"
 
 using namespace std;
 using namespace MIDI;
@@ -192,26 +196,20 @@ static void build_mmc_cmd_map ()
 }
 
 
-MachineControl::MachineControl (Port &p, float /*version*/,
-				CommandSignature & /*csig*/,
-				ResponseSignature & /*rsig*/)
-
-	: _port (p)
+MachineControl::MachineControl (Manager* m, jack_client_t* jack)
 {
-	Parser *parser;
-	
 	build_mmc_cmd_map ();
 
-	_receive_device_id = 0;
+	_receive_device_id = 0x7f;
 	_send_device_id = 0x7f;
-	
-	if ((parser = _port.input()) != 0) {
-		parser->mmc.connect 
-			(mem_fun (*this, &MachineControl::process_mmc_message));
-	} else {
-		warning << "MMC connected to a non-input port: useless!"
-			<< endmsg;
-	}
+
+	_input_port = m->add_port (new JackMIDIPort ("MMC in", Port::IsInput, jack));
+	_output_port = m->add_port (new JackMIDIPort ("MMC out", Port::IsOutput, jack));
+
+	_input_port->parser()->mmc.connect_same_thread (port_connections, boost::bind (&MachineControl::process_mmc_message, this, _1, _2, _3));
+	_input_port->parser()->start.connect_same_thread (port_connections, boost::bind (&MachineControl::spp_start, this));
+	_input_port->parser()->contineu.connect_same_thread (port_connections, boost::bind (&MachineControl::spp_continue, this));
+	_input_port->parser()->stop.connect_same_thread (port_connections, boost::bind (&MachineControl::spp_stop, this));
 }
 
 void
@@ -228,7 +226,6 @@ MachineControl::set_send_device_id (byte id)
 
 bool
 MachineControl::is_mmc (byte *sysex_buf, size_t len)
-
 {
 	if (len < 4 || len > 48) {
 		return false;
@@ -248,7 +245,6 @@ MachineControl::is_mmc (byte *sysex_buf, size_t len)
 
 void
 MachineControl::process_mmc_message (Parser &, byte *msg, size_t len)
-
 {
 	size_t skiplen;
 	byte *mmc_msg;
@@ -456,7 +452,6 @@ MachineControl::process_mmc_message (Parser &, byte *msg, size_t len)
 
 int
 MachineControl::do_masked_write (byte *msg, size_t len)
-
 {
 	/* return the number of bytes "consumed" */
 
@@ -464,7 +459,11 @@ MachineControl::do_masked_write (byte *msg, size_t len)
 	
 	switch (msg[2]) {
 	case 0x4f:  /* Track Record Ready Status */
-		write_track_record_ready (&msg[3], len - 3);
+		write_track_status (&msg[3], len - 3, msg[2]);
+		break;
+
+	case 0x62: /* track mute */
+		write_track_status (&msg[3], len - 3, msg[2]);
 		break;
 
 	default:
@@ -478,8 +477,7 @@ MachineControl::do_masked_write (byte *msg, size_t len)
 }
 
 void
-MachineControl::write_track_record_ready (byte *msg, size_t /*len*/)
-
+MachineControl::write_track_status (byte *msg, size_t /*len*/, byte reg)
 {
 	size_t n;
 	ssize_t base_track;
@@ -549,14 +547,18 @@ MachineControl::write_track_record_ready (byte *msg, size_t /*len*/)
 			   bit set.
 			*/
 
-			if (msg[2] & (1<<n)) {
-				trackRecordStatus[base_track+n] = true;
-				TrackRecordStatusChange (*this, base_track+n,
-							 true);
-			} else {
-				trackRecordStatus[base_track+n] = false;
-				TrackRecordStatusChange (*this, base_track+n,
-							 false);
+			bool val = (msg[2] & (1<<n));
+			
+			switch (reg) {
+			case 0x4f:
+				trackRecordStatus[base_track+n] = val;
+				TrackRecordStatusChange (*this, base_track+n, val);
+				break;
+				
+			case 0x62:
+				trackMute[base_track+n] = val;
+				TrackMuteChange (*this, base_track+n, val);
+				break;
 			}
 		} 
 
@@ -565,7 +567,6 @@ MachineControl::write_track_record_ready (byte *msg, size_t /*len*/)
 
 int
 MachineControl::do_locate (byte *msg, size_t /*msglen*/)
-
 {
 	if (msg[2] == 0) {
 		warning << "MIDI::MMC: locate [I/F] command not supported"
@@ -594,7 +595,6 @@ MachineControl::do_step (byte *msg, size_t /*msglen*/)
 
 int
 MachineControl::do_shuttle (byte *msg, size_t /*msglen*/)
-
 {
 	size_t forward;
 	byte sh = msg[2];
@@ -624,3 +624,84 @@ MachineControl::do_shuttle (byte *msg, size_t /*msglen*/)
 	return 0;
 }
 
+void
+MachineControl::enable_send (bool yn)
+{
+	_enable_send = yn;
+}
+
+/** Send a MMC command to a the MMC port.
+ *  @param c command.
+ */
+void
+MachineControl::send (MachineControlCommand const & c)
+{
+	if (_output_port == 0 || !_enable_send) {
+		// cerr << "Not delivering MMC " << _mmc->port() << " - " << session_send_mmc << endl;
+		return;
+	}
+
+	MIDI::byte buffer[32];
+	MIDI::byte* b = c.fill_buffer (this, buffer);
+
+	if (_output_port->midimsg (buffer, b - buffer, 0)) {
+		error << "MMC: cannot send command" << endmsg;
+	}
+}
+
+void
+MachineControl::spp_start ()
+{
+	SPPStart (); /* EMIT SIGNAL */
+}
+
+void
+MachineControl::spp_continue ()
+{
+	SPPContinue (); /* EMIT SIGNAL */
+}
+
+void
+MachineControl::spp_stop ()
+{
+	SPPStop (); /* EMIT SIGNAL */
+}
+
+MachineControlCommand::MachineControlCommand (MachineControl::Command c)
+	: _command (c)
+{
+
+}
+
+MachineControlCommand::MachineControlCommand (Timecode::Time t)
+	: _command (MachineControl::cmdLocate)
+	, _time (t)
+{
+
+}
+
+MIDI::byte * 
+MachineControlCommand::fill_buffer (MachineControl* mmc, MIDI::byte* b) const
+{
+	*b++ = 0xf0; // SysEx
+	*b++ = 0x7f; // Real-time SysEx ID for MMC
+	*b++ = mmc->send_device_id();
+	*b++ = 0x6; // MMC command
+
+	*b++ = _command;
+
+	if (_command == MachineControl::cmdLocate) {
+		*b++ = 0x6; // byte count
+		*b++ = 0x1; // "TARGET" subcommand
+		*b++ = _time.hours;
+		*b++ = _time.minutes;
+		*b++ = _time.seconds;
+		*b++ = _time.frames;
+		*b++ = _time.subframes;
+	}
+
+	*b++ = 0xf7;
+
+	return b;
+}
+