From 68f04adec110a991e2b2c1657e67a7dc791decc1 Mon Sep 17 00:00:00 2001 From: Sakari Bergen Date: Fri, 19 Sep 2008 16:56:01 +0000 Subject: * 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 --- libs/ardour/ardour/export_format_specification.h | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'libs/ardour/ardour/export_format_specification.h') 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 +#include + #include #include @@ -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; }; -- cgit v1.2.3