move creation of UIConfiguration object to precede creation of ArdourUI.

[ardour.git] / gtk2_ardour / session_metadata_dialog.h

diff --git a/gtk2_ardour/session_metadata_dialog.h b/gtk2_ardour/session_metadata_dialog.h
index fbe430e7ad43d0f0f110b730cb16a610ddaf7695..1599e50bb3e9c5d804f8fac5eae821bab80d09f1 100644 (file)
--- a/gtk2_ardour/session_metadata_dialog.h
+++ b/gtk2_ardour/session_metadata_dialog.h
@@ -22,6 +22,10 @@
 
 #include "ardour_dialog.h"
 
+#ifdef interface
+#undef interface
+#endif
+
 #include <gtkmm.h>
 #include <boost/shared_ptr.hpp>
 
@@ -82,7 +86,7 @@ class TextMetadataField : public MetadataField {
        Gtk::Label* value_label;
        Gtk::Entry* entry;
 
-       uint width;
+       guint width;
 };
 
 /// MetadataField that accepts only numbers
@@ -209,7 +213,7 @@ class SessionMetadataDialog : public ArdourDialog
        SessionMetadataDialog (std::string const & name);
 
   protected:
-       void init_data ();
+       void init_data ( bool skip_user = false );
        void load_extra_data (ARDOUR::SessionMetadata const & data);
        void save_data ();
 
@@ -232,9 +236,11 @@ class SessionMetadataDialog : public ArdourDialog
        Gtk::Notebook     notebook;
 
   private:
+       void init_user_data ();
        void init_track_data ();
        void init_album_data ();
        void init_people_data ();
+       void init_school_data ();
 
        typedef boost::shared_ptr<SessionMetadataSet> DataSetPtr;
        typedef std::list<DataSetPtr> DataSetList;