projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send a slightly more useful message if a control protocol's probe() method fails
[ardour.git]
/
libs
/
ardour
/
rc_configuration.cc
diff --git
a/libs/ardour/rc_configuration.cc
b/libs/ardour/rc_configuration.cc
index 452d8eb1a86d208bd06098d818adf086592dc041..7fc2f5105b6755ed7906c0d1d7f9f781c1e417f1 100644
(file)
--- a/
libs/ardour/rc_configuration.cc
+++ b/
libs/ardour/rc_configuration.cc
@@
-21,7
+21,7
@@
#include <cstdio> /* for snprintf, grrr */
#include <glib.h>
#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/xml++.h"
#include <glibmm/miscutils.h>
#include "pbd/xml++.h"
@@
-36,7
+36,7
@@
#include "ardour/rc_configuration.h"
#include "ardour/session_metadata.h"
#include "ardour/rc_configuration.h"
#include "ardour/session_metadata.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
using namespace std;
@@
-89,7
+89,7
@@
RCConfiguration::load_state ()
}
if (statbuf.st_size != 0) {
}
if (statbuf.st_size != 0) {
- info << string_compose (_("Loading system configuration file %1"), rcfile) << end
l
;
+ info << string_compose (_("Loading system configuration file %1"), rcfile) << end
msg
;
XMLTree tree;
if (!tree.read (rcfile.c_str())) {
XMLTree tree;
if (!tree.read (rcfile.c_str())) {
@@
-117,7
+117,7
@@
RCConfiguration::load_state ()
}
if (statbuf.st_size != 0) {
}
if (statbuf.st_size != 0) {
- info << string_compose (_("Loading user configuration file %1"), rcfile) << end
l
;
+ info << string_compose (_("Loading user configuration file %1"), rcfile) << end
msg
;
XMLTree tree;
if (!tree.read (rcfile)) {
XMLTree tree;
if (!tree.read (rcfile)) {
@@
-172,7
+172,7
@@
XMLNode&
RCConfiguration::get_state ()
{
XMLNode* root;
RCConfiguration::get_state ()
{
XMLNode* root;
- LocaleGuard lg
(X_("C"))
;
+ LocaleGuard lg;
root = new XMLNode("Ardour");
root = new XMLNode("Ardour");
@@
-193,7
+193,7
@@
XMLNode&
RCConfiguration::get_variables ()
{
XMLNode* node;
RCConfiguration::get_variables ()
{
XMLNode* node;
- LocaleGuard lg
(X_("C"))
;
+ LocaleGuard lg;
node = new XMLNode ("Config");
node = new XMLNode ("Config");
@@
-220,6
+220,7
@@
RCConfiguration::set_state (const XMLNode& root, int version)
XMLNodeList nlist = root.children();
XMLNodeConstIterator niter;
XMLNode *node;
XMLNodeList nlist = root.children();
XMLNodeConstIterator niter;
XMLNode *node;
+ LocaleGuard lg;
Stateful::save_extra_xml (root);
Stateful::save_extra_xml (root);