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

27 files changed, 46 insertions, 60 deletions

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 7a50934630..0a6a62017b 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -1895,7 +1895,7 @@ AudioDiskstream::get_state ()
 {
 	XMLNode& node (Diskstream::get_state());
 	char buf[64] = "";
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	boost::shared_ptr<ChannelList> c = channels.reader();
 	snprintf (buf, sizeof(buf), "%u", (unsigned int) c->size());
@@ -1937,7 +1937,7 @@ AudioDiskstream::set_state (const XMLNode& node, int version)
 	XMLNodeIterator niter;
 	uint32_t nchans = 1;
 	XMLNode* capture_pending_node = 0;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	/* prevent write sources from being created */
 
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 661469e01e..4a674527b9 100644
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -267,7 +267,7 @@ AudioTrack::set_state_part_two ()
 {
 	XMLNode* fnode;
 	XMLProperty const * prop;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	/* This is called after all session state has been restored but before
 	   have been made ports and connections are established.
diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc
index c2c377eb5e..cd46f046cd 100644
--- a/libs/ardour/audio_unit.cc
+++ b/libs/ardour/audio_unit.cc
@@ -2053,7 +2053,7 @@ AUPlugin::parameter_is_output (uint32_t param) const
 void
 AUPlugin::add_state (XMLNode* root) const
 {
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 	CFDataRef xmlData;
 	CFPropertyListRef propertyList;
 
@@ -2092,7 +2092,7 @@ AUPlugin::set_state(const XMLNode& node, int version)
 {
 	int ret = -1;
 	CFPropertyListRef propertyList;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	if (node.name() != state_node_name()) {
 		error << _("Bad node sent to AUPlugin::set_state") << endmsg;
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 987a226c76..44e238fb7e 100644
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -771,7 +771,7 @@ AudioRegion::get_basic_state ()
 {
 	XMLNode& node (Region::state ());
 	char buf[64];
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	snprintf (buf, sizeof (buf), "%u", (uint32_t) _sources.size());
 	node.add_property ("channels", buf);
@@ -784,7 +784,7 @@ AudioRegion::state ()
 {
 	XMLNode& node (get_basic_state());
 	XMLNode *child;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	child = node.add_child ("Envelope");
 
@@ -841,7 +841,7 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_
 {
 	const XMLNodeList& nlist = node.children();
 	XMLProperty const * prop;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 	boost::shared_ptr<Playlist> the_playlist (_playlist.lock());
 
 	suspend_property_changes ();
diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 21825612fa..7efe0f67c4 100644
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -303,7 +303,7 @@ AutomationList::state (bool full)
 {
 	XMLNode* root = new XMLNode (X_("AutomationList"));
 	char buf[64];
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	root->add_property ("automation-id", EventTypeMap::instance().to_symbol(_parameter));
 
@@ -421,7 +421,7 @@ AutomationList::deserialize_events (const XMLNode& node)
 int
 AutomationList::set_state (const XMLNode& node, int version)
 {
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 	XMLNodeList nlist = node.children();
 	XMLNode* nsos;
 	XMLNodeIterator niter;
diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc
index 1e5cc0c7c1..d6ccf5c9ea 100644
--- a/libs/ardour/diskstream.cc
+++ b/libs/ardour/diskstream.cc
@@ -461,7 +461,7 @@ Diskstream::get_state ()
 {
 	XMLNode* node = new XMLNode ("Diskstream");
         char buf[64];
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	node->add_property ("flags", enum_2_string (_flags));
 	node->add_property ("playlist", _playlist->name());
diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc
index 642b2a0435..a02739db44 100644
--- a/libs/ardour/io.cc
+++ b/libs/ardour/io.cc
@@ -530,7 +530,7 @@ IO::state (bool /*full_state*/)
 	char buf[64];
 	string str;
 	int n;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 	Glib::Threads::Mutex::Lock lm (io_lock);
 
 	node->add_property("name", _name);
@@ -597,7 +597,7 @@ IO::set_state (const XMLNode& node, int version)
 
 	XMLProperty const * prop;
 	XMLNodeConstIterator iter;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	/* force use of non-localized representation of decimal point,
 	   since we use it a lot in XML files and so forth.
@@ -658,7 +658,7 @@ IO::set_state_2X (const XMLNode& node, int version, bool in)
 {
 	XMLProperty const * prop;
 	XMLNodeConstIterator iter;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	/* force use of non-localized representation of decimal point,
 	   since we use it a lot in XML files and so forth.
diff --git a/libs/ardour/ladspa_plugin.cc b/libs/ardour/ladspa_plugin.cc
index a80c2797c6..ac9c227fba 100644
--- a/libs/ardour/ladspa_plugin.cc
+++ b/libs/ardour/ladspa_plugin.cc
@@ -348,7 +348,7 @@ LadspaPlugin::add_state (XMLNode* root) const
 {
 	XMLNode *child;
 	char buf[32];
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	for (uint32_t i = 0; i < parameter_count(); ++i){
 
@@ -381,7 +381,7 @@ LadspaPlugin::set_state (const XMLNode& node, int version)
 	const char *data;
 	uint32_t port_id;
 #endif
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	if (node.name() != state_node_name()) {
 		error << _("Bad node sent to LadspaPlugin::set_state") << endmsg;
@@ -431,7 +431,7 @@ LadspaPlugin::set_state_2X (const XMLNode& node, int /* version */)
 	const char *data;
 	uint32_t port_id;
 #endif
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	if (node.name() != state_node_name()) {
 		error << _("Bad node sent to LadspaPlugin::set_state") << endmsg;
diff --git a/libs/ardour/luaproc.cc b/libs/ardour/luaproc.cc
index 1ab93e4d15..30b34f584b 100644
--- a/libs/ardour/luaproc.cc
+++ b/libs/ardour/luaproc.cc
@@ -713,7 +713,7 @@ LuaProc::add_state (XMLNode* root) const
 {
 	XMLNode*    child;
 	char        buf[32];
-	LocaleGuard lg(X_("C"));
+	LocaleGuard lg ();
 
 	gchar* b64 = g_base64_encode ((const guchar*)_script.c_str (), _script.size ());
 	std::string b64s (b64);
@@ -783,7 +783,7 @@ LuaProc::set_state (const XMLNode& node, int version)
 	const char *port;
 	uint32_t port_id;
 #endif
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	if (_script.empty ()) {
 		if (set_script_from_state (node)) {
diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc
index 908b6b49f9..cceb6020e9 100644
--- a/libs/ardour/lv2_plugin.cc
+++ b/libs/ardour/lv2_plugin.cc
@@ -1127,7 +1127,7 @@ LV2Plugin::add_state(XMLNode* root) const
 
 	XMLNode*    child;
 	char        buf[32];
-	LocaleGuard lg(X_("C"));
+	LocaleGuard lg ();
 
 	for (uint32_t i = 0; i < parameter_count(); ++i) {
 		if (parameter_is_input(i) && parameter_is_control(i)) {
@@ -1806,7 +1806,7 @@ LV2Plugin::set_state(const XMLNode& node, int version)
 	const char*          sym;
 	const char*          value;
 	uint32_t             port_id;
-	LocaleGuard          lg(X_("C"));
+	LocaleGuard          lg ();
 
 	if (node.name() != state_node_name()) {
 		error << _("Bad node sent to LV2Plugin::set_state") << endmsg;
diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc
index 485967b2a3..35788e09aa 100644
--- a/libs/ardour/midi_diskstream.cc
+++ b/libs/ardour/midi_diskstream.cc
@@ -1213,7 +1213,7 @@ MidiDiskstream::get_state ()
 {
 	XMLNode& node (Diskstream::get_state());
 	char buf[64];
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	if (_write_source && _session.get_record_enabled()) {
 
@@ -1247,7 +1247,7 @@ MidiDiskstream::set_state (const XMLNode& node, int version)
 	XMLNodeList nlist = node.children();
 	XMLNodeIterator niter;
 	XMLNode* capture_pending_node = 0;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	/* prevent write sources from being created */
 
diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc
index 3aba6bf39e..9fdd80ac19 100644
--- a/libs/ardour/midi_track.cc
+++ b/libs/ardour/midi_track.cc
@@ -273,7 +273,7 @@ MidiTrack::set_state_part_two ()
 {
 	XMLNode* fnode;
 	XMLProperty const * prop;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	/* This is called after all session state has been restored but before
 	   have been made ports and connections are established.
diff --git a/libs/ardour/monitor_processor.cc b/libs/ardour/monitor_processor.cc
index e8585c8da2..df4f3d082f 100644
--- a/libs/ardour/monitor_processor.cc
+++ b/libs/ardour/monitor_processor.cc
@@ -226,7 +226,7 @@ MonitorProcessor::set_state (const XMLNode& node, int version)
 XMLNode&
 MonitorProcessor::state (bool full)
 {
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
         XMLNode& node (Processor::state (full));
         char buf[64];
 
diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc
index 606fc0ca00..3998159a2b 100644
--- a/libs/ardour/panner_shell.cc
+++ b/libs/ardour/panner_shell.cc
@@ -172,7 +172,7 @@ PannerShell::set_state (const XMLNode& node, int version)
 	XMLNodeList nlist = node.children ();
 	XMLNodeConstIterator niter;
 	XMLProperty const * prop;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	if ((prop = node.property (X_("bypassed"))) != 0) {
 		set_bypassed (string_is_affirmative (prop->value ()));
diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc
index 1ef7650ca9..58e60365b6 100644
--- a/libs/ardour/plugin.cc
+++ b/libs/ardour/plugin.cc
@@ -481,7 +481,7 @@ XMLNode &
 Plugin::get_state ()
 {
 	XMLNode* root = new XMLNode (state_node_name ());
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	root->add_property (X_("last-preset-uri"), _last_preset.uri);
 	root->add_property (X_("last-preset-label"), _last_preset.label);
diff --git a/libs/ardour/rc_configuration.cc b/libs/ardour/rc_configuration.cc
index 2abf3477fb..80c181374a 100644
--- a/libs/ardour/rc_configuration.cc
+++ b/libs/ardour/rc_configuration.cc
@@ -172,7 +172,7 @@ XMLNode&
 RCConfiguration::get_state ()
 {
 	XMLNode* root;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	root = new XMLNode("Ardour");
 
@@ -193,7 +193,7 @@ XMLNode&
 RCConfiguration::get_variables ()
 {
 	XMLNode* node;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	node = new XMLNode ("Config");
 
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
index bcc63af9d6..28cb9f0766 100644
--- a/libs/ardour/region.cc
+++ b/libs/ardour/region.cc
@@ -1158,7 +1158,7 @@ Region::state ()
 	XMLNode *node = new XMLNode ("Region");
 	char buf[64];
 	char buf2[64];
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 	const char* fe = NULL;
 
 	/* custom version of 'add_properties (*node);'
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc
index 6b2f9994f6..15bed9e0ed 100644
--- a/libs/ardour/route.cc
+++ b/libs/ardour/route.cc
@@ -3039,7 +3039,7 @@ Route::set_state (const XMLNode& node, int version)
 int
 Route::set_state_2X (const XMLNode& node, int version)
 {
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 	XMLNodeList nlist;
 	XMLNodeConstIterator niter;
 	XMLNode *child;
diff --git a/libs/ardour/session_configuration.cc b/libs/ardour/session_configuration.cc
index c8e09ad1b1..fa7d28d22d 100644
--- a/libs/ardour/session_configuration.cc
+++ b/libs/ardour/session_configuration.cc
@@ -54,7 +54,7 @@ XMLNode&
 SessionConfiguration::get_state ()
 {
 	XMLNode* root;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	root = new XMLNode ("Ardour");
 	root->add_child_nocopy (get_variables ());
@@ -67,7 +67,7 @@ XMLNode&
 SessionConfiguration::get_variables ()
 {
 	XMLNode* node;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	node = new XMLNode ("Config");
 
@@ -159,7 +159,7 @@ SessionConfiguration::load_state ()
 
 		XMLNode* node;
 		if (((node = find_named_node (root, X_("Config"))) != 0)) {
-			LocaleGuard lg (X_("C"));
+			LocaleGuard lg ();
 			set_variables(*node);
 			info << _("Loaded custom session defaults.") << endmsg;
 		} else {
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 4afac073fd..53b9d0fd3e 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -1002,7 +1002,7 @@ Session::load_state (string snapshot_name)
 int
 Session::load_options (const XMLNode& node)
 {
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 	config.set_variables (node);
 	return 0;
 }
diff --git a/libs/ardour/speakers.cc b/libs/ardour/speakers.cc
index 7abdaf3a42..b2f46fa069 100644
--- a/libs/ardour/speakers.cc
+++ b/libs/ardour/speakers.cc
@@ -245,7 +245,7 @@ Speakers::get_state ()
 {
         XMLNode* node = new XMLNode (X_("Speakers"));
         char buf[32];
-        LocaleGuard lg (X_("C"));
+        LocaleGuard lg ();
 
         for (vector<Speaker>::const_iterator i = _speakers.begin(); i != _speakers.end(); ++i) {
                 XMLNode* speaker = new XMLNode (X_("Speaker"));
@@ -269,7 +269,7 @@ Speakers::set_state (const XMLNode& node, int /*version*/)
         XMLNodeConstIterator i;
         XMLProperty const * prop;
         double a, e, d;
-        LocaleGuard lg (X_("C"));
+        LocaleGuard lg ();
         int n = 0;
 
         _speakers.clear ();
diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 31e2f9a611..1d5c3f898c 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -74,7 +74,7 @@ TempoSection::TempoSection (const XMLNode& node)
 {
 	XMLProperty const * prop;
 	BBT_Time start;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	if ((prop = node.property ("start")) == 0) {
 		error << _("TempoSection XML node has no \"start\" property") << endmsg;
@@ -133,7 +133,7 @@ TempoSection::get_state() const
 {
 	XMLNode *root = new XMLNode (xml_state_node_name);
 	char buf[256];
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	snprintf (buf, sizeof (buf), "%" PRIu32 "|%" PRIu32 "|%" PRIu32,
 		  start().bars,
@@ -196,7 +196,7 @@ MeterSection::MeterSection (const XMLNode& node)
 {
 	XMLProperty const * prop;
 	BBT_Time start;
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	if ((prop = node.property ("start")) == 0) {
 		error << _("MeterSection XML node has no \"start\" property") << endmsg;
@@ -250,7 +250,7 @@ MeterSection::get_state() const
 {
 	XMLNode *root = new XMLNode (xml_state_node_name);
 	char buf[256];
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	snprintf (buf, sizeof (buf), "%" PRIu32 "|%" PRIu32 "|%" PRIu32,
 		  start().bars,
diff --git a/libs/ardour/vst_plugin.cc b/libs/ardour/vst_plugin.cc
index 1afdc27b67..a395582f8f 100644
--- a/libs/ardour/vst_plugin.cc
+++ b/libs/ardour/vst_plugin.cc
@@ -160,7 +160,7 @@ VSTPlugin::set_chunk (gchar const * data, bool single)
 void
 VSTPlugin::add_state (XMLNode* root) const
 {
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 
 	if (_plugin->flags & 32 /* effFlagsProgramsChunks */) {
 
@@ -197,7 +197,7 @@ VSTPlugin::add_state (XMLNode* root) const
 int
 VSTPlugin::set_state (const XMLNode& node, int version)
 {
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 	int ret = -1;
 
 	if (node.name() != state_node_name()) {
diff --git a/libs/canvas/colors.cc b/libs/canvas/colors.cc
index 19c5226642..8a8d94eec7 100644
--- a/libs/canvas/colors.cc
+++ b/libs/canvas/colors.cc
@@ -596,7 +596,7 @@ SVAModifier::from_string (string const & str)
 string
 SVAModifier::to_string () const
 {
-	PBD::LocaleGuard lg ("C");
+	PBD::LocaleGuard lg ();
 	stringstream ss;
 
 	switch (type) {
diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc
index 2e4b169c53..f95ddcce2e 100644
--- a/libs/pbd/controllable.cc
+++ b/libs/pbd/controllable.cc
@@ -107,7 +107,7 @@ XMLNode&
 Controllable::get_state ()
 {
 	XMLNode* node = new XMLNode (xml_node_name);
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 	char buf[64];
 
 	/* Waves' "Pressure3" has a parameter called "µ-iness"
@@ -138,7 +138,7 @@ Controllable::get_state ()
 int
 Controllable::set_state (const XMLNode& node, int /*version*/)
 {
-	LocaleGuard lg (X_("C"));
+	LocaleGuard lg ();
 	const XMLProperty* prop;
 
 	Stateful::save_extra_xml (node);
diff --git a/libs/pbd/locale_guard.cc b/libs/pbd/locale_guard.cc
index f848cf33f8..8007ea001b 100644
--- a/libs/pbd/locale_guard.cc
+++ b/libs/pbd/locale_guard.cc
@@ -34,21 +34,9 @@ using namespace PBD;
  * and some plugin may change either behind our back.
  */
 
-LocaleGuard::LocaleGuard (const char*)
-	: old_c (0)
-{
-	init ();
-}
-
 LocaleGuard::LocaleGuard ()
 	: old_c (0)
 {
-	init ();
-}
-
-void
-LocaleGuard::init ()
-{
 	char* actual = setlocale (LC_NUMERIC, NULL);
 	if (strcmp ("C", actual)) {
 		/* purpose of LocaleGuard is to make sure we're using "C" for
diff --git a/libs/pbd/pbd/locale_guard.h b/libs/pbd/pbd/locale_guard.h
index 3d37562ced..3342603f20 100644
--- a/libs/pbd/pbd/locale_guard.h
+++ b/libs/pbd/pbd/locale_guard.h
@@ -29,11 +29,9 @@ namespace PBD {
 	struct LIBPBD_API LocaleGuard {
 		public:
 			LocaleGuard ();
-			LocaleGuard (const char*); // deprecated
 			~LocaleGuard ();
 
 		private:
-			void init ();
 			std::locale old_cpp;
 			char* old_c;
 	};