totally untested initial code for MidiPlaylistSource, to provide for compound MIDI...

[ardour.git] / libs / ardour / rc_configuration.cc

diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index 4c9e35924a7d32f42257e8a1e2a5f09267dfe611..3b22bfc24719f32447f07a05666c5ce838ed4488 100644 (file)
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -68,6 +68,10 @@ RCConfiguration::RCConfiguration ()
 
 RCConfiguration::~RCConfiguration ()
 {
+       for (list<XMLNode*>::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) {
+               delete *i;
+       }
+
        delete _control_protocol_state;
 }
 
@@ -172,7 +176,7 @@ RCConfiguration::save_state()
        const string rcfile = rcfile_path.to_string();
 
        // this test seems bogus?
-       if (rcfile.length()) {
+       if (!rcfile.empty()) {
                XMLTree tree;
                tree.set_root (&get_state());
                if (!tree.write (rcfile.c_str())){
@@ -205,11 +209,15 @@ RCConfiguration::get_state ()
 
        root = new XMLNode("Ardour");
 
-       const MIDI::Manager::PortList& ports = MIDI::Manager::instance()->get_midi_ports();
-
-       for (MIDI::Manager::PortList::const_iterator i = ports.begin(); i != ports.end(); ++i) {
-               root->add_child_nocopy((*i)->get_state());
-       }
+        MIDI::Manager* mm = MIDI::Manager::instance();
+        
+        if (mm) {
+                const MIDI::Manager::PortList& ports = mm->get_midi_ports();
+                
+                for (MIDI::Manager::PortList::const_iterator i = ports.begin(); i != ports.end(); ++i) {
+                        root->add_child_nocopy((*i)->get_state());
+                }
+        }
 
        root->add_child_nocopy (get_variables ());
 
@@ -254,38 +262,24 @@ RCConfiguration::set_state (const XMLNode& root, int /*version*/)
        XMLNodeConstIterator niter;
        XMLNode *node;
 
-       for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-
-               node = *niter;
-
-               if (node->name() == "MIDI-port") {
-
-                       try {
+       for (list<XMLNode*>::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) {
+               delete *i;
+       }
 
-                               MIDI::Port::Descriptor desc (*node);
-                               map<string,XMLNode>::iterator x;
-                               
-                               if ((x = midi_ports.find (desc.tag)) != midi_ports.end()) {
-                                       warning << string_compose (_("Duplicate MIDI port definition found (tag=\"%1\") - ignored"),
-                                                                  desc.tag) << endmsg;
-                                       continue;
-                               }
-                               midi_ports.insert (pair<string,XMLNode>(desc.tag,*node));
-                       }
+       _midi_port_states.clear ();
 
-                       catch (failed_constructor& err) {
-                               warning << _("ill-formed MIDI port specification in ardour rcfile (ignored)") << endmsg;
-                       }
+       for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
 
-               } else if (node->name() == "Config") {
+               node = *niter;
 
+               if (node->name() == "Config") {
                        set_variables (*node);
-
                } else if (node->name() == "Extra") {
                        _extra_xml = new XMLNode (*node);
-
                } else if (node->name() == ControlProtocolManager::state_node_name) {
                        _control_protocol_state = new XMLNode (*node);
+               } else if (node->name() == MIDI::Port::state_node_name) {
+                       _midi_port_states.push_back (new XMLNode (*node));
                }
        }