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 a4d6239ae4bc1f5de0789c43e127e77fc63ed70f..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 <pbd/gstdio_compat.h>
+#include "pbd/gstdio_compat.h"
 
 #include <glibmm/fileutils.h>
 #include <glibmm/miscutils.h>
@@ -48,7 +48,7 @@
 #include "ardour/session.h"
 #include "ardour/broadcast_info.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Glib;
@@ -180,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)) {
@@ -400,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();
@@ -701,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"))) {
@@ -789,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;
@@ -829,7 +834,7 @@ ExportProfileManager::get_warnings ()
        if (!channel_configs.empty ()) {
                channel_config_state = channel_configs.front();
        }
-       
+
        TimespanStatePtr timespan_state = timespans.front();
 
        /*** Check "global" config ***/
@@ -867,7 +872,7 @@ ExportProfileManager::get_warnings ()
                        check_config (warnings, timespan_state, channel_config_state, *format_it, *filename_it);
                }
        }
-       
+
        return warnings;
 }