make 3.0 catch up with transport and other changes in 2.X (hand applied, not merged)

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

diff --git a/libs/ardour/ardour/export_filename.h b/libs/ardour/ardour/export_filename.h
index fb9f5dcbbc6b859b6614902fcbd43a522320d82b..2847291a13896ab615f74aef3238dd526a14ed9c 100644 (file)
--- a/libs/ardour/ardour/export_filename.h
+++ b/libs/ardour/ardour/export_filename.h
@@ -23,9 +23,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <glibmm/ustring.h>
-#include <pbd/statefuldestructible.h>
-
-using Glib::ustring;
+#include "pbd/statefuldestructible.h"
 
 namespace ARDOUR
 {
@@ -51,7 +49,7 @@ class ExportFilename {
                D_BE,        // big endian (no deliminator)
                D_BEShortY   // big endian short year representation
        };
-       
+
        enum TimeFormat {
                T_None,
                T_NoDelim,
@@ -62,39 +60,39 @@ class ExportFilename {
        friend class ExportElementFactory;
        ExportFilename (Session & session);
 
-  public:      
+  public:
        /* Serialization */
-       
+
        XMLNode & get_state ();
        int set_state (const XMLNode &);
-       
+
        /* data access */
-       
-       ustring get_path (FormatPtr format) const;
-       ustring get_folder () const { return folder; }
-       
+
+       Glib::ustring get_path (FormatPtr format) const;
+       Glib::ustring get_folder () const { return folder; }
+
        TimeFormat get_time_format () const { return time_format; }
        DateFormat get_date_format () const { return date_format; }
-       ustring get_time_format_str (TimeFormat format) const;
-       ustring get_date_format_str (DateFormat format) const;
-       
-       ustring get_label () const { return label; }
+       Glib::ustring get_time_format_str (TimeFormat format) const;
+       Glib::ustring get_date_format_str (DateFormat format) const;
+
+       Glib::ustring get_label () const { return label; }
        uint32_t get_revision () const { return revision; }
-       
+
        /* data modification */
-       
+
        void set_time_format (TimeFormat format);
        void set_date_format (DateFormat format);
-       void set_label (ustring value);
+       void set_label (Glib::ustring value);
        void set_revision (uint32_t value) { revision = value; }
        void set_channel (uint32_t value) { channel = value; }
-       bool set_folder (ustring path);
-       
+       bool set_folder (Glib::ustring path);
+
        void set_timespan (TimespanPtr ts) { timespan = ts; }
        void set_channel_config (ChannelConfigPtr cc) { channel_config = cc; }
-       
+
        /* public members */
-       
+
        bool include_label;
        bool include_session;
        bool include_revision;
@@ -103,34 +101,33 @@ class ExportFilename {
        bool include_timespan;
        bool include_time;
        bool include_date;
-       
+
   private:
 
        Session & session;
 
-       ustring   label;
+       Glib::ustring   label;
        uint32_t  revision;
        uint32_t  channel;
-       
-       ustring   folder;
-       
+
+       Glib::ustring   folder;
+
        DateFormat date_format;
        TimeFormat time_format;
-       
-       ustring get_formatted_time (ustring const & format) const;
+
+       Glib::ustring get_formatted_time (Glib::ustring const & format) const;
        struct tm * time_struct; // Due to static allocation no destructor or copy-ctor is needed because of this
-       
+
        TimespanPtr timespan;
        ChannelConfigPtr channel_config;
-       
+
        /* Serialization helpers */
-       
-       typedef std::pair<bool, ustring> FieldPair;
-       
-       void add_field (XMLNode * node, ustring const & name, bool enabled, ustring const & value = "");
-       FieldPair get_field (XMLNode const & node, ustring const & name);
+
+       typedef std::pair<bool, Glib::ustring> FieldPair;
+
+       void add_field (XMLNode * node, Glib::ustring const & name, bool enabled, Glib::ustring const & value = "");
+       FieldPair get_field (XMLNode const & node, Glib::ustring const & name);
        FieldPair analyse_folder ();
-       
 };