ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

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

This commit is contained in:
Robin Gareus 2016-05-05 21:49:56 +02:00
parent 2624c0966b
commit 3dc7728038
33 changed files with 60 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/engine_dialog.cc
View File

@ -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;

4
gtk2_ardour/export_video_dialog.cc
View File

@ -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"));

2
gtk2_ardour/gain_meter.cc
View File

@ -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;
}

4
gtk2_ardour/luainstance.cc
View File

@ -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)());

8
gtk2_ardour/ui_config.cc
View File

@ -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;

8
gtk2_ardour/video_timeline.cc
View File

@ -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;
}

4
libs/ardour/audio_diskstream.cc
View File

@ -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 */

2
libs/ardour/audio_track.cc
View File

@ -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.

4
libs/ardour/audio_unit.cc
View File

@ -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;

6
libs/ardour/audioregion.cc
View File

@ -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 ();

4
libs/ardour/automation_list.cc
View File

@ -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;

2
libs/ardour/diskstream.cc
View File

@ -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());

6
libs/ardour/io.cc
View File

@ -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.

6
libs/ardour/ladspa_plugin.cc
View File

@ -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;

4
libs/ardour/luaproc.cc
View File

@ -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)) {

4
libs/ardour/lv2_plugin.cc
View File

@ -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;

4
libs/ardour/midi_diskstream.cc
View File

@ -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 */

2
libs/ardour/midi_track.cc
View File

@ -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.

2
libs/ardour/monitor_processor.cc
View File

@ -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];

2
libs/ardour/panner_shell.cc
View File

@ -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 ()));

2
libs/ardour/plugin.cc
View File

@ -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);

4
libs/ardour/rc_configuration.cc
View File

@ -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");

2
libs/ardour/region.cc
View File

@ -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);'

2
libs/ardour/route.cc
View File

@ -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;

6
libs/ardour/session_configuration.cc
View File

@ -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 {

2
libs/ardour/session_state.cc
View File

@ -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;
}

4
libs/ardour/speakers.cc
View File

@ -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 ();

8
libs/ardour/tempo.cc
View File

@ -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,

4
libs/ardour/vst_plugin.cc
View File

@ -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()) {

2
libs/canvas/colors.cc
View File

@ -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) {

4
libs/pbd/controllable.cc
View File

@ -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);

12
libs/pbd/locale_guard.cc
View File

@ -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)) {

2
libs/pbd/pbd/locale_guard.h
View File

@ -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;
};