X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Frc_configuration.cc;h=3b22bfc24719f32447f07a05666c5ce838ed4488;hb=a406d9183adc67075a4e802fd8254c2560df9964;hp=c7d39c5b995b6e659c676d4ce1f665f66c41c7c1;hpb=bc56eb8bd73c7b456b646ba0cc627d449baa37f2;p=ardour.git diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc index c7d39c5b99..3b22bfc247 100644 --- a/libs/ardour/rc_configuration.cc +++ b/libs/ardour/rc_configuration.cc @@ -65,6 +65,16 @@ RCConfiguration::RCConfiguration () { } + +RCConfiguration::~RCConfiguration () +{ + for (list::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) { + delete *i; + } + + delete _control_protocol_state; +} + int RCConfiguration::load_state () { @@ -78,7 +88,6 @@ RCConfiguration::load_state () if (find_file_in_search_path (ardour_search_path() + system_config_search_path(), "ardour_system.rc", system_rc_file) ) { - XMLTree tree; found = true; string rcfile = system_rc_file.to_string(); @@ -90,19 +99,20 @@ RCConfiguration::load_state () } if (statbuf.st_size != 0) { - cerr << string_compose (_("Loading system configuration file %1"), rcfile) << endl; + info << string_compose (_("Loading system configuration file %1"), rcfile) << endl; + XMLTree tree; if (!tree.read (rcfile.c_str())) { - error << string_compose(_("Ardour: cannot read system configuration file \"%1\""), rcfile) << endmsg; + error << string_compose(_("%1: cannot read system configuration file \"%2\""), PROGRAM_NAME, rcfile) << endmsg; return -1; } if (set_state (*tree.root(), Stateful::current_state_version)) { - error << string_compose(_("Ardour: system configuration file \"%1\" not loaded successfully."), rcfile) << endmsg; + error << string_compose(_("%1: system configuration file \"%2\" not loaded successfully."), PROGRAM_NAME, rcfile) << endmsg; return -1; } } else { - error << _("your system Ardour configuration file is empty. This probably means that there as an error installing Ardour") << endmsg; + error << string_compose (_("your system %1 configuration file is empty. This probably means that there as an error installing %1"), PROGRAM_NAME) << endmsg; } } @@ -113,7 +123,6 @@ RCConfiguration::load_state () if (find_file_in_search_path (ardour_search_path() + user_config_directory(), "ardour.rc", user_rc_file)) { - XMLTree tree; found = true; string rcfile = user_rc_file.to_string(); @@ -125,24 +134,25 @@ RCConfiguration::load_state () } if (statbuf.st_size != 0) { - cerr << string_compose (_("Loading user configuration file %1"), rcfile) << endl; + info << string_compose (_("Loading user configuration file %1"), rcfile) << endl; + XMLTree tree; if (!tree.read (rcfile)) { - error << string_compose(_("Ardour: cannot read configuration file \"%1\""), rcfile) << endmsg; + error << string_compose(_("%1: cannot read configuration file \"%2\""), PROGRAM_NAME, rcfile) << endmsg; return -1; } if (set_state (*tree.root(), Stateful::current_state_version)) { - error << string_compose(_("Ardour: user configuration file \"%1\" not loaded successfully."), rcfile) << endmsg; + error << string_compose(_("%1: user configuration file \"%2\" not loaded successfully."), PROGRAM_NAME, rcfile) << endmsg; return -1; } } else { - warning << _("your Ardour configuration file is empty. This is not normal.") << endmsg; + warning << string_compose (_("your %1 configuration file is empty. This is not normal."), PROGRAM_NAME) << endmsg; } } if (!found) - error << "Ardour: could not find configuration file (ardour.rc), canvas will look broken." << endmsg; + error << string_compose (_("%1: could not find configuration file (ardour.rc), canvas will look broken."), PROGRAM_NAME) << endmsg; return 0; } @@ -150,8 +160,6 @@ RCConfiguration::load_state () int RCConfiguration::save_state() { - XMLTree tree; - try { sys::create_directories (user_config_directory ()); @@ -168,7 +176,8 @@ 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())){ error << string_compose (_("Config file %1 not saved"), rcfile) << endmsg; @@ -200,12 +209,15 @@ RCConfiguration::get_state () root = new XMLNode("Ardour"); - MIDI::Manager::PortMap::const_iterator i; - const MIDI::Manager::PortMap& ports = MIDI::Manager::instance()->get_midi_ports(); - - for (i = ports.begin(); i != ports.end(); ++i) { - root->add_child_nocopy(i->second->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 ()); @@ -250,35 +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::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) { + delete *i; + } - MIDI::Port::Descriptor desc (*node); - map::iterator x; - if ((x = midi_ports.find (desc.tag)) != midi_ports.end()) { - midi_ports.erase (x); - } - midi_ports.insert (pair(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)); } } @@ -307,12 +308,12 @@ RCConfiguration::set_variables (const XMLNode& node) } void -RCConfiguration::map_parameters (sigc::slot theSlot) +RCConfiguration::map_parameters (boost::function& functor) { #undef CONFIG_VARIABLE #undef CONFIG_VARIABLE_SPECIAL -#define CONFIG_VARIABLE(type,var,name,value) theSlot (name); -#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) theSlot (name); +#define CONFIG_VARIABLE(type,var,name,value) functor (name); +#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) functor (name); #include "ardour/rc_configuration_vars.h" #undef CONFIG_VARIABLE #undef CONFIG_VARIABLE_SPECIAL