summaryrefslogtreecommitdiff
path: root/libs/ardour/configuration.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2005-10-06 19:10:57 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2005-10-06 19:10:57 +0000
commit4c509656223d3ed1f0fab504cb483090d38972f9 (patch)
tree540f207b81f957fa78101d67da3094ff1e1f9456 /libs/ardour/configuration.cc
parent5a52d8fee4c9abac7ffb1f1e6464785d979acd68 (diff)
fix compose mess, and a number of 64 bit printf specs
git-svn-id: svn://localhost/trunk/ardour2@51 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/configuration.cc')
-rw-r--r--libs/ardour/configuration.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/configuration.cc b/libs/ardour/configuration.cc
index f7452f4fd0..4003946576 100644
--- a/libs/ardour/configuration.cc
+++ b/libs/ardour/configuration.cc
@@ -96,12 +96,12 @@ Configuration::load_state ()
cerr << "Loading system configuration file " << rcfile << endl;
if (!tree.read (rcfile.c_str())) {
- error << compose(_("Ardour: cannot read system configuration file \"%1\""), rcfile) << endmsg;
+ error << string_compose(_("Ardour: cannot read system configuration file \"%1\""), rcfile) << endmsg;
return -1;
}
if (set_state (*tree.root())) {
- error << compose(_("Ardour: system configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+ error << string_compose(_("Ardour: system configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
return -1;
}
}
@@ -121,13 +121,13 @@ Configuration::load_state ()
cerr << "Loading user configuration file " << rcfile << endl;
if (!tree.read (rcfile)) {
- error << compose(_("Ardour: cannot read configuration file \"%1\""), rcfile) << endmsg;
+ error << string_compose(_("Ardour: cannot read configuration file \"%1\""), rcfile) << endmsg;
return -1;
}
if (set_state (*tree.root())) {
- error << compose(_("Ardour: configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
+ error << string_compose(_("Ardour: configuration file \"%1\" not loaded successfully."), rcfile) << endmsg;
return -1;
}
}