{
}
+
+RCConfiguration::~RCConfiguration ()
+{
+ for (list<XMLNode*>::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) {
+ delete *i;
+ }
+
+ delete _control_protocol_state;
+}
+
int
RCConfiguration::load_state ()
{
- bool found = false;
-
sys::path system_rc_file;
struct stat statbuf;
/* load system configuration first */
- if (find_file_in_search_path (ardour_search_path() + system_config_search_path(),
- "ardour_system.rc", system_rc_file) )
- {
- XMLTree tree;
- found = true;
-
+ if (find_file_in_search_path (ardour_search_path() + system_config_search_path(), "ardour_system.rc", system_rc_file)) {
string rcfile = system_rc_file.to_string();
/* stupid XML Parser hates empty files */
}
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;
}
}
sys::path user_rc_file;
- if (find_file_in_search_path (ardour_search_path() + user_config_directory(),
- "ardour.rc", user_rc_file))
- {
- XMLTree tree;
- found = true;
-
+ if (find_file_in_search_path (ardour_search_path() + user_config_directory(), "ardour.rc", user_rc_file)) {
string rcfile = user_rc_file.to_string();
/* stupid XML parser hates empty files */
}
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;
-
return 0;
}
int
RCConfiguration::save_state()
{
- XMLTree tree;
-
try
{
sys::create_directories (user_config_directory ());
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;
root = new XMLNode("Ardour");
- MIDI::Manager::PortMap::const_iterator i;
- const MIDI::Manager::PortMap& ports = MIDI::Manager::instance()->get_midi_ports();
+ MIDI::Manager* mm = MIDI::Manager::instance();
- for (i = ports.begin(); i != ports.end(); ++i) {
- root->add_child_nocopy(i->second->get_state());
- }
+ if (mm) {
+ boost::shared_ptr<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 ());
}
int
-RCConfiguration::set_state (const XMLNode& root, int version)
+RCConfiguration::set_state (const XMLNode& root, int /*version*/)
{
if (root.name() != "Ardour") {
return -1;
XMLNodeConstIterator niter;
XMLNode *node;
- for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
-
- node = *niter;
-
- if (node->name() == "MIDI-port") {
+ for (list<XMLNode*>::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) {
+ delete *i;
+ }
- try {
+ _midi_port_states.clear ();
- MIDI::Port::Descriptor desc (*node);
- map<string,XMLNode>::iterator x;
- if ((x = midi_ports.find (desc.tag)) != midi_ports.end()) {
- midi_ports.erase (x);
- }
- midi_ports.insert (pair<string,XMLNode>(desc.tag,*node));
- }
+ Stateful::save_extra_xml (root);
- 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));
}
}
}
void
-RCConfiguration::map_parameters (sigc::slot<void, std::string> theSlot)
+RCConfiguration::map_parameters (boost::function<void (std::string)>& 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
projects / ardour.git / blobdiff