don't bother with old MIDI port data in ardour.rc

result: we lose connections to global MIDI ports in older sessions. may fix this in the future

diff --git a/libs/ardour/ardour/rc_configuration.h b/libs/ardour/ardour/rc_configuration.h
index 9943821d61acc8a7d261ee053585627e8b6a948c..ff1c5f035c7582033e153fff6969760ce7f0194f 100644 (file)
--- a/libs/ardour/ardour/rc_configuration.h
+++ b/libs/ardour/ardour/rc_configuration.h
@@ -53,7 +53,6 @@ class RCConfiguration : public Configuration
 
        XMLNode* control_protocol_state () { return _control_protocol_state; }
        std::list<XMLNode*> midi_port_states () { return _midi_port_states; }
-       std::list<XMLNode*> old_midi_port_states () { return _old_midi_port_states; }
 
        /* define accessor methods */
 
@@ -87,7 +86,6 @@ class RCConfiguration : public Configuration
            state once the audio engine and hence ports are up.
        */
        std::list<XMLNode*> _midi_port_states;
-       std::list<XMLNode*> _old_midi_port_states;
 };
 
 /* XXX: rename this */

diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index 773ecf7d857b51f2e4c486eb84df0f58e5cd74ed..071d50ac0308ca904ace062b82b4c3307adb85c6 100644 (file)
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -65,10 +65,6 @@ RCConfiguration::RCConfiguration ()
 
 RCConfiguration::~RCConfiguration ()
 {
-       for (list<XMLNode*>::iterator i = _old_midi_port_states.begin(); i != _old_midi_port_states.end(); ++i) {
-               delete *i;
-       }
-
        for (list<XMLNode*>::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) {
                delete *i;
        }
@@ -248,8 +244,6 @@ RCConfiguration::set_state (const XMLNode& root, int version)
                        SessionMetadata::Metadata()->set_state (*node, version);
                } else if (node->name() == ControlProtocolManager::state_node_name) {
                        _control_protocol_state = new XMLNode (*node);
-               } else if (node->name() == MIDI::Port::state_node_name) {
-                       _old_midi_port_states.push_back (new XMLNode (*node));
                } else if (node->name() == ARDOUR::Port::state_node_name) {
                        _midi_port_states.push_back (new XMLNode (*node));
                }