projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix unit-test data (XML attributes changed)
[ardour.git]
/
libs
/
ardour
/
export_profile_manager.cc
diff --git
a/libs/ardour/export_profile_manager.cc
b/libs/ardour/export_profile_manager.cc
index 4eb2e62b0b294a07c39595045a21d3c7a2b36d0b..8af3bdea3b38ba8d4350874cbd6b18159b9ba6d5 100644
(file)
--- a/
libs/ardour/export_profile_manager.cc
+++ b/
libs/ardour/export_profile_manager.cc
@@
-29,8
+29,8
@@
#include <glibmm/miscutils.h>
#include "pbd/enumwriter.h"
#include <glibmm/miscutils.h>
#include "pbd/enumwriter.h"
+#include "pbd/enum_convert.h"
#include "pbd/xml++.h"
#include "pbd/xml++.h"
-#include "pbd/convert.h"
#include "ardour/export_profile_manager.h"
#include "ardour/export_format_specification.h"
#include "ardour/export_profile_manager.h"
#include "ardour/export_format_specification.h"
@@
-50,6
+50,10
@@
#include "pbd/i18n.h"
#include "pbd/i18n.h"
+namespace PBD {
+ DEFINE_ENUM_CONVERT(ARDOUR::ExportProfileManager::TimeFormat);
+}
+
using namespace std;
using namespace Glib;
using namespace PBD;
using namespace std;
using namespace Glib;
using namespace PBD;
@@
-423,14
+427,14
@@
ExportProfileManager::TimespanStatePtr
ExportProfileManager::deserialize_timespan (XMLNode & root)
{
TimespanStatePtr state (new TimespanState (selection_range, ranges));
ExportProfileManager::deserialize_timespan (XMLNode & root)
{
TimespanStatePtr state (new TimespanState (selection_range, ranges));
- XMLProperty const * prop;
XMLNodeList spans = root.children ("Range");
for (XMLNodeList::iterator node_it = spans.begin(); node_it != spans.end(); ++node_it) {
XMLNodeList spans = root.children ("Range");
for (XMLNodeList::iterator node_it = spans.begin(); node_it != spans.end(); ++node_it) {
- prop = (*node_it)->property ("id");
- if (!prop) { continue; }
- string id = prop->value();
+ std::string id;
+ if (!(*node_it)->get_property ("id", id)) {
+ continue;
+ }
Location * location = 0;
for (LocationList::iterator it = ranges->begin(); it != ranges->end(); ++it) {
Location * location = 0;
for (LocationList::iterator it = ranges->begin(); it != ranges->end(); ++it) {
@@
-450,9
+454,7
@@
ExportProfileManager::deserialize_timespan (XMLNode & root)
state->timespans->push_back (timespan);
}
state->timespans->push_back (timespan);
}
- if ((prop = root.property ("format"))) {
- state->time_format = (TimeFormat) string_2_enum (prop->value(), TimeFormat);
- }
+ root.get_property ("format", state->time_format);
if (state->timespans->empty()) {
return TimespanStatePtr();
if (state->timespans->empty()) {
return TimespanStatePtr();
@@
-470,11
+472,11
@@
ExportProfileManager::serialize_timespan (TimespanStatePtr state)
update_ranges ();
for (TimespanList::iterator it = state->timespans->begin(); it != state->timespans->end(); ++it) {
if ((span = root.add_child ("Range"))) {
update_ranges ();
for (TimespanList::iterator it = state->timespans->begin(); it != state->timespans->end(); ++it) {
if ((span = root.add_child ("Range"))) {
- span->
add
_property ("id", (*it)->range_id());
+ span->
set
_property ("id", (*it)->range_id());
}
}
}
}
- root.
add_property ("format", enum_2_string (state->time_format)
);
+ root.
set_property ("format", state->time_format
);
return root;
}
return root;
}
@@
-633,7
+635,6
@@
ExportProfileManager::save_format_to_disk (ExportFormatSpecPtr format)
tree.write();
}
tree.write();
}
- FormatListChanged ();
return new_path;
}
return new_path;
}
@@
-728,7
+729,7
@@
ExportProfileManager::serialize_format (FormatStatePtr state)
XMLNode * root = new XMLNode ("ExportFormat");
string id = state->format ? state->format->id().to_s() : "";
XMLNode * root = new XMLNode ("ExportFormat");
string id = state->format ? state->format->id().to_s() : "";
- root->
add
_property ("id", id);
+ root->
set
_property ("id", id);
return *root;
}
return *root;
}