X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fsession_metadata_dialog.h;h=1599e50bb3e9c5d804f8fac5eae821bab80d09f1;hb=e9768e934fdeaf31aaae779e42ff493a2e781179;hp=fbe430e7ad43d0f0f110b730cb16a610ddaf7695;hpb=4d112a8e6b90fa64a5cd333042044768111ba994;p=ardour.git

diff --git a/gtk2_ardour/session_metadata_dialog.h b/gtk2_ardour/session_metadata_dialog.h
index fbe430e7ad..1599e50bb3 100644
--- 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;