projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
'Route::tape_drive_controllable()' needs to return something
[ardour.git]
/
libs
/
ardour
/
session_configuration.cc
diff --git
a/libs/ardour/session_configuration.cc
b/libs/ardour/session_configuration.cc
index 449e39d6a829462a6d6bc7f6642637c9d0fde164..8b649e2f9ea60e2c49a47034ab600653504a39c9 100644
(file)
--- a/
libs/ardour/session_configuration.cc
+++ b/
libs/ardour/session_configuration.cc
@@
-18,19
+18,19
@@
*/
#include <glib.h>
*/
#include <glib.h>
-#include
<pbd/gstdio_compat.h>
+#include
"pbd/gstdio_compat.h"
#include <glibmm/miscutils.h> /* for build_filename() */
#include "pbd/error.h"
#include "pbd/file_utils.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 "pbd/pathexpand.h"
#include "ardour/types.h"
+#include "ardour/types_convert.h"
#include "ardour/filesystem_paths.h"
#include "ardour/session_configuration.h"
#include "ardour/utils.h"
#include "ardour/filesystem_paths.h"
#include "ardour/session_configuration.h"
#include "ardour/utils.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace ARDOUR;
using namespace PBD;
using namespace ARDOUR;
using namespace PBD;
@@
-54,7
+54,6
@@
XMLNode&
SessionConfiguration::get_state ()
{
XMLNode* root;
SessionConfiguration::get_state ()
{
XMLNode* root;
- LocaleGuard lg (X_("C"));
root = new XMLNode ("Ardour");
root->add_child_nocopy (get_variables ());
root = new XMLNode ("Ardour");
root->add_child_nocopy (get_variables ());
@@
-67,7
+66,6
@@
XMLNode&
SessionConfiguration::get_variables ()
{
XMLNode* node;
SessionConfiguration::get_variables ()
{
XMLNode* node;
- LocaleGuard lg (X_("C"));
node = new XMLNode ("Config");
node = new XMLNode ("Config");
@@
-159,7
+157,6
@@
SessionConfiguration::load_state ()
XMLNode* node;
if (((node = find_named_node (root, X_("Config"))) != 0)) {
XMLNode* node;
if (((node = find_named_node (root, X_("Config"))) != 0)) {
- LocaleGuard lg (X_("C"));
set_variables(*node);
info << _("Loaded custom session defaults.") << endmsg;
} else {
set_variables(*node);
info << _("Loaded custom session defaults.") << endmsg;
} else {