projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h
[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 08fdb96e0d7a6c24c0ff70a547f8ae87d18c590c..f924ed17e5a45021a023dcaa4c748d2c0575094c 100644
(file)
--- a/
libs/ardour/export_profile_manager.cc
+++ b/
libs/ardour/export_profile_manager.cc
@@
-23,7
+23,7
@@
#include <cerrno>
#include <glib.h>
#include <cerrno>
#include <glib.h>
-#include
<glib/gstdio.h>
+#include
"pbd/gstdio_compat.h"
#include <glibmm/fileutils.h>
#include <glibmm/miscutils.h>
#include <glibmm/fileutils.h>
#include <glibmm/miscutils.h>
@@
-34,7
+34,7
@@
#include "ardour/export_profile_manager.h"
#include "ardour/export_format_specification.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"
#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/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 "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;
using namespace std;
using namespace Glib;
@@
-114,17
+115,22
@@
ExportProfileManager::ExportProfileManager (Session & s, ExportType type)
ExportProfileManager::~ExportProfileManager ()
{
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 ()
{
}
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);
} else {
XMLNode empty_node (xml_node_name);
set_state (empty_node);
@@
-174,9
+180,14
@@
ExportProfileManager::load_preset (ExportPresetPtr preset)
if (!preset) { return false; }
XMLNode const * state;
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);
if ((state = preset->get_local_state())) {
set_local_state (*state);
- }
else { ok = false; }
+ }
if ((state = preset->get_global_state())) {
if (!set_global_state (*state)) {
if ((state = preset->get_global_state())) {
if (!set_global_state (*state)) {
@@
-332,8
+343,7
@@
ExportProfileManager::find_file (std::string const & pattern)
{
vector<std::string> found;
{
vector<std::string> 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;
}
return found;
}
@@
-388,7
+398,14
@@
ExportProfileManager::init_timespans (XMLNodeList nodes)
timespans.push_back (state);
// Add session as default selection
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();
if (!session_range) { return false; }
ExportTimespanPtr timespan = handler->add_timespan();
@@
-471,11
+488,15
@@
ExportProfileManager::update_ranges () {
return;
}
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 */
}
/* Selection */
@@
-644,6
+665,7
@@
ExportProfileManager::get_new_format (ExportFormatSpecPtr original)
ExportFormatSpecPtr format;
if (original) {
format.reset (new ExportFormatSpecification (*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"));
} 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)
{
ExportProfileManager::FormatStatePtr
ExportProfileManager::deserialize_format (XMLNode & root)
{
- XMLProperty * prop;
+ XMLProperty
const
* prop;
PBD::UUID id;
if ((prop = root.property ("id"))) {
PBD::UUID id;
if ((prop = root.property ("id"))) {
@@
-772,7
+794,7
@@
std::string
ExportProfileManager::get_sample_filename_for_format (ExportFilenamePtr filename, ExportFormatSpecPtr format)
{
assert (format);
ExportProfileManager::get_sample_filename_for_format (ExportFilenamePtr filename, ExportFormatSpecPtr format)
{
assert (format);
-
+
if (channel_configs.empty()) { return ""; }
std::list<string> filenames;
if (channel_configs.empty()) { return ""; }
std::list<string> filenames;
@@
-812,7
+834,7
@@
ExportProfileManager::get_warnings ()
if (!channel_configs.empty ()) {
channel_config_state = channel_configs.front();
}
if (!channel_configs.empty ()) {
channel_config_state = channel_configs.front();
}
-
+
TimespanStatePtr timespan_state = timespans.front();
/*** Check "global" config ***/
TimespanStatePtr timespan_state = timespans.front();
/*** Check "global" config ***/
@@
-850,7
+872,7
@@
ExportProfileManager::get_warnings ()
check_config (warnings, timespan_state, channel_config_state, *format_it, *filename_it);
}
}
check_config (warnings, timespan_state, channel_config_state, *format_it, *filename_it);
}
}
-
+
return warnings;
}
return warnings;
}