use C locale, because POSIX locale is not supported on windows, and operation is undefined. C works on all platforms

This commit is contained in:
Ben Loftis 2015-01-19 07:29:25 -06:00
parent 8900d7d9ea
commit d2fa2450aa
25 changed files with 51 additions and 51 deletions

View file

@ -240,7 +240,7 @@ int
UIConfiguration::store_color_theme ()
{
XMLNode* root;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
root = new XMLNode("Ardour");
@ -375,7 +375,7 @@ XMLNode&
UIConfiguration::get_state ()
{
XMLNode* root;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
root = new XMLNode("Ardour");
@ -393,7 +393,7 @@ XMLNode&
UIConfiguration::get_variables (std::string which_node)
{
XMLNode* node;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
node = new XMLNode (which_node);
@ -506,7 +506,7 @@ UIConfiguration::load_colors (XMLNode const & node)
void
UIConfiguration::load_modifiers (XMLNode const & node)
{
PBD::LocaleGuard lg ("POSIX");
PBD::LocaleGuard lg ("C");
XMLNodeList const nlist = node.children();
XMLNodeConstIterator niter;
XMLProperty const *name;

View file

@ -85,7 +85,7 @@ VideoTimeLine::save_session ()
return;
}
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
XMLNode* node = new XMLNode(X_("Videomonitor"));
if (!node) return;
@ -143,7 +143,7 @@ VideoTimeLine::set_session (ARDOUR::Session *s)
if (!_session) { return ; }
_session->SaveSession.connect_same_thread (sessionsave, boost::bind (&VideoTimeLine::save_session, this));
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
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_("POSIX"));
LocaleGuard lg (X_("C"));
const XMLProperty* 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_("POSIX"));
LocaleGuard lg (X_("C"));
node->add_property (X_("VideoOffset"), video_offset_p);
return *node;
}

View file

@ -1805,7 +1805,7 @@ AudioDiskstream::get_state ()
{
XMLNode& node (Diskstream::get_state());
char buf[64] = "";
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
boost::shared_ptr<ChannelList> c = channels.reader();
snprintf (buf, sizeof(buf), "%u", (unsigned int) c->size());
@ -1847,7 +1847,7 @@ AudioDiskstream::set_state (const XMLNode& node, int version)
XMLNodeIterator niter;
uint32_t nchans = 1;
XMLNode* capture_pending_node = 0;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
/* prevent write sources from being created */

View file

@ -244,7 +244,7 @@ AudioTrack::set_state_part_two ()
{
XMLNode* fnode;
XMLProperty* prop;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
/* This is called after all session state has been restored but before
have been made ports and connections are established.

View file

@ -1683,7 +1683,7 @@ AUPlugin::parameter_is_output (uint32_t) const
void
AUPlugin::add_state (XMLNode* root) const
{
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
CFDataRef xmlData;
CFPropertyListRef propertyList;
@ -1722,7 +1722,7 @@ AUPlugin::set_state(const XMLNode& node, int version)
{
int ret = -1;
CFPropertyListRef propertyList;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
if (node.name() != state_node_name()) {
error << _("Bad node sent to AUPlugin::set_state") << endmsg;

View file

@ -768,7 +768,7 @@ AudioRegion::get_basic_state ()
{
XMLNode& node (Region::state ());
char buf[64];
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
snprintf (buf, sizeof (buf), "%u", (uint32_t) _sources.size());
node.add_property ("channels", buf);
@ -781,7 +781,7 @@ AudioRegion::state ()
{
XMLNode& node (get_basic_state());
XMLNode *child;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
child = node.add_child ("Envelope");
@ -838,7 +838,7 @@ AudioRegion::_set_state (const XMLNode& node, int version, PropertyChange& what_
{
const XMLNodeList& nlist = node.children();
const XMLProperty *prop;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
boost::shared_ptr<Playlist> the_playlist (_playlist.lock());
suspend_property_changes ();

View file

@ -253,7 +253,7 @@ AutomationList::state (bool full)
{
XMLNode* root = new XMLNode (X_("AutomationList"));
char buf[64];
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
root->add_property ("automation-id", EventTypeMap::instance().to_symbol(_parameter));
@ -367,7 +367,7 @@ AutomationList::deserialize_events (const XMLNode& node)
int
AutomationList::set_state (const XMLNode& node, int version)
{
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
XMLNodeList nlist = node.children();
XMLNode* nsos;
XMLNodeIterator niter;

View file

@ -462,7 +462,7 @@ Diskstream::get_state ()
{
XMLNode* node = new XMLNode ("Diskstream");
char buf[64];
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
node->add_property ("flags", enum_2_string (_flags));
node->add_property ("playlist", _playlist->name());

View file

@ -527,7 +527,7 @@ IO::state (bool /*full_state*/)
string str;
vector<string>::iterator ci;
int n;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
Glib::Threads::Mutex::Lock lm (io_lock);
node->add_property("name", _name);
@ -588,7 +588,7 @@ IO::set_state (const XMLNode& node, int version)
const XMLProperty* prop;
XMLNodeConstIterator iter;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
/* force use of non-localized representation of decimal point,
since we use it a lot in XML files and so forth.
@ -644,7 +644,7 @@ IO::set_state_2X (const XMLNode& node, int version, bool in)
{
const XMLProperty* prop;
XMLNodeConstIterator iter;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
/* force use of non-localized representation of decimal point,
since we use it a lot in XML files and so forth.

View file

@ -351,7 +351,7 @@ LadspaPlugin::add_state (XMLNode* root) const
{
XMLNode *child;
char buf[16];
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
for (uint32_t i = 0; i < parameter_count(); ++i){
@ -384,7 +384,7 @@ LadspaPlugin::set_state (const XMLNode& node, int version)
const char *data;
uint32_t port_id;
#endif
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
if (node.name() != state_node_name()) {
error << _("Bad node sent to LadspaPlugin::set_state") << endmsg;
@ -434,7 +434,7 @@ LadspaPlugin::set_state_2X (const XMLNode& node, int /* version */)
const char *data;
uint32_t port_id;
#endif
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
if (node.name() != state_node_name()) {
error << _("Bad node sent to LadspaPlugin::set_state") << endmsg;

View file

@ -914,7 +914,7 @@ LV2Plugin::add_state(XMLNode* root) const
XMLNode* child;
char buf[16];
LocaleGuard lg(X_("POSIX"));
LocaleGuard lg(X_("C"));
for (uint32_t i = 0; i < parameter_count(); ++i) {
if (parameter_is_input(i) && parameter_is_control(i)) {
@ -1529,7 +1529,7 @@ LV2Plugin::set_state(const XMLNode& node, int version)
const char* sym;
const char* value;
uint32_t port_id;
LocaleGuard lg(X_("POSIX"));
LocaleGuard lg(X_("C"));
if (node.name() != state_node_name()) {
error << _("Bad node sent to LV2Plugin::set_state") << endmsg;

View file

@ -1165,7 +1165,7 @@ MidiDiskstream::get_state ()
{
XMLNode& node (Diskstream::get_state());
char buf[64];
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
if (_write_source && _session.get_record_enabled()) {
@ -1199,7 +1199,7 @@ MidiDiskstream::set_state (const XMLNode& node, int version)
XMLNodeList nlist = node.children();
XMLNodeIterator niter;
XMLNode* capture_pending_node = 0;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
/* prevent write sources from being created */

View file

@ -258,7 +258,7 @@ MidiTrack::set_state_part_two ()
{
XMLNode* fnode;
XMLProperty* prop;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
/* This is called after all session state has been restored but before
have been made ports and connections are established.

View file

@ -224,7 +224,7 @@ MonitorProcessor::set_state (const XMLNode& node, int version)
XMLNode&
MonitorProcessor::state (bool full)
{
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
XMLNode& node (Processor::state (full));
char buf[64];

View file

@ -172,7 +172,7 @@ PannerShell::set_state (const XMLNode& node, int version)
XMLNodeList nlist = node.children ();
XMLNodeConstIterator niter;
const XMLProperty *prop;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
if ((prop = node.property (X_("bypassed"))) != 0) {
set_bypassed (string_is_affirmative (prop->value ()));

View file

@ -389,7 +389,7 @@ XMLNode &
Plugin::get_state ()
{
XMLNode* root = new XMLNode (state_node_name ());
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
root->add_property (X_("last-preset-uri"), _last_preset.uri);
root->add_property (X_("last-preset-label"), _last_preset.label);

View file

@ -171,7 +171,7 @@ XMLNode&
RCConfiguration::get_state ()
{
XMLNode* root;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
root = new XMLNode("Ardour");
@ -192,7 +192,7 @@ XMLNode&
RCConfiguration::get_variables ()
{
XMLNode* node;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
node = new XMLNode ("Config");

View file

@ -1138,7 +1138,7 @@ Region::state ()
XMLNode *node = new XMLNode ("Region");
char buf[64];
char buf2[64];
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
const char* fe = NULL;
/* custom version of 'add_properties (*node);'

View file

@ -54,7 +54,7 @@ XMLNode&
SessionConfiguration::get_state ()
{
XMLNode* root;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
root = new XMLNode ("Ardour");
root->add_child_nocopy (get_variables ());
@ -67,7 +67,7 @@ XMLNode&
SessionConfiguration::get_variables ()
{
XMLNode* node;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
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_("POSIX"));
LocaleGuard lg (X_("C"));
set_variables(*node);
info << _("Loaded custom session defaults.") << endmsg;
} else {

View file

@ -880,7 +880,7 @@ Session::load_state (string snapshot_name)
int
Session::load_options (const XMLNode& node)
{
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
config.set_variables (node);
return 0;
}

View file

@ -245,7 +245,7 @@ Speakers::get_state ()
{
XMLNode* node = new XMLNode (X_("Speakers"));
char buf[32];
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
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;
const XMLProperty* prop;
double a, e, d;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
int n = 0;
_speakers.clear ();

View file

@ -73,7 +73,7 @@ TempoSection::TempoSection (const XMLNode& node)
{
const XMLProperty *prop;
BBT_Time start;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
if ((prop = node.property ("start")) == 0) {
error << _("TempoSection XML node has no \"start\" property") << endmsg;
@ -132,7 +132,7 @@ TempoSection::get_state() const
{
XMLNode *root = new XMLNode (xml_state_node_name);
char buf[256];
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
snprintf (buf, sizeof (buf), "%" PRIu32 "|%" PRIu32 "|%" PRIu32,
start().bars,
@ -195,7 +195,7 @@ MeterSection::MeterSection (const XMLNode& node)
{
const XMLProperty *prop;
BBT_Time start;
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
if ((prop = node.property ("start")) == 0) {
error << _("MeterSection XML node has no \"start\" property") << endmsg;
@ -249,7 +249,7 @@ MeterSection::get_state() const
{
XMLNode *root = new XMLNode (xml_state_node_name);
char buf[256];
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
snprintf (buf, sizeof (buf), "%" PRIu32 "|%" PRIu32 "|%" PRIu32,
start().bars,

View file

@ -158,7 +158,7 @@ VSTPlugin::set_chunk (gchar const * data, bool single)
void
VSTPlugin::add_state (XMLNode* root) const
{
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
if (_plugin->flags & 32 /* effFlagsProgramsChunks */) {
@ -195,7 +195,7 @@ VSTPlugin::add_state (XMLNode* root) const
int
VSTPlugin::set_state (const XMLNode& node, int version)
{
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
int ret = -1;
if (node.name() != state_node_name()) {

View file

@ -596,7 +596,7 @@ SVAModifier::from_string (string const & str)
string
SVAModifier::to_string () const
{
PBD::LocaleGuard lg ("POSIX");
PBD::LocaleGuard lg ("C");
stringstream ss;
switch (type) {

View file

@ -107,7 +107,7 @@ XMLNode&
Controllable::get_state ()
{
XMLNode* node = new XMLNode (xml_node_name);
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
char buf[64];
node->add_property (X_("name"), _name); // not reloaded from XML state, just there to look at
@ -128,7 +128,7 @@ Controllable::get_state ()
int
Controllable::set_state (const XMLNode& node, int /*version*/)
{
LocaleGuard lg (X_("POSIX"));
LocaleGuard lg (X_("C"));
const XMLProperty* prop;
Stateful::save_extra_xml (node);