diff options
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/audio_diskstream.cc | 4 | ||||
-rw-r--r-- | libs/ardour/audio_track.cc | 2 | ||||
-rw-r--r-- | libs/ardour/audio_unit.cc | 4 | ||||
-rw-r--r-- | libs/ardour/audioregion.cc | 6 | ||||
-rw-r--r-- | libs/ardour/automation_list.cc | 4 | ||||
-rw-r--r-- | libs/ardour/diskstream.cc | 2 | ||||
-rw-r--r-- | libs/ardour/io.cc | 6 | ||||
-rw-r--r-- | libs/ardour/ladspa_plugin.cc | 6 | ||||
-rw-r--r-- | libs/ardour/luaproc.cc | 4 | ||||
-rw-r--r-- | libs/ardour/lv2_plugin.cc | 2 | ||||
-rw-r--r-- | libs/ardour/midi_diskstream.cc | 4 | ||||
-rw-r--r-- | libs/ardour/midi_track.cc | 2 | ||||
-rw-r--r-- | libs/ardour/monitor_processor.cc | 2 | ||||
-rw-r--r-- | libs/ardour/pannable.cc | 2 | ||||
-rw-r--r-- | libs/ardour/panner_shell.cc | 2 | ||||
-rw-r--r-- | libs/ardour/plugin.cc | 2 | ||||
-rw-r--r-- | libs/ardour/rc_configuration.cc | 4 | ||||
-rw-r--r-- | libs/ardour/region.cc | 2 | ||||
-rw-r--r-- | libs/ardour/route.cc | 4 | ||||
-rw-r--r-- | libs/ardour/session_configuration.cc | 6 | ||||
-rw-r--r-- | libs/ardour/session_state.cc | 4 | ||||
-rw-r--r-- | libs/ardour/speakers.cc | 4 | ||||
-rw-r--r-- | libs/ardour/tempo.cc | 8 | ||||
-rw-r--r-- | libs/ardour/vst_plugin.cc | 4 |
24 files changed, 46 insertions, 44 deletions
diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index 0a6a62017b..64d91b1ea8 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 (); + 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 (); + LocaleGuard lg; /* prevent write sources from being created */ diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 4a674527b9..254a3d7c6e 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 (); + 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 cd46f046cd..9fc9416ac5 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 (); + 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 (); + 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 44e238fb7e..60a6282181 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 (); + 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 (); + 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 (); + 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 7efe0f67c4..3bc3f7e3d8 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 (); + 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 (); + LocaleGuard lg; XMLNodeList nlist = node.children(); XMLNode* nsos; XMLNodeIterator niter; diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index d6ccf5c9ea..3b44c51dd4 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 (); + 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 a02739db44..9f880c5b91 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 (); + 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 (); + 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 (); + 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 ac9c227fba..787079198f 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 (); + 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 (); + 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 (); + 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 30b34f584b..afdf780204 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 (); + 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 (); + 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 cceb6020e9..f400791458 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 (); + LocaleGuard lg; for (uint32_t i = 0; i < parameter_count(); ++i) { if (parameter_is_input(i) && parameter_is_control(i)) { diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 35788e09aa..5baeb32263 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 (); + 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 (); + LocaleGuard lg; /* prevent write sources from being created */ diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index 9fdd80ac19..3d1d8d0093 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 (); + 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 df4f3d082f..c7a79ee2f5 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 (); + LocaleGuard lg; XMLNode& node (Processor::state (full)); char buf[64]; diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc index 0741c97573..70fe70c728 100644 --- a/libs/ardour/pannable.cc +++ b/libs/ardour/pannable.cc @@ -187,7 +187,7 @@ Pannable::get_state () XMLNode& Pannable::state (bool /*full*/) { - LocaleGuard lg (); + LocaleGuard lg; XMLNode* node = new XMLNode (X_("Pannable")); node->add_child_nocopy (pan_azimuth_control->get_state()); diff --git a/libs/ardour/panner_shell.cc b/libs/ardour/panner_shell.cc index 3998159a2b..b2099af9e4 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 (); + 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 58e60365b6..8c1dd81d26 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 (); + 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 80c181374a..f6366b5463 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 (); + LocaleGuard lg; root = new XMLNode("Ardour"); @@ -193,7 +193,7 @@ XMLNode& RCConfiguration::get_variables () { XMLNode* node; - LocaleGuard lg (); + LocaleGuard lg; node = new XMLNode ("Config"); diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 28cb9f0766..ee666e51f0 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 (); + 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 b53dedaacf..79799ce807 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -2704,7 +2704,7 @@ Route::get_template() XMLNode& Route::state(bool full_state) { - LocaleGuard lg (); + LocaleGuard lg; if (!_session._template_state_dir.empty()) { assert (!full_state); // only for templates foreach_processor (sigc::bind (sigc::mem_fun (*this, &Route::set_plugin_state_dir), _session._template_state_dir)); @@ -3040,7 +3040,7 @@ Route::set_state (const XMLNode& node, int version) int Route::set_state_2X (const XMLNode& node, int version) { - LocaleGuard lg (); + LocaleGuard lg; XMLNodeList nlist; XMLNodeConstIterator niter; XMLNode *child; diff --git a/libs/ardour/session_configuration.cc b/libs/ardour/session_configuration.cc index fa7d28d22d..2744831643 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 (); + LocaleGuard lg; root = new XMLNode ("Ardour"); root->add_child_nocopy (get_variables ()); @@ -67,7 +67,7 @@ XMLNode& SessionConfiguration::get_variables () { XMLNode* node; - LocaleGuard lg (); + 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 (); + 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 ca94008f28..adffb5cbee 100644 --- a/libs/ardour/session_state.cc +++ b/libs/ardour/session_state.cc @@ -759,6 +759,8 @@ Session::remove_state (string snapshot_name) int Session::save_state (string snapshot_name, bool pending, bool switch_to_snapshot, bool template_only) { + DEBUG_TRACE (DEBUG::Locale, string_compose ("Session::save_state locale '%1'\n", setlocale (LC_NUMERIC, NULL))); + XMLTree tree; std::string xml_path(_session_dir->root_path()); @@ -1002,7 +1004,7 @@ Session::load_state (string snapshot_name) int Session::load_options (const XMLNode& node) { - LocaleGuard lg (); + LocaleGuard lg; config.set_variables (node); return 0; } diff --git a/libs/ardour/speakers.cc b/libs/ardour/speakers.cc index b2f46fa069..98fe63d587 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 (); + 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 (); + LocaleGuard lg; int n = 0; _speakers.clear (); diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 1d5c3f898c..445fc7bab3 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 (); + 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 (); + 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 (); + 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 (); + 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 a395582f8f..9782c70ab7 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 (); + 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 (); + LocaleGuard lg; int ret = -1; if (node.name() != state_node_name()) { |