ardour/livetrax
13
0
Fork 0
Code

Use PBD::string_to/to_string when de/serializing in AutomationList class

Browse Source 
This avoids requiring a LocaleGuard to get the correct numeric formatting and
saves/restores the automation data to the precision required for roundtrip
equality.
This commit is contained in:
Tim Mayberry 2016-09-08 10:19:12 +10:00
parent c65f30b4b1
commit ca7bbea6d8
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/ardour/automation_list.cc
View File

@ -347,12 +347,10 @@ AutomationList::serialize_events ()
XMLNode* node = new XMLNode (X_("events"));
stringstream str;
str.precision(15); //10 digits is enough digits for 24 hours at 96kHz
for (iterator xx = _events.begin(); xx != _events.end(); ++xx) {
str << (double) (*xx)->when;
str << PBD::to_string ((*xx)->when);
str << ' ';
str <<(double) (*xx)->value;
str << PBD::to_string ((*xx)->value);
str << '\n';
}
@ -384,17 +382,19 @@ AutomationList::deserialize_events (const XMLNode& node)
stringstream str (content_node->content());
std::string x_str;
std::string y_str;
double x;
double y;
bool ok = true;
while (str) {
str >> x;
if (!str) {
str >> x_str;
if (!str || !PBD::string_to<double> (x_str, x)) {
break;
}
str >> y;
if (!str) {
str >> y_str;
if (!str || !PBD::string_to<double> (y_str, y)) {
ok = false;
break;
}