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

diff --git a/gtk2_ardour/engine_dialog.cc b/gtk2_ardour/engine_dialog.cc
index cc85bda8783e5b7a028a6b79be32e18ffbb51a92..6f6d31ff182b3ab044953679c23a47667f471d85 100644 (file)
--- 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 (X_("C"));
+       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 fc7c3d52be9a04868d7194ff1317acab5e007c1f..7d7e14505f0eb648386f79d6f59ac5d6e2b0f8a6 100644 (file)
--- 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 (X_("C"));
+       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 (X_("C"));
+       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 2abd9d3642306a66c378cbce9073f1d0599b9dbc..e06f2b024c9a1c6bdbc27feaea5374c7167539fd 100644 (file)
--- 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 0519aec1ecd51eadaf064b55aa6917b9d1692134..a49733d5eafb094f5040f81c6360b87b548a0a42 100644 (file)
--- 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 (X_("C"));
+       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 (X_("C"));
+       LocaleGuard lg ();
        std::string saved;
        {
                luabridge::LuaRef savedstate ((*_lua_save)());

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 931030180cf8ff29be04e3651be120881689f446..354539b57b07cadfe446a7299bea55171b5b617e 100644 (file)
--- 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 (X_("C"));
+       LocaleGuard lg ();
 
        root = new XMLNode("Ardour");
 
@@ -443,7 +443,7 @@ XMLNode&
 UIConfiguration::get_state ()
 {
        XMLNode* root;
-       LocaleGuard lg (X_("C"));
+       LocaleGuard lg ();
 
        root = new XMLNode("Ardour");
 
@@ -461,7 +461,7 @@ XMLNode&
 UIConfiguration::get_variables (std::string which_node)
 {
        XMLNode* node;
-       LocaleGuard lg (X_("C"));
+       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 ("C");
+       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 53336fa507bdbd7ef368ade7047a1c5381ce2fcd..43450d07a6f03f83e89df01471bb6d9526d2a91a 100644 (file)
--- a/gtk2_ardour/video_timeline.cc
+++ b/gtk2_ardour/video_timeline.cc
@@ -85,7 +85,7 @@ VideoTimeLine::save_session ()
                return;
        }
 
-       LocaleGuard lg (X_("C"));
+       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 (X_("C"));
+       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 (X_("C"));
+       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 (X_("C"));
+       LocaleGuard lg ();
        node->add_property (X_("VideoOffset"), video_offset_p);
        return *node;
 }

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 7a50934630f92d91f6fba9209788087cdb570c75..0a6a62017b8975bbf4890eadb86d2f3cb6ec63d0 100644 (file)
--- 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 661469e01e6aba5e0a0a5d010de2b333349068df..4a674527b9091d58123fd3562976f80f916e8612 100644 (file)
--- 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 c2c377eb5eb847c39e7e438236fb1d0cb8f00b2e..cd46f046cdc7b0a0802e621c968bf8aded1765be 100644 (file)
--- 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 987a226c7633f6d5c12a0fc59c249509e5a7040f..44e238fb7ef736caae9be50d3c41ced2a1492840 100644 (file)
--- 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 21825612fad8487ff9822baae28b86c2b8dc89b2..7efe0f67c45a2bf072a0429476929446d17263e1 100644 (file)
--- 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 1e5cc0c7c189e9055868ceba30158224c9633e3b..d6ccf5c9eabde488e73aa16ec788b63ca8105490 100644 (file)
--- 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 642b2a04351403ab8ef1e6c5ea2dba7f2cf91527..a02739db445a224614e3a1d6b3ae852be2fa505c 100644 (file)
--- 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 a80c2797c6b0083435bc0b325eb2b5e0e178f2d9..ac9c227fba3d7aec3fd79142116e920daf761f3e 100644 (file)
--- 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 1ab93e4d15db6ad81f4fecfebd0bb1f933b1c562..30b34f584b84fed6f3ee696037fe83b05ade8ffd 100644 (file)
--- 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 908b6b49f973b159d09516ae9acf34ab468f4d79..cceb6020e9c330d1cd384d7e4db74b7c5b48a4d2 100644 (file)
--- 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 485967b2a3ad3b5cea3edd1222117de6502e480b..35788e09aa75e01ae4eb77910973135fb0c6c01f 100644 (file)
--- 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 3aba6bf39ec6ea5aaf91355703e3213773d211b5..9fdd80ac19e20888d2c51cd96acf97626d924590 100644 (file)
--- 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 e8585c8da2ee00f18d2c42a353f7418b94f7a5d8..df4f3d082f4559ad8830b2a67ef13825e3a8e7c9 100644 (file)
--- 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 606fc0ca00ff67ea8dab18eff5cb945b06f3121e..3998159a2b61d885caf223f6b1f088c5106f16b3 100644 (file)
--- 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 1ef7650ca9c8e496529b631b64ad50d716226851..58e60365b667994af197a537c2db697aa8de9773 100644 (file)
--- 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 2abf3477fb58a63147f58e2e311218790b9a73f0..80c181374af058ed8cf4db865e8e348ac256655f 100644 (file)
--- 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 bcc63af9d6cef78d276c1fe3e8702fe81ea36a68..28cb9f0766fb23e31b56f3cd34d4416a9a215587 100644 (file)
--- 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 6b2f9994f6e358b099999a2ef5dc3c621a953c5e..15bed9e0eda1cd0ec2220f60f952c28c554da4ce 100644 (file)
--- 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 c8e09ad1b1e7d1de176a1fded98a9b11c9e77002..fa7d28d22d90fbf343e0d85bc3507b7d6ef6aaaf 100644 (file)
--- 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 4afac073fdaee1d77cdf8df1444a366a25c75395..53b9d0fd3ecc764e74bce41626e3b5e787a65b9f 100644 (file)
--- 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 7abdaf3a42f9a696bb4c2e93ada05d452326fe37..b2f46fa0693afc5cd8c52db8a8903c82d0ab33c1 100644 (file)
--- 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 31e2f9a6117737ac9b9d73a3158867308c2d71f4..1d5c3f898c923fa82c5211af1a31629e4b399299 100644 (file)
--- 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 1afdc27b670123bfb5e9bdd6cf381f24379bdb89..a395582f8fad08d60e2042014fb791883ddaffd9 100644 (file)
--- 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 19c522664297276a6940e815f0b79469c157f56b..8a8d94eec7222ee26521ed08d7189c5cb5e7d1ce 100644 (file)
--- 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 2e4b169c5302fd836ca509c8714934527eb2eda8..f95ddcce2ef1b32e9a23f7ffd7c026092e1872ab 100644 (file)
--- 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 f848cf33f8b12f3abd1270712937f551cbb5ae50..8007ea001b60c7fcd9b7d24f07ad559146d6b400 100644 (file)
--- a/libs/pbd/locale_guard.cc
+++ b/libs/pbd/locale_guard.cc
@@ -34,20 +34,8 @@ 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)) {

diff --git a/libs/pbd/pbd/locale_guard.h b/libs/pbd/pbd/locale_guard.h
index 3d37562cedf41925114b2df8fd3e225d012c87ce..3342603f2061644830af2b33db9b41b2609d63ab 100644 (file)
--- 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;
        };