X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_profile_manager.cc;h=8d1eb81edbbb1cebd62c9fe05976a4aa4e7b3aa5;hb=baa00942a20856cf332f547086ed5ebd2ff9078e;hp=e94486bd465b701f32fabcb59ae9a9b0fbf1bb3e;hpb=22b07e0233a29d9633ffa825a79503befaf2e16e;p=ardour.git diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc index e94486bd46..8d1eb81edb 100644 --- a/libs/ardour/export_profile_manager.cc +++ b/libs/ardour/export_profile_manager.cc @@ -23,14 +23,14 @@ #include #include -#include +#include "pbd/gstdio_compat.h" #include #include #include "pbd/enumwriter.h" +#include "pbd/enum_convert.h" #include "pbd/xml++.h" -#include "pbd/convert.h" #include "ardour/export_profile_manager.h" #include "ardour/export_format_specification.h" @@ -48,7 +48,11 @@ #include "ardour/session.h" #include "ardour/broadcast_info.h" -#include "i18n.h" +#include "pbd/i18n.h" + +namespace PBD { + DEFINE_ENUM_CONVERT(ARDOUR::ExportProfileManager::TimeFormat); +} using namespace std; using namespace Glib; @@ -58,7 +62,7 @@ namespace ARDOUR { ExportProfileManager::ExportProfileManager (Session & s, ExportType type) - : type(type) + : _type(type) , handler (s.get_export_handler()) , session (s) @@ -162,7 +166,7 @@ ExportProfileManager::prepare_for_export () } // ...and each channel config - filename->include_channel_config = (type == StemExport) || + filename->include_channel_config = (_type == StemExport) || (channel_configs.size() > 1); for(ChannelConfigStateList::iterator cc_it = channel_configs.begin(); cc_it != channel_configs.end(); ++cc_it) { handler->add_export_config (*ts_it, (*cc_it)->config, (*format_it)->format, filename, b); @@ -180,9 +184,14 @@ ExportProfileManager::load_preset (ExportPresetPtr preset) if (!preset) { return false; } XMLNode const * state; + /* local state is saved in instant.xml and contains timespan + * and channel config for per session. + * It may not be present for a given preset/session combination + * and is never preset for system-wide presets, but that's OK. + */ if ((state = preset->get_local_state())) { set_local_state (*state); - } else { ok = false; } + } if ((state = preset->get_global_state())) { if (!set_global_state (*state)) { @@ -344,7 +353,7 @@ ExportProfileManager::find_file (std::string const & pattern) } void -ExportProfileManager::set_selection_range (framepos_t start, framepos_t end) +ExportProfileManager::set_selection_range (samplepos_t start, samplepos_t end) { if (start || end) { @@ -361,7 +370,7 @@ ExportProfileManager::set_selection_range (framepos_t start, framepos_t end) } std::string -ExportProfileManager::set_single_range (framepos_t start, framepos_t end, string name) +ExportProfileManager::set_single_range (samplepos_t start, samplepos_t end, string name) { single_range_mode = true; @@ -418,14 +427,14 @@ ExportProfileManager::TimespanStatePtr 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) { - 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) { @@ -445,9 +454,7 @@ ExportProfileManager::deserialize_timespan (XMLNode & root) 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(); @@ -465,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"))) { - 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; } @@ -584,9 +591,9 @@ ExportProfileManager::save_format_to_disk (ExportFormatSpecPtr format) string new_name = format->name(); new_name += export_format_suffix; - /* make sure its legal for the filesystem */ + /* make sure its legal for the filesystem */ - new_name = legalize_for_path (new_name); + new_name = legalize_for_path (new_name); std::string new_path = Glib::build_filename (export_config_dir, new_name); @@ -628,7 +635,6 @@ ExportProfileManager::save_format_to_disk (ExportFormatSpecPtr format) tree.write(); } - FormatListChanged (); return new_path; } @@ -701,7 +707,7 @@ ExportProfileManager::init_formats (XMLNodeList nodes) ExportProfileManager::FormatStatePtr ExportProfileManager::deserialize_format (XMLNode & root) { - XMLProperty * prop; + XMLProperty const * prop; PBD::UUID id; if ((prop = root.property ("id"))) { @@ -723,7 +729,7 @@ ExportProfileManager::serialize_format (FormatStatePtr state) 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; } @@ -873,10 +879,9 @@ ExportProfileManager::get_warnings () void ExportProfileManager::check_config (boost::shared_ptr warnings, - TimespanStatePtr timespan_state, - ChannelConfigStatePtr channel_config_state, - FormatStatePtr format_state, - FilenameStatePtr filename_state) + TimespanStatePtr timespan_state, + ChannelConfigStatePtr channel_config_state, + FormatStatePtr format_state, FilenameStatePtr filename_state) { TimespanListPtr timespans = timespan_state->timespans; ExportChannelConfigPtr channel_config = channel_config_state->config;