SG: merge 3.0 from 11783-12096

git-svn-id: svn://localhost/ardour2/branches/3.0-SG@12097 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-04-26 17:06:21 +00:00
parent 85a27910cb
commit 9c8b57aab0
385 changed files with 14193 additions and 18198 deletions

View file

@ -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;