X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=blobdiff_plain;f=libs%2Fardour%2Fexport_profile_manager.cc;h=be9cdd67d22c1284f5d2d3303628af95a60c800d;hp=7ff4282c74bcdea5ee64ff28ce57313689cda6bc;hb=c8c6bca6587450ff64303dbc994a4cd28d6ce7aa;hpb=17ad0a0b61a887362ce07b1f8b59de003ddd9233 diff --git a/libs/ardour/export_profile_manager.cc b/libs/ardour/export_profile_manager.cc index 7ff4282c74..be9cdd67d2 100644 --- a/libs/ardour/export_profile_manager.cc +++ b/libs/ardour/export_profile_manager.cc @@ -23,7 +23,7 @@ #include #include -#include +#include "pbd/gstdio_compat.h" #include #include @@ -34,7 +34,7 @@ #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,12 @@ #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" using namespace std; using namespace Glib; @@ -57,7 +58,7 @@ namespace ARDOUR { ExportProfileManager::ExportProfileManager (Session & s, ExportType type) - : type(type) + : _type(type) , handler (s.get_export_handler()) , session (s) @@ -114,17 +115,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 +162,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 +180,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 +343,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 +398,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(); @@ -471,11 +488,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 */ @@ -644,6 +665,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 +706,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"))) { @@ -724,8 +746,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 +794,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 +834,7 @@ ExportProfileManager::get_warnings () if (!channel_configs.empty ()) { channel_config_state = channel_configs.front(); } - + TimespanStatePtr timespan_state = timespans.front(); /*** Check "global" config ***/ @@ -838,7 +872,7 @@ ExportProfileManager::get_warnings () check_config (warnings, timespan_state, channel_config_state, *format_it, *filename_it); } } - + return warnings; }