fix crash when copy'ing latent plugins

[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 b72e9e3332b4841d8575628119b3591e8832544f..be9cdd67d22c1284f5d2d3303628af95a60c800d 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 <glib/gstdio.h>
+#include "pbd/gstdio_compat.h"
 
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.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)
 
@@ -161,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);
@@ -179,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)) {
@@ -399,7 +405,7 @@ ExportProfileManager::init_timespans (XMLNodeList nodes)
                } else {
                        session_range = session.locations()->session_range_location();
                }
-                       
+
                if (!session_range) { return false; }
 
                ExportTimespanPtr timespan = handler->add_timespan();
@@ -482,12 +488,15 @@ ExportProfileManager::update_ranges () {
                return;
        }
 
-       /* Session */
 
-       Location * session_range = (session.get_play_loop () ? session.locations()->auto_loop_location () : 
-                                                                                                                  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 */
@@ -697,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"))) {
@@ -785,7 +794,7 @@ std::string
 ExportProfileManager::get_sample_filename_for_format (ExportFilenamePtr filename, ExportFormatSpecPtr format)
 {
        assert (format);
-       
+
        if (channel_configs.empty()) { return ""; }
 
        std::list<string> filenames;
@@ -825,7 +834,7 @@ ExportProfileManager::get_warnings ()
        if (!channel_configs.empty ()) {
                channel_config_state = channel_configs.front();
        }
-       
+
        TimespanStatePtr timespan_state = timespans.front();
 
        /*** Check "global" config ***/
@@ -863,7 +872,7 @@ ExportProfileManager::get_warnings ()
                        check_config (warnings, timespan_state, channel_config_state, *format_it, *filename_it);
                }
        }
-       
+
        return warnings;
 }