summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2016-05-07 12:19:41 +0200
committerRobin Gareus <robin@gareus.org>2016-05-07 12:19:41 +0200
commit6d343ba3c607f5210ae03edb17ba51d662c7f79b (patch)
treeec66246b2859834c98fb7673b4f5c4dd7e95f8a0 /gtk2_ardour
parentf445ba8bdcc74943926817a8627741d1fc8dcb3f (diff)
fix LocaleGuard contstructor (3dc77280)
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/engine_dialog.cc2
-rw-r--r--gtk2_ardour/export_video_dialog.cc4
-rw-r--r--gtk2_ardour/gain_meter.cc2
-rw-r--r--gtk2_ardour/luainstance.cc4
-rw-r--r--gtk2_ardour/main.cc2
-rw-r--r--gtk2_ardour/ui_config.cc8
-rw-r--r--gtk2_ardour/video_timeline.cc8
7 files changed, 16 insertions, 14 deletions
diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index 6f6d31ff18..748561f83d 100644
--- a/gtk2_ardour/engine_dialog.cc
+++ b/gtk2_ardour/engine_dialog.cc
@@ -1900,7 +1900,7 @@ EngineControl::maybe_display_saved_state ()
XMLNode&
EngineControl::get_state ()
{
- LocaleGuard lg ();
+ LocaleGuard lg;
XMLNode* root = new XMLNode ("AudioMIDISetup");
std::string path;
diff --git a/gtk2_ardour/export_video_dialog.cc b/gtk2_ardour/export_video_dialog.cc
index 7d7e14505f..5038339b7d 100644
--- a/gtk2_ardour/export_video_dialog.cc
+++ b/gtk2_ardour/export_video_dialog.cc
@@ -366,7 +366,7 @@ ExportVideoDialog::apply_state (TimeSelection &tme, bool range)
float tcfps = _session->timecode_frames_per_second();
- LocaleGuard lg ();
+ LocaleGuard lg;
XMLNode* node = _session->extra_xml (X_("Videotimeline"));
bool filenameset = false;
@@ -482,7 +482,7 @@ ExportVideoDialog::apply_state (TimeSelection &tme, bool range)
XMLNode&
ExportVideoDialog::get_state ()
{
- LocaleGuard lg ();
+ LocaleGuard lg;
XMLNode* node = new XMLNode (X_("Videoexport"));
node->add_property (X_("ChangeGeometry"), scale_checkbox.get_active() ? X_("1") : X_("0"));
node->add_property (X_("KeepAspect"), scale_aspect.get_active() ? X_("1") : X_("0"));
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index e06f2b024c..a91382d574 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -463,7 +463,7 @@ GainMeterBase::gain_activated ()
// if they use different LC_NUMERIC conventions,
// we will honor them.
- PBD::LocaleGuard lg ();
+ PBD::LocaleGuard lg;
if (sscanf (gain_display.get_text().c_str(), "%f", &f) != 1) {
return;
}
diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc
index a49733d5ea..369b795251 100644
--- a/gtk2_ardour/luainstance.cc
+++ b/gtk2_ardour/luainstance.cc
@@ -685,7 +685,7 @@ LuaInstance::session_going_away ()
int
LuaInstance::set_state (const XMLNode& node)
{
- LocaleGuard lg ();
+ LocaleGuard lg;
XMLNode* child;
if ((child = find_named_node (node, "ActionScript"))) {
@@ -791,7 +791,7 @@ LuaInstance::interactive_add (LuaScriptInfo::ScriptType type, int id)
XMLNode&
LuaInstance::get_action_state ()
{
- LocaleGuard lg ();
+ LocaleGuard lg;
std::string saved;
{
luabridge::LuaRef savedstate ((*_lua_save)());
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 83f8491855..8cc72a6284 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -377,6 +377,8 @@ int main (int argc, char *argv[])
}
#endif
+ DEBUG_TRACE (DEBUG::Locale, string_compose ("main() locale '%1'\n", setlocale (LC_NUMERIC, NULL)));
+
if (UIConfiguration::instance().pre_gui_init ()) {
error << _("Could not complete pre-GUI initialization") << endmsg;
exit (1);
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 354539b57b..50d3fba120 100644
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -308,7 +308,7 @@ int
UIConfiguration::store_color_theme ()
{
XMLNode* root;
- LocaleGuard lg ();
+ LocaleGuard lg;
root = new XMLNode("Ardour");
@@ -443,7 +443,7 @@ XMLNode&
UIConfiguration::get_state ()
{
XMLNode* root;
- LocaleGuard lg ();
+ LocaleGuard lg;
root = new XMLNode("Ardour");
@@ -461,7 +461,7 @@ XMLNode&
UIConfiguration::get_variables (std::string which_node)
{
XMLNode* node;
- LocaleGuard lg ();
+ LocaleGuard lg;
node = new XMLNode (which_node);
@@ -576,7 +576,7 @@ UIConfiguration::load_colors (XMLNode const & node)
void
UIConfiguration::load_modifiers (XMLNode const & node)
{
- PBD::LocaleGuard lg ();
+ PBD::LocaleGuard lg;
XMLNodeList const nlist = node.children();
XMLNodeConstIterator niter;
XMLProperty const *name;
diff --git a/gtk2_ardour/video_timeline.cc b/gtk2_ardour/video_timeline.cc
index 43450d07a6..74c64ab7c1 100644
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -85,7 +85,7 @@ VideoTimeLine::save_session ()
return;
}
- LocaleGuard lg ();
+ LocaleGuard lg;
XMLNode* node = new XMLNode(X_("Videomonitor"));
if (!node) return;
@@ -143,7 +143,7 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
if (!_session) { return ; }
_session->SessionSaveUnderway.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this));
- LocaleGuard lg ();
+ LocaleGuard lg;
XMLNode* node = _session->extra_xml (X_("Videotimeline"));
@@ -224,7 +224,7 @@ VideoTimeLine::save_undo ()
int
VideoTimeLine::set_state (const XMLNode& node, int /*version*/)
{
- LocaleGuard lg ();
+ LocaleGuard lg;
XMLProperty const * propoffset = node.property (X_("VideoOffset"));
if (propoffset) {
video_offset = atoll(propoffset->value());
@@ -237,7 +237,7 @@ XMLNode&
VideoTimeLine::get_state ()
{
XMLNode* node = new XMLNode (X_("Videotimeline"));
- LocaleGuard lg ();
+ LocaleGuard lg;
node->add_property (X_("VideoOffset"), video_offset_p);
return *node;
}