add User metadata. user metadata is edited from the same dialog and read/writable using the same mechanism as session metadata, but it is stored in the ardour.rc file instead of with the session. Importing metadata from another session does not change user metadata. SessionMetadata is now a singleton that is available to the session object and the various config objects.

git-svn-id: svn://localhost/ardour2/branches/3.0@12014 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 3 insertions, 1 deletions

diff --git a/gtk2_ardour/session_metadata_dialog.h b/gtk2_ardour/session_metadata_dialog.h
index fbe430e7ad..9aa62ed4ca 100644
--- a/gtk2_ardour/session_metadata_dialog.h
+++ b/gtk2_ardour/session_metadata_dialog.h
@@ -209,7 +209,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 +232,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;