X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fexport_profile_manager.cc;h=8af3bdea3b38ba8d4350874cbd6b18159b9ba6d5;hb=76036ae0f369ea76aaa47bb43e41af450114f190;hp=7ff4282c74bcdea5ee64ff28ce57313689cda6bc;hpb=3020b224fa2d6e1b6b8a576e8e8e211e0585f2a2;p=ardour.git diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc index 7ff4282c74..8af3bdea3b 100644 --- a/libs/ardour/export_profile_manager.cc +++ b/libs/ardour/export_profile_manager.cc @@ -23,18 +23,18 @@ #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" -#include "ardour/export_formats_search_path.h" +#include "ardour/search_paths.h" #include "ardour/export_timespan.h" #include "ardour/export_channel_configuration.h" #include "ardour/export_filename.h" @@ -43,11 +43,16 @@ #include "ardour/export_failed.h" #include "ardour/directory_names.h" #include "ardour/filename_extensions.h" +#include "ardour/profile.h" #include "ardour/route.h" #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; @@ -57,7 +62,7 @@ namespace ARDOUR { ExportProfileManager::ExportProfileManager (Session & s, ExportType type) - : type(type) + : _type(type) , handler (s.get_export_handler()) , session (s) @@ -114,17 +119,22 @@ ExportProfileManager::ExportProfileManager (Session & s, ExportType type) ExportProfileManager::~ExportProfileManager () { - XMLNode * instant_xml (new XMLNode (xml_node_name)); - serialize_profile (*instant_xml); - session.add_instant_xml (*instant_xml, false); + XMLNode * extra_xml (new XMLNode (xml_node_name)); + serialize_profile (*extra_xml); + session.add_extra_xml (*extra_xml); } void ExportProfileManager::load_profile () { - XMLNode * instant_node = session.instant_xml (xml_node_name); - if (instant_node) { - set_state (*instant_node); + XMLNode * extra_node = session.extra_xml (xml_node_name); + /* Legacy sessions used Session instant.xml for this */ + if (!extra_node) { + extra_node = session.instant_xml (xml_node_name); + } + + if (extra_node) { + set_state (*extra_node); } else { XMLNode empty_node (xml_node_name); set_state (empty_node); @@ -156,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); @@ -174,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)) { @@ -332,8 +347,7 @@ ExportProfileManager::find_file (std::string const & pattern) { vector found; - Glib::PatternSpec pattern_spec (pattern); - find_matching_files_in_search_path (search_path, pattern_spec, found); + find_files_matching_pattern (found, search_path, pattern); return found; } @@ -388,7 +402,14 @@ ExportProfileManager::init_timespans (XMLNodeList nodes) timespans.push_back (state); // Add session as default selection - Location * session_range = session.locations()->session_range_location(); + Location * session_range; + + if (Profile->get_trx()) { + session_range = (session.get_play_loop () ? session.locations()->auto_loop_location () : session.locations()->session_range_location()); + } else { + session_range = session.locations()->session_range_location(); + } + if (!session_range) { return false; } ExportTimespanPtr timespan = handler->add_timespan(); @@ -406,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) { @@ -433,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(); @@ -453,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; } @@ -471,11 +490,15 @@ ExportProfileManager::update_ranges () { return; } - /* Session */ - Location * session_range = session.locations()->session_range_location(); - if (session_range) { - ranges->push_back (session_range); + /* Loop */ + if (session.locations()->auto_loop_location ()) { + ranges->push_back (session.locations()->auto_loop_location ()); + } + + /* Session */ + if (session.locations()->session_range_location()) { + ranges->push_back (session.locations()->session_range_location()); } /* Selection */ @@ -568,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); @@ -612,7 +635,6 @@ ExportProfileManager::save_format_to_disk (ExportFormatSpecPtr format) tree.write(); } - FormatListChanged (); return new_path; } @@ -644,6 +666,7 @@ ExportProfileManager::get_new_format (ExportFormatSpecPtr original) ExportFormatSpecPtr format; if (original) { format.reset (new ExportFormatSpecification (*original)); + std::cerr << "After new format created from original, format has id [" << format->id().to_s() << ']' << std::endl; } else { format = handler->add_format(); format->set_name (_("empty format")); @@ -684,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"))) { @@ -706,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; } @@ -724,8 +747,20 @@ ExportProfileManager::load_formats () void ExportProfileManager::load_format_from_disk (std::string const & path) { - XMLTree const tree (path); - ExportFormatSpecPtr format = handler->add_format (*tree.root()); + XMLTree tree; + + if (!tree.read (path)) { + error << string_compose (_("Cannot load export format from %1"), path) << endmsg; + return; + } + + XMLNode* root = tree.root(); + if (!root) { + error << string_compose (_("Cannot export format read from %1"), path) << endmsg; + return; + } + + ExportFormatSpecPtr format = handler->add_format (*root); /* Handle id to filename mapping and don't add duplicates to list */ @@ -760,7 +795,7 @@ std::string ExportProfileManager::get_sample_filename_for_format (ExportFilenamePtr filename, ExportFormatSpecPtr format) { assert (format); - + if (channel_configs.empty()) { return ""; } std::list filenames; @@ -800,7 +835,7 @@ ExportProfileManager::get_warnings () if (!channel_configs.empty ()) { channel_config_state = channel_configs.front(); } - + TimespanStatePtr timespan_state = timespans.front(); /*** Check "global" config ***/ @@ -838,16 +873,15 @@ ExportProfileManager::get_warnings () check_config (warnings, timespan_state, channel_config_state, *format_it, *filename_it); } } - + return 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;