From 07c63fb2d72d7c5ef609bd972fa6a3138560d74a Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 13 Aug 2013 21:59:05 -0400 Subject: save and restore all ardour-owned MIDI ports still need to check on MCU port status --- libs/ardour/midiport_manager.cc | 68 ++++++++++++++++++++++++++++++++--------- 1 file changed, 54 insertions(+), 14 deletions(-) (limited to 'libs/ardour/midiport_manager.cc') diff --git a/libs/ardour/midiport_manager.cc b/libs/ardour/midiport_manager.cc index 5d4e8e37f6..7abd47580b 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" @@ -56,13 +57,6 @@ MidiPortManager::~MidiPortManager () } -MidiPort* -MidiPortManager::port (string const & n) -{ - boost::shared_ptr mp = boost::dynamic_pointer_cast (AudioEngine::instance()->get_port_by_name (n)); - return mp.get(); -} - void MidiPortManager::create_ports () { @@ -116,19 +110,65 @@ MidiPortManager::create_ports () _mtc_output_port->set_always_parse (true); _midi_clock_input_port->set_always_parse (true); _midi_clock_output_port->set_always_parse (true); + + set_midi_port_states (); } void -MidiPortManager::set_port_states (list s) +MidiPortManager::set_midi_port_states () { - PortManager::PortList pl; - - AudioEngine::instance()->get_ports (DataType::MIDI, pl); + list nodes; + XMLProperty* prop; + typedef map > PortMap; + PortMap ports; + const int version = 0; + + nodes = Config->midi_port_states (); + + 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::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 (list::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 +MidiPortManager::get_midi_port_states () const +{ + typedef map > PortMap; + PortMap ports; + list 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; +} + + -- cgit v1.2.3