X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmidiport_manager.cc;h=6de043658690187d0af697e02e29c9fdb8f8951b;hb=caac41a9cb2d86985595c590b151b0197b7b0c4c;hp=fb27800762e65ae348d55ef9fe4f50ccd44e57a4;hpb=83a0c30c24ce6bb6e3e718c267a82fbaffc33b4b;p=ardour.git

diff --git a/libs/ardour/midiport_manager.cc b/libs/ardour/midiport_manager.cc
index fb27800762..6de0436586 100644
--- a/libs/ardour/midiport_manager.cc
+++ b/libs/ardour/midiport_manager.cc
@@ -20,6 +20,7 @@
 #include "ardour/audioengine.h"
 #include "ardour/async_midi_port.h"
 #include "ardour/midiport_manager.h"
+#include "ardour/rc_configuration.h"
 
 #include "i18n.h"
 
@@ -31,6 +32,7 @@ using namespace PBD;
 
 MidiPortManager::MidiPortManager ()
 {
+	create_ports ();
 }
 
 MidiPortManager::~MidiPortManager ()
@@ -56,34 +58,113 @@ MidiPortManager::~MidiPortManager ()
 
 }
 
-MidiPort*
-MidiPortManager::port (string const & n)
-{
-	boost::shared_ptr<MidiPort> mp =  boost::dynamic_pointer_cast<MidiPort> (AudioEngine::instance()->get_port_by_name (n));
-	return mp.get();
-}
-
 void
 MidiPortManager::create_ports ()
 {
-	_midi_in  = AudioEngine::instance()->register_input_port (DataType::MIDI, _("MIDI control in"), true);
-	_midi_out = AudioEngine::instance()->register_output_port (DataType::MIDI, _("MIDI control out"), true);
+	/* this method is idempotent
+	 */
+
+	if (_midi_in) {
+		return;
+	}
+	      
+	_midi_in  = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("MIDI control in"), true);
+	_midi_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("MIDI control out"), true);
+
+	_mmc_in  = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("MMC in"), true);
+	_mmc_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("MMC out"), true);
 	
+	/* XXX nasty type conversion needed because of the mixed inheritance
+	 * required to integrate MIDI::IPMidiPort and ARDOUR::AsyncMIDIPort.
+	 *
+	 * At some point, we'll move IPMidiPort into Ardour and make it 
+	 * inherit from ARDOUR::MidiPort not MIDI::Port, and then this
+	 * mess can go away 
+	 */
+
 	_midi_input_port = boost::dynamic_pointer_cast<AsyncMIDIPort>(_midi_in).get();
 	_midi_output_port = boost::dynamic_pointer_cast<AsyncMIDIPort>(_midi_out).get();
+
+	_mmc_input_port = boost::dynamic_pointer_cast<AsyncMIDIPort>(_mmc_in).get();
+	_mmc_output_port = boost::dynamic_pointer_cast<AsyncMIDIPort>(_mmc_out).get();
+
+	/* Now register ports used for sync (MTC and MIDI Clock)
+	 */
+
+	boost::shared_ptr<ARDOUR::Port> p;
+
+	p = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("MTC in"));
+	_mtc_input_port = boost::dynamic_pointer_cast<MidiPort> (p);
+	p = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("MTC out"));
+	_mtc_output_port= boost::dynamic_pointer_cast<MidiPort> (p);
+
+	p = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("MIDI Clock in"));
+	_midi_clock_input_port = boost::dynamic_pointer_cast<MidiPort> (p);
+	p = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("MIDI Clock out"));
+	_midi_clock_output_port= boost::dynamic_pointer_cast<MidiPort> (p);
+
+	/* These ports all need their incoming data handled in
+	 * Port::cycle_start() and so ...
+	 */
+
+	_mtc_input_port->set_always_parse (true);
+	_mtc_output_port->set_always_parse (true);
+	_midi_clock_input_port->set_always_parse (true);
+	_midi_clock_output_port->set_always_parse (true);
 }
 
 void
-MidiPortManager::set_port_states (list<XMLNode*> s)
+MidiPortManager::set_midi_port_states (const XMLNodeList&nodes)
 {
-	PortManager::PortList pl;
+	XMLProperty* prop;
+	typedef map<std::string,boost::shared_ptr<Port> > PortMap;
+	PortMap ports;
+	const int version = 0;
 
-	AudioEngine::instance()->get_ports (DataType::MIDI, pl);
+	ports.insert (make_pair (_mtc_input_port->name(), _mtc_input_port));
+	ports.insert (make_pair (_mtc_output_port->name(), _mtc_output_port));
+	ports.insert (make_pair (_midi_clock_input_port->name(), _midi_clock_input_port));
+	ports.insert (make_pair (_midi_clock_output_port->name(), _midi_clock_output_port));
+	ports.insert (make_pair (_midi_input_port->name(), _midi_in));
+	ports.insert (make_pair (_midi_output_port->name(), _midi_out));
+	ports.insert (make_pair (_mmc_input_port->name(), _mmc_in));
+	ports.insert (make_pair (_mmc_output_port->name(), _mmc_out));
 	
-	for (list<XMLNode*>::iterator i = s.begin(); i != s.end(); ++i) {
-		for (PortManager::PortList::const_iterator j = pl.begin(); j != pl.end(); ++j) {
-			// (*j)->set_state (**i);
+	for (XMLNodeList::const_iterator n = nodes.begin(); n != nodes.end(); ++n) {
+		if ((prop = (*n)->property (X_("name"))) == 0) {
+			continue;
+		}
+
+		PortMap::iterator p = ports.find (prop->value());
+		if (p == ports.end()) {
+			continue;
 		}
+		
+		p->second->set_state (**n, version);
+	}
+}
+
+list<XMLNode*>
+MidiPortManager::get_midi_port_states () const
+{
+	typedef map<std::string,boost::shared_ptr<Port> > PortMap;
+	PortMap ports;
+	list<XMLNode*> s;
+
+	ports.insert (make_pair (_mtc_input_port->name(), _mtc_input_port));
+	ports.insert (make_pair (_mtc_output_port->name(), _mtc_output_port));
+	ports.insert (make_pair (_midi_clock_input_port->name(), _midi_clock_input_port));
+	ports.insert (make_pair (_midi_clock_output_port->name(), _midi_clock_output_port));
+	ports.insert (make_pair (_midi_input_port->name(), _midi_in));
+	ports.insert (make_pair (_midi_output_port->name(), _midi_out));
+	ports.insert (make_pair (_mmc_input_port->name(), _mmc_in));
+	ports.insert (make_pair (_mmc_output_port->name(), _mmc_out));
+
+	for (PortMap::const_iterator p = ports.begin(); p != ports.end(); ++p) {
+		s.push_back (&p->second->get_state());
 	}
+
+	return s;
 }
 
+