Move functions in pbd/clear_dir.h/cc into pbd/file_utils.h/cc

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

diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index 071d50ac0308ca904ace062b82b4c3307adb85c6..b0be237563b4bb97c6184838cde61750da3c6bd0 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 = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) {
-               delete *i;
-       }
-
        delete _control_protocol_state;
 }
 
@@ -76,11 +72,11 @@ int
 RCConfiguration::load_state ()
 {
        std::string rcfile;
-       struct stat statbuf;
+       GStatBuf statbuf;
 
        /* load system configuration first */
 
-       if (find_file_in_search_path (ardour_config_search_path(), "ardour_system.rc", rcfile)) {
+       if (find_file (ardour_config_search_path(), "ardour_system.rc", rcfile)) {
 
                /* stupid XML Parser hates empty files */
 
@@ -108,7 +104,7 @@ RCConfiguration::load_state ()
 
        /* now load configuration file for user */
 
-       if (find_file_in_search_path (ardour_config_search_path(), "ardour.rc", rcfile)) {
+       if (find_file (ardour_config_search_path(), "ardour.rc", rcfile)) {
 
                /* stupid XML parser hates empty files */
 
@@ -176,11 +172,6 @@ RCConfiguration::get_state ()
 
        root = new XMLNode("Ardour");
 
-       list<XMLNode*> midi_port_nodes = AudioEngine::instance()->get_midi_port_states();
-       for (list<XMLNode*>::const_iterator n = midi_port_nodes.begin(); n != midi_port_nodes.end(); ++n) {
-                root->add_child_nocopy (**n);
-       }
-
        root->add_child_nocopy (get_variables ());
 
        root->add_child_nocopy (SessionMetadata::Metadata()->get_user_state());
@@ -226,12 +217,6 @@ RCConfiguration::set_state (const XMLNode& root, int version)
        XMLNodeConstIterator niter;
        XMLNode *node;
 
-       for (list<XMLNode*>::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) {
-               delete *i;
-       }
-
-       _midi_port_states.clear ();
-
        Stateful::save_extra_xml (root);
 
        for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
@@ -244,8 +229,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() == ARDOUR::Port::state_node_name) {
-                       _midi_port_states.push_back (new XMLNode (*node));
                }
        }