#include <cstdio> /* for snprintf, grrr */
#include <glib.h>
-#include <glib/gstdio.h> /* for g_stat() */
+#include "pbd/gstdio_compat.h"
#include <glibmm/miscutils.h>
-#include "pbd/failed_constructor.h"
#include "pbd/xml++.h"
-#include "pbd/filesystem.h"
#include "pbd/file_utils.h"
+#include "pbd/replace_all.h"
-#include "midi++/manager.h"
-
-#include "ardour/ardour.h"
-#include "ardour/rc_configuration.h"
-#include "ardour/audio_diskstream.h"
+#include "ardour/audioengine.h"
#include "ardour/control_protocol_manager.h"
+#include "ardour/diskstream.h"
#include "ardour/filesystem_paths.h"
+#include "ardour/port.h"
+#include "ardour/rc_configuration.h"
+#include "ardour/session_metadata.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace std;
float speed_quietning = 0.251189; // -12dB reduction for ffwd or rewind
}
+static const char* user_config_file_name = "config";
+static const char* system_config_file_name = "system_config";
+
RCConfiguration::RCConfiguration ()
:
/* construct variables */
{
}
+RCConfiguration::~RCConfiguration ()
+{
+ delete _control_protocol_state;
+}
+
int
RCConfiguration::load_state ()
{
- bool found = false;
-
- sys::path system_rc_file;
- struct stat statbuf;
+ std::string rcfile;
+ GStatBuf 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;
-
- string rcfile = system_rc_file.to_string();
+ if (find_file (ardour_config_search_path(), system_config_file_name, rcfile)) {
/* stupid XML Parser hates empty files */
if (statbuf.st_size != 0) {
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 was an error installing %1"), PROGRAM_NAME) << endmsg;
}
}
/* now load configuration file for user */
- 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;
-
- string rcfile = user_rc_file.to_string();
+ if (find_file (ardour_config_search_path(), user_config_file_name, rcfile)) {
/* stupid XML parser hates empty files */
if (statbuf.st_size != 0) {
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 ());
- }
- catch (const sys::filesystem_error& ex)
- {
- error << "Could not create user configuration directory" << endmsg;
- return -1;
- }
-
- sys::path rcfile_path(user_config_directory());
-
- rcfile_path /= "ardour.rc";
- const string rcfile = rcfile_path.to_string();
+ const std::string rcfile = Glib::build_filename (user_config_directory(), user_config_file_name);
// 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;
RCConfiguration::get_state ()
{
XMLNode* root;
- LocaleGuard lg (X_("POSIX"));
+ LocaleGuard lg;
root = new XMLNode("Ardour");
- 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 ());
+ root->add_child_nocopy (SessionMetadata::Metadata()->get_user_state());
+
if (_extra_xml) {
root->add_child_copy (*_extra_xml);
}
RCConfiguration::get_variables ()
{
XMLNode* node;
- LocaleGuard lg (X_("POSIX"));
+ LocaleGuard lg;
node = new XMLNode ("Config");
}
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;
+ Stateful::save_extra_xml (root);
+
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
node = *niter;
- if (node->name() == "MIDI-port") {
-
- try {
-
- MIDI::Port::Descriptor desc (*node);
- map<string,XMLNode>::iterator x;
-
- if ((x = midi_ports.find (desc.tag)) != midi_ports.end()) {
- warning << string_compose (_("Duplicate MIDI port definition found (tag=\"%1\") - ignored"),
- desc.tag) << endmsg;
- continue;
- }
- 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") {
-
+ if (node->name() == "Config") {
set_variables (*node);
-
- } else if (node->name() == "Extra") {
- _extra_xml = new XMLNode (*node);
-
+ } else if (node->name() == "Metadata") {
+ SessionMetadata::Metadata()->set_state (*node, version);
} else if (node->name() == ControlProtocolManager::state_node_name) {
_control_protocol_state = new XMLNode (*node);
}
}
- Diskstream::set_disk_io_chunk_frames (minimum_disk_io_bytes.get() / sizeof (Sample));
+ Diskstream::set_disk_read_chunk_frames (minimum_disk_read_bytes.get() / sizeof (Sample));
+ Diskstream::set_disk_write_chunk_frames (minimum_disk_write_bytes.get() / sizeof (Sample));
return 0;
}
}
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