position+width panning improvements (reverse width now works); relabel pan automation...

[ardour.git] / libs / ardour / ardour / export_profile_manager.h

diff --git a/libs/ardour/ardour/export_profile_manager.h b/libs/ardour/ardour/export_profile_manager.h
index 30bb3c5b91becf1225d1015313f897e308822789..b8e86d11df85218bd9f557eb7d63f30123591ffd 100644 (file)
--- a/libs/ardour/ardour/export_profile_manager.h
+++ b/libs/ardour/ardour/export_profile_manager.h
@@ -25,10 +25,10 @@
 #include <vector>
 #include <map>
 #include <stdexcept>
+#include <string>
 
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
-#include <glibmm/ustring.h>
 
 #include "pbd/uuid.h"
 #include "pbd/file_utils.h"
@@ -124,13 +124,12 @@ class ExportProfileManager
 
                TimespanState (boost::shared_ptr<Location> session_range,
                               boost::shared_ptr<Location> selection_range,
-                              boost::shared_ptr<LocationList> ranges) :
-                 timespans (new TimespanList ()),
-                 time_format (Timecode),
-
-                 session_range (session_range),
-                 selection_range (selection_range),
-                 ranges (ranges)
+                              boost::shared_ptr<LocationList> ranges)
+                 : timespans (new TimespanList ())
+                 , time_format (Timecode)
+                 , session_range (session_range)
+                 , selection_range (selection_range)
+                 , ranges (ranges)
                {}
        };
 
@@ -138,7 +137,7 @@ class ExportProfileManager
        typedef std::list<TimespanStatePtr> TimespanStateList;
 
        void set_selection_range (nframes_t start = 0, nframes_t end = 0);
-       std::string set_single_range (nframes_t start, nframes_t end, Glib::ustring name);
+       std::string set_single_range (nframes_t start, nframes_t end, std::string name);
        TimespanStateList const & get_timespans () { return check_list (timespans); }
 
   private:
@@ -206,7 +205,7 @@ class ExportProfileManager
        void remove_format_profile (FormatPtr format);
        FormatPtr get_new_format (FormatPtr original);
 
-       boost::signals2::signal<void()> FormatListChanged;
+       PBD::Signal0<void> FormatListChanged;
 
   private:
 
@@ -251,9 +250,9 @@ class ExportProfileManager
 /* Warnings */
   public:
        struct Warnings {
-               std::list<Glib::ustring> errors;
-               std::list<Glib::ustring> warnings;
-               std::list<Glib::ustring> conflicting_filenames;
+               std::list<std::string> errors;
+               std::list<std::string> warnings;
+               std::list<std::string> conflicting_filenames;
        };
 
        boost::shared_ptr<Warnings> get_warnings ();
@@ -264,6 +263,9 @@ class ExportProfileManager
                           ChannelConfigStatePtr channel_config_state,
                           FormatStatePtr format_state,
                           FilenameStatePtr filename_state);
+       
+       bool check_format (FormatPtr format, uint32_t channels);
+       bool check_sndfile_format (FormatPtr format, unsigned int channels);
 
  /* Utilities */