* Added PBD::UUID

* uuid headers are needed for building!
* Export presets and format profiles use UUID
* Moved ExportPreset class away from ExportProfileManager
* Workaround for Gtk::NoteBook bug in ExportMainDialog


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

3 files changed, 87 insertions, 53 deletions

diff --git a/libs/ardour/ardour/export_format_specification.h b/libs/ardour/ardour/export_format_specification.h
index 41f71e8275..6c195ff131 100644
--- a/libs/ardour/ardour/export_format_specification.h
+++ b/libs/ardour/ardour/export_format_specification.h
@@ -23,6 +23,8 @@
 
 #include <glibmm/ustring.h>
 
+#include <pbd/uuid.h>
+
 #include <ardour/types.h>
 #include <ardour/export_format_base.h>
 
@@ -99,7 +101,7 @@ class ExportFormatSpecification : public ExportFormatBase {
 	
 	/* Accessing functions */
 	
-	uint32_t id () { return _id; }
+	PBD::UUID const & id () { return _id; }
 	Glib::ustring const & name () const { return _name; }
 	Glib::ustring description ();
 	
@@ -150,7 +152,7 @@ class ExportFormatSpecification : public ExportFormatBase {
 	/* The variables below have getters and setters */
 	
 	Glib::ustring   _name;
-	uint32_t        _id;
+	PBD::UUID       _id;
 	
 	Type            _type;
 	DitherType      _dither_type;
@@ -170,13 +172,6 @@ class ExportFormatSpecification : public ExportFormatBase {
 	
 	void add_option (XMLNode * node, std::string const & name, std::string const & value);
 	std::string get_option (XMLNode const * node, std::string const & name);
-	
-  /*** Static stuff for id management, ExportElementFactory will have access to these ***/
-
-	static void init_counter (uint32_t val) { if (val > _counter) { _counter = val; } }
-	static uint32_t counter () { return _counter; }
-
-	static uint32_t _counter;
 
 };
 
diff --git a/libs/ardour/ardour/export_preset.h b/libs/ardour/ardour/export_preset.h
new file mode 100644
index 0000000000..56c27f3442
--- /dev/null
+++ b/libs/ardour/ardour/export_preset.h
@@ -0,0 +1,75 @@
+/*
+    Copyright (C) 2008 Paul Davis
+    Author: Sakari Bergen
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
+#ifndef __ardour_export_preset_h__
+#define __ardour_export_preset_h__
+
+#include <string>
+
+#include <pbd/uuid.h>
+#include <pbd/xml++.h>
+
+using std::string;
+
+namespace ARDOUR
+{
+
+class Session;
+
+class ExportPreset {
+  public:
+	ExportPreset (string filename, Session & s);
+	~ExportPreset ();
+
+	PBD::UUID const & id () const { return _id; }
+	string name () const { return _name; }
+
+	void set_name (string const & name);
+
+	// Note: The set_..._state functions take ownership of the XMLNode
+	void set_global_state (XMLNode & state);
+	void set_local_state (XMLNode & state);
+	
+	XMLNode const * get_global_state () const { return global.root(); }
+	XMLNode const * get_local_state () const { return local; }
+	
+	void save () const;
+	void remove_local () const;
+
+  private:
+
+	void set_id (string const & id);
+
+	XMLNode * get_instant_xml () const;
+	void save_instant_xml () const;
+	void remove_instant_xml () const;
+
+	PBD::UUID  _id;
+	string     _name;
+
+	Session &   session;
+	XMLTree     global;
+	XMLNode *   local;
+	
+};
+
+} // namespace ARDOUR
+
+#endif // __ardour_export_preset_h__
diff --git a/libs/ardour/ardour/export_profile_manager.h b/libs/ardour/ardour/export_profile_manager.h
index 1a855d6868..84a5251aa8 100644
--- a/libs/ardour/ardour/export_profile_manager.h
+++ b/libs/ardour/ardour/export_profile_manager.h
@@ -31,6 +31,7 @@
 #include <sigc++/signal.h>
 #include <glibmm/ustring.h>
 
+#include <pbd/uuid.h>
 #include <pbd/file_utils.h>
 #include <pbd/xml++.h>
 
@@ -50,6 +51,7 @@ class ExportTimespan;
 class ExportChannelConfiguration;
 class ExportFormatSpecification;
 class ExportFilename;
+class ExportPreset;
 class Location;
 class Session;
 
@@ -57,46 +59,6 @@ class Session;
 class ExportProfileManager
 {
   public:
-	class Preset {
-	  public:
-		Preset (string filename, Session & s);
-		~Preset ();
-	
-		uint32_t id () const { return _id; }
-		string name () const { return _name; }
-	
-		void set_name (string name);
-		void set_id (uint32_t id);
-	
-		// Note: The set_..._state functions take ownership of the XMLNode
-		void set_global_state (XMLNode & state);
-		void set_local_state (XMLNode & state);
-		
-		XMLNode const * get_global_state () const { return global.root(); }
-		XMLNode const * get_local_state () const { return local; }
-		
-		void save () const;
-		void remove_local () const;
-	
-	  private:
-	
-		XMLNode * get_instant_xml () const;
-		void save_instant_xml () const;
-		void remove_instant_xml () const;
-	
-		uint32_t   _id;
-		string     _name;
-	
-		Session &   session;
-		XMLTree     global;
-		XMLNode *   local;
-		
-	};
-
-	typedef boost::shared_ptr<Preset> PresetPtr;
-	typedef std::list<PresetPtr> PresetList;
-
-  public:
 
 	ExportProfileManager (Session & s);
 	~ExportProfileManager ();
@@ -104,6 +66,9 @@ class ExportProfileManager
 	void load_profile ();
 	void prepare_for_export ();
 	
+	typedef boost::shared_ptr<ExportPreset> PresetPtr;
+	typedef std::list<PresetPtr> PresetList;
+	
 	PresetList const & get_presets () { return preset_list; }
 	void load_preset (PresetPtr preset);
 	PresetPtr save_preset (string const & name);
@@ -112,14 +77,14 @@ class ExportProfileManager
   private:
 	typedef boost::shared_ptr<ExportHandler> HandlerPtr;
 
-	typedef std::pair<uint32_t, PBD::sys::path> FilePair;
-	typedef std::map<uint32_t, PBD::sys::path> FileMap;
+	typedef std::pair<PBD::UUID, PBD::sys::path> FilePair;
+	typedef std::map<PBD::UUID, PBD::sys::path> FileMap;
 	
 	HandlerPtr  handler;
 	Session &   session;
 	
 	void load_presets ();
-	uint32_t load_preset_from_disk (PBD::sys::path const & path); // Returns preset id
+	void load_preset_from_disk (PBD::sys::path const & path);
 	
 	void set_state (XMLNode const & root);
 	void set_global_state (XMLNode const & root);
@@ -131,7 +96,6 @@ class ExportProfileManager
 	
 	PresetList preset_list;
 	PresetPtr  current_preset;
-	uint32_t   preset_id_counter;
 	FileMap    preset_file_map;
 	
 	std::vector<PBD::sys::path> find_file (std::string const & pattern);