we always only use the "C" locale when saving.

[ardour.git] / libs / ardour / session_configuration.cc

diff --git a/libs/ardour/session_configuration.cc b/libs/ardour/session_configuration.cc
index c35da623689b1d00b0c9aa2e41fbdeade71fb351..fa7d28d22d90fbf343e0d85bc3507b7d6ef6aaaf 100644 (file)
--- a/libs/ardour/session_configuration.cc
+++ b/libs/ardour/session_configuration.cc
@@ -17,13 +17,23 @@
 
 */
 
+#include <glib.h>
+#include "pbd/gstdio_compat.h"
+#include <glibmm/miscutils.h> /* for build_filename() */
+
+#include "pbd/error.h"
+#include "pbd/file_utils.h"
+#include "pbd/locale_guard.h"
+#include "pbd/pathexpand.h"
+
 #include "ardour/types.h"
-#include "ardour/utils.h"
+#include "ardour/filesystem_paths.h"
 #include "ardour/session_configuration.h"
-#include "ardour/ardour.h"
+#include "ardour/utils.h"
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 
 SessionConfiguration::SessionConfiguration ()
        :
@@ -44,7 +54,7 @@ XMLNode&
 SessionConfiguration::get_state ()
 {
        XMLNode* root;
-       LocaleGuard lg (X_("POSIX"));
+       LocaleGuard lg ();
 
        root = new XMLNode ("Ardour");
        root->add_child_nocopy (get_variables ());
@@ -57,7 +67,7 @@ XMLNode&
 SessionConfiguration::get_variables ()
 {
        XMLNode* node;
-       LocaleGuard lg (X_("POSIX"));
+       LocaleGuard lg ();
 
        node = new XMLNode ("Config");
 
@@ -76,7 +86,7 @@ SessionConfiguration::get_variables ()
 
 
 int
-SessionConfiguration::set_state (XMLNode const& root, int version)
+SessionConfiguration::set_state (XMLNode const& root, int /*version*/)
 {
        if (root.name() != "Ardour") {
                return -1;
@@ -111,13 +121,77 @@ SessionConfiguration::set_variables (const XMLNode& node)
 
 }
 void
-SessionConfiguration::map_parameters (sigc::slot<void, std::string> theSlot)
+SessionConfiguration::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/session_configuration_vars.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 }
+
+
+bool
+SessionConfiguration::load_state ()
+{
+       std::string rcfile;
+       GStatBuf statbuf;
+       if (find_file (ardour_config_search_path(), "session.rc", rcfile)) {
+               if (g_stat (rcfile.c_str(), &statbuf)) {
+                       return false;
+               }
+               if (statbuf.st_size == 0) {
+                       return false;
+               }
+               XMLTree tree;
+               if (!tree.read (rcfile.c_str())) {
+                       error << string_compose(_("%1: cannot part default session options \"%2\""), PROGRAM_NAME, rcfile) << endmsg;
+                       return false;
+               }
+
+               XMLNode& root (*tree.root());
+               if (root.name() != X_("SessionDefaults")) {
+                       warning << _("Invalid session default XML Root.") << endmsg;
+                       return false;
+               }
+
+               XMLNode* node;
+               if (((node = find_named_node (root, X_("Config"))) != 0)) {
+                       LocaleGuard lg ();
+                       set_variables(*node);
+                       info << _("Loaded custom session defaults.") << endmsg;
+               } else {
+                       warning << _("Found no session defaults in XML file.") << endmsg;
+                       return false;
+               }
+
+               /* CUSTOM OVERRIDES */
+               set_audio_search_path("");
+               set_midi_search_path("");
+               set_raid_path("");
+       }
+       return true;
+}
+
+bool
+SessionConfiguration::save_state ()
+{
+       const std::string rcfile = Glib::build_filename (user_config_directory(), "session.rc");
+       if (rcfile.empty()) {
+               return false;
+       }
+
+       XMLTree tree;
+       XMLNode* root = new XMLNode(X_("SessionDefaults"));
+       root->add_child_nocopy (get_variables ());
+       tree.set_root (root);
+
+       if (!tree.write (rcfile.c_str())) {
+               error << _("Could not save session options") << endmsg;
+               return false;
+       }
+
+       return true;
+}