X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Frc_configuration.cc;h=3227a644dde5c10f80c48416a43264668c1e5865;hb=b285559767e21aae4467270590f048c3263fd742;hp=972f1f2fcba09ec5aa347d30d8f4507af1dd644f;hpb=d8520401d0c811f84fab5d53ee16d1b098520f36;p=ardour.git diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc index 972f1f2fcb..3227a644dd 100644 --- a/libs/ardour/rc_configuration.cc +++ b/libs/ardour/rc_configuration.cc @@ -21,21 +21,25 @@ #include /* for snprintf, grrr */ #include -#include /* for g_stat() */ +#include "pbd/gstdio_compat.h" #include #include "pbd/xml++.h" #include "pbd/file_utils.h" +#include "pbd/replace_all.h" -#include "midi++/manager.h" - +#include "ardour/audioengine.h" +#include "ardour/disk_reader.h" +#include "ardour/disk_writer.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 "ardour/transport_master_manager.h" +#include "ardour/types_convert.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace std; @@ -49,6 +53,9 @@ namespace ARDOUR { 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 */ @@ -60,28 +67,25 @@ RCConfiguration::RCConfiguration () #undef CONFIG_VARIABLE #undef CONFIG_VARIABLE_SPECIAL _control_protocol_state (0) + , _transport_master_state (0) { } - RCConfiguration::~RCConfiguration () { - for (list::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) { - delete *i; - } - delete _control_protocol_state; + delete _transport_master_state; } int RCConfiguration::load_state () { std::string rcfile; - struct stat statbuf; + GStatBuf statbuf; /* load system configuration first */ - if (find_file_in_search_path (ardour_config_search_path(), "ardour_system.rc", rcfile)) { + if (find_file (ardour_config_search_path(), system_config_file_name, rcfile)) { /* stupid XML Parser hates empty files */ @@ -90,7 +94,7 @@ RCConfiguration::load_state () } if (statbuf.st_size != 0) { - info << string_compose (_("Loading system configuration file %1"), rcfile) << endl; + info << string_compose (_("Loading system configuration file %1"), rcfile) << endmsg; XMLTree tree; if (!tree.read (rcfile.c_str())) { @@ -103,13 +107,13 @@ RCConfiguration::load_state () return -1; } } else { - error << string_compose (_("your system %1 configuration file is empty. This probably means that there as an error installing %1"), PROGRAM_NAME) << 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 */ - if (find_file_in_search_path (ardour_config_search_path(), "ardour.rc", rcfile)) { + if (find_file (ardour_config_search_path(), user_config_file_name, rcfile)) { /* stupid XML parser hates empty files */ @@ -118,7 +122,7 @@ RCConfiguration::load_state () } if (statbuf.st_size != 0) { - info << string_compose (_("Loading user configuration file %1"), rcfile) << endl; + info << string_compose (_("Loading user configuration file %1"), rcfile) << endmsg; XMLTree tree; if (!tree.read (rcfile)) { @@ -141,7 +145,7 @@ RCConfiguration::load_state () int RCConfiguration::save_state() { - const std::string rcfile = Glib::build_filename (user_config_directory(), "ardour.rc"); + const std::string rcfile = Glib::build_filename (user_config_directory(), user_config_file_name); // this test seems bogus? if (!rcfile.empty()) { @@ -173,20 +177,9 @@ XMLNode& RCConfiguration::get_state () { XMLNode* root; - LocaleGuard lg (X_("POSIX")); root = new XMLNode("Ardour"); - MIDI::Manager* mm = MIDI::Manager::instance(); - - if (mm) { - boost::shared_ptr 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 ()); root->add_child_nocopy (SessionMetadata::Metadata()->get_user_state()); @@ -197,6 +190,10 @@ RCConfiguration::get_state () root->add_child_nocopy (ControlProtocolManager::instance().get_state()); + if (TransportMasterManager::exists()) { + root->add_child_nocopy (TransportMasterManager::instance().get_state()); + } + return *root; } @@ -204,7 +201,6 @@ XMLNode& RCConfiguration::get_variables () { XMLNode* node; - LocaleGuard lg (X_("POSIX")); node = new XMLNode ("Config"); @@ -232,12 +228,6 @@ RCConfiguration::set_state (const XMLNode& root, int version) XMLNodeConstIterator niter; XMLNode *node; - for (list::iterator i = _midi_port_states.begin(); i != _midi_port_states.end(); ++i) { - delete *i; - } - - _midi_port_states.clear (); - Stateful::save_extra_xml (root); for (niter = nlist.begin(); niter != nlist.end(); ++niter) { @@ -250,12 +240,13 @@ RCConfiguration::set_state (const XMLNode& root, int version) SessionMetadata::Metadata()->set_state (*node, version); } 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)); + } else if (node->name() == TransportMasterManager::state_node_name) { + _transport_master_state = new XMLNode (*node); } } - Diskstream::set_disk_io_chunk_frames (minimum_disk_io_bytes.get() / sizeof (Sample)); + DiskReader::set_chunk_samples (minimum_disk_read_bytes.get() / sizeof (Sample)); + DiskWriter::set_chunk_samples (minimum_disk_write_bytes.get() / sizeof (Sample)); return 0; } @@ -290,3 +281,4 @@ RCConfiguration::map_parameters (boost::function& functor) #undef CONFIG_VARIABLE #undef CONFIG_VARIABLE_SPECIAL } +