/*
- Copyright (C) 1999-2006 Paul Davis
+ Copyright (C) 1999-2006 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <unistd.h>
#include <cstdio> /* for snprintf, grrr */
-#include <glib.h>
+#include <glib.h>
#include <glib/gstdio.h> /* for g_stat() */
#include <glibmm/miscutils.h>
:
/* construct variables */
#undef CONFIG_VARIABLE
-#undef CONFIG_VARIABLE_SPECIAL
+#undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(Type,var,name,value) var (name,value),
#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) var (name,value,mutator),
#include "ardour/rc_configuration_vars.h"
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) )
{
string rcfile = system_rc_file.to_string();
/* stupid XML Parser hates empty files */
-
+
if (g_stat (rcfile.c_str(), &statbuf)) {
return -1;
}
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;
+
if (!tree.read (rcfile.c_str())) {
error << string_compose(_("Ardour: cannot read system configuration file \"%1\""), rcfile) << endmsg;
return -1;
}
-
- if (set_state (*tree.root())) {
+
+ if (set_state (*tree.root(), Stateful::current_state_version)) {
error << string_compose(_("Ardour: system configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
return -1;
}
}
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;
+
if (!tree.read (rcfile)) {
error << string_compose(_("Ardour: cannot read configuration file \"%1\""), rcfile) << endmsg;
return -1;
}
-
- if (set_state (*tree.root())) {
+
+ if (set_state (*tree.root(), Stateful::current_state_version)) {
error << string_compose(_("Ardour: user configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
return -1;
}
} else {
warning << _("your Ardour configuration file is empty. This is not normal.") << endmsg;
- }
+ }
}
if (!found)
error << "Could not create user configuration directory" << endmsg;
return -1;
}
-
+
sys::path rcfile_path(user_config_directory());
rcfile_path /= "ardour.rc";
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());
+ const MIDI::Manager::PortList& ports = MIDI::Manager::instance()->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 ());
-
+
if (_extra_xml) {
root->add_child_copy (*_extra_xml);
}
-
+
root->add_child_nocopy (ControlProtocolManager::instance().get_state());
-
+
return *root;
}
node = new XMLNode ("Config");
#undef CONFIG_VARIABLE
-#undef CONFIG_VARIABLE_SPECIAL
+#undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(type,var,Name,value) \
var.add_to_node (*node);
#define CONFIG_VARIABLE_SPECIAL(type,var,Name,value,mutator) \
var.add_to_node (*node);
#include "ardour/rc_configuration_vars.h"
#undef CONFIG_VARIABLE
-#undef CONFIG_VARIABLE_SPECIAL
+#undef CONFIG_VARIABLE_SPECIAL
return *node;
}
int
-RCConfiguration::set_state (const XMLNode& root)
+RCConfiguration::set_state (const XMLNode& root, int /*version*/)
{
if (root.name() != "Ardour") {
return -1;
MIDI::Port::Descriptor desc (*node);
map<string,XMLNode>::iterator x;
+
if ((x = midi_ports.find (desc.tag)) != midi_ports.end()) {
- midi_ports.erase (x);
+ warning << string_compose (_("Duplicate MIDI port definition found (tag=\"%1\") - ignored"),
+ desc.tag) << endmsg;
+ continue;
}
midi_ports.insert (pair<string,XMLNode>(desc.tag,*node));
}
}
} else if (node->name() == "Config") {
-
+
set_variables (*node);
-
+
} else if (node->name() == "Extra") {
_extra_xml = new XMLNode (*node);
RCConfiguration::set_variables (const XMLNode& node)
{
#undef CONFIG_VARIABLE
-#undef CONFIG_VARIABLE_SPECIAL
+#undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(type,var,name,value) \
if (var.set_from_node (node)) { \
ParameterChanged (name); \
#include "ardour/rc_configuration_vars.h"
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL
-
+
}
void
-RCConfiguration::map_parameters (sigc::slot<void,const char*> theSlot)
+RCConfiguration::map_parameters (sigc::slot<void, std::string> theSlot)
{
#undef CONFIG_VARIABLE
-#undef CONFIG_VARIABLE_SPECIAL
+#undef CONFIG_VARIABLE_SPECIAL
#define CONFIG_VARIABLE(type,var,name,value) theSlot (name);
#define CONFIG_VARIABLE_SPECIAL(type,var,name,value,mutator) theSlot (name);
#include "ardour/rc_configuration_vars.h"
#undef CONFIG_VARIABLE
-#undef CONFIG_VARIABLE_SPECIAL
+#undef CONFIG_VARIABLE_SPECIAL
}