diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-13 22:06:31 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-13 22:06:31 -0400 |
| commit | dfac01bdd472217ddbc1a70049c05e8de56ca113 (patch) | |
| tree | 516166e84e8a811f44df8b1406b407ece8ef0bb3 | |
| parent | 07c63fb2d72d7c5ef609bd972fa6a3138560d74a (diff) | |
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
| -rw-r--r-- | libs/ardour/ardour/rc_configuration.h | 2 | ||||
| -rw-r--r-- | libs/ardour/rc_configuration.cc | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/libs/ardour/ardour/rc_configuration.h b/libs/ardour/ardour/rc_configuration.h index 9943821d61..ff1c5f035c 100644 --- 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 773ecf7d85..071d50ac03 100644 --- 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)); } |