#include <unistd.h>
#include <cstdio> /* for snprintf, grrr */
+#include <glib.h>
+#include <glib/gstdio.h> /* for g_stat() */
+#include <glibmm/miscutils.h>
+
#include <pbd/failed_constructor.h>
#include <pbd/xml++.h>
#include <pbd/filesystem.h>
#include <pbd/file_utils.h>
+#include <midi++/manager.h>
+
+#include <ardour/ardour.h>
#include <ardour/configuration.h>
#include <ardour/audio_diskstream.h>
#include <ardour/control_protocol_manager.h>
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL
-#undef CANVAS_VARIABLE
-#define CANVAS_VARIABLE(var,name) var (name), // <-- is this really so bad?
-#include "ardour/canvas_vars.h"
-#undef CANVAS_VARIABLE
current_owner (ConfigVariableBase::Default)
{
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(),
string rcfile = system_rc_file.to_string();
- cerr << string_compose (_("loading system configuration file %1"), rcfile) << endl;
+ /* stupid XML Parser hates empty files */
- if (!tree.read (rcfile.c_str())) {
- error << string_compose(_("Ardour: cannot read system configuration file \"%1\""), rcfile) << endmsg;
+ if (g_stat (rcfile.c_str(), &statbuf)) {
return -1;
}
- current_owner = ConfigVariableBase::System;
-
- if (set_state (*tree.root())) {
- error << string_compose(_("Ardour: system configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
- return -1;
+ if (statbuf.st_size != 0) {
+ cerr << 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;
+ }
+
+ current_owner = ConfigVariableBase::System;
+
+ if (set_state (*tree.root())) {
+ error << string_compose(_("Ardour: system configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+ return -1;
+ }
+ } else {
+ error << _("your system Ardour configuration file is empty. This probably means that there as an error installing Ardour") << endmsg;
}
}
"ardour.rc", user_rc_file))
{
XMLTree tree;
- found = true;
-
+
string rcfile = user_rc_file.to_string();
- cerr << string_compose (_("loading user configuration file %1"), rcfile) << endl;
+ /* stupid XML parser hates empty files */
- if (!tree.read (rcfile)) {
- error << string_compose(_("Ardour: cannot read configuration file \"%1\""), rcfile) << endmsg;
+ if (g_stat (rcfile.c_str(), &statbuf)) {
return -1;
}
- current_owner = ConfigVariableBase::Config;
-
- if (set_state (*tree.root())) {
- error << string_compose(_("Ardour: user 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;
+
+ if (!tree.read (rcfile)) {
+ error << string_compose(_("Ardour: cannot read configuration file \"%1\""), rcfile) << endmsg;
+ return -1;
+ }
+
+ current_owner = ConfigVariableBase::Config;
+
+ if (set_state (*tree.root())) {
+ 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 << "Ardour: could not find configuration file (ardour.rc), canvas will look broken." << endmsg;
- pack_canvasvars();
return 0;
}
LocaleGuard lg (X_("POSIX"));
root = new XMLNode("Ardour");
- typedef map<string, MidiPortDescriptor*>::const_iterator CI;
- for(CI m = midi_ports.begin(); m != midi_ports.end(); ++m){
- root->add_child_nocopy(m->second->get_state());
+
+ 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());
}
root->add_child_nocopy (get_variables (sigc::mem_fun (*this, &Configuration::save_config_options_predicate), "Config"));
- root->add_child_nocopy (get_variables (sigc::mem_fun (*this, &Configuration::save_config_options_predicate), "Canvas"));
if (_extra_xml) {
root->add_child_copy (*_extra_xml);
#undef CONFIG_VARIABLE
#undef CONFIG_VARIABLE_SPECIAL
-#undef CANVAS_VARIABLE
-#define CANVAS_VARIABLE(var,Name) if (node->name() == "Canvas") { if (predicate (ConfigVariableBase::Config)) { var.add_to_node (*node); }}
-#include "ardour/canvas_vars.h"
-#undef CANVAS_VARIABLE
-
return *node;
}
if (node->name() == "MIDI-port") {
try {
- pair<string,MidiPortDescriptor*> newpair;
- newpair.second = new MidiPortDescriptor (*node);
- newpair.first = newpair.second->tag;
- midi_ports.insert (newpair);
+
+ 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));
}
catch (failed_constructor& err) {
warning << _("ill-formed MIDI port specification in ardour rcfile (ignored)") << endmsg;
}
- } else if (node->name() == "Config" || node->name() == "Canvas" ) {
+ } else if (node->name() == "Config") {
set_variables (*node, ConfigVariableBase::Config);
#include "ardour/configuration_vars.h"
#undef CONFIG_VARIABLE
-#undef CONFIG_VARIABLE_SPECIAL
-
-#undef CANVAS_VARIABLE
-#define CANVAS_VARIABLE(var,name) \
- if (var.set_from_node (node, owner)) { \
- ParameterChanged (name); \
- }
-#include "ardour/canvas_vars.h"
-#undef CANVAS_VARIABLE
-
-}
-
-void
-Configuration::pack_canvasvars ()
-{
-#undef CANVAS_VARIABLE
-#define CANVAS_VARIABLE(var,name) canvas_colors.push_back(&var);
-#include "ardour/canvas_vars.h"
-#undef CANVAS_VARIABLE
- cerr << "Configuration::pack_canvasvars () called, canvas_colors.size() = " << canvas_colors.size() << endl;
+#undef CONFIG_VARIABLE_SPECIAL
}
-
-Configuration::MidiPortDescriptor::MidiPortDescriptor (const XMLNode& node)
-{
- const XMLProperty *prop;
- bool have_tag = false;
- bool have_device = false;
- bool have_type = false;
- bool have_mode = false;
-
- if ((prop = node.property ("tag")) != 0) {
- tag = prop->value();
- have_tag = true;
- }
-
- if ((prop = node.property ("device")) != 0) {
- device = prop->value();
- have_device = true;
- }
-
- if ((prop = node.property ("type")) != 0) {
- type = prop->value();
- have_type = true;
- }
-
- if ((prop = node.property ("mode")) != 0) {
- mode = prop->value();
- have_mode = true;
- }
-
- if (!have_tag || !have_device || !have_type || !have_mode) {
- throw failed_constructor();
- }
-}
-
-XMLNode&
-Configuration::MidiPortDescriptor::get_state()
-{
- XMLNode* root = new XMLNode("MIDI-port");
-
- root->add_property("tag", tag);
- root->add_property("device", device);
- root->add_property("type", type);
- root->add_property("mode", mode);
-
- return *root;
-}
-
void
Configuration::map_parameters (sigc::slot<void,const char*> theSlot)
{
projects / ardour.git / blobdiff