diff options
author | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-09-19 16:56:01 +0000 |
---|---|---|
committer | Sakari Bergen <sakari.bergen@beatwaves.net> | 2008-09-19 16:56:01 +0000 |
commit | 68f04adec110a991e2b2c1657e67a7dc791decc1 (patch) | |
tree | e5a47603b50d0e17e69ffcfd904424ed06180ddf /libs/pbd | |
parent | fa4bca989b18259456ec713b8f02e061ec8bc8e2 (diff) |
* 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
Diffstat (limited to 'libs/pbd')
-rw-r--r-- | libs/pbd/SConscript | 2 | ||||
-rw-r--r-- | libs/pbd/pbd/uuid.h | 52 | ||||
-rw-r--r-- | libs/pbd/uuid.cc | 38 |
3 files changed, 92 insertions, 0 deletions
diff --git a/libs/pbd/SConscript b/libs/pbd/SConscript index 4b65e3ee38..5f2d20e405 100644 --- a/libs/pbd/SConscript +++ b/libs/pbd/SConscript @@ -45,6 +45,7 @@ strsplit.cc textreceiver.cc transmitter.cc undo.cc +uuid.cc version.cc whitespace.cc xml++.cc @@ -57,6 +58,7 @@ pbd = conf.Finish() pbd.Merge ([ libraries['sigc2'], libraries['xml'], + libraries['uuid'], libraries['glibmm2'], libraries['glib2'] ]) diff --git a/libs/pbd/pbd/uuid.h b/libs/pbd/pbd/uuid.h new file mode 100644 index 0000000000..16a67436b7 --- /dev/null +++ b/libs/pbd/pbd/uuid.h @@ -0,0 +1,52 @@ +/* + 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 __pbd_uuid_h__ +#define __pbd_uuid_h__ + +#include <string> +#include <uuid/uuid.h> + +namespace PBD { + +class UUID { + + public: + UUID () { uuid_generate (id); } + UUID (UUID const & other) { uuid_copy (id, other.id); } + UUID (std::string const & str) { uuid_parse (str.c_str(), id); } + + UUID& operator= (std::string const & str); + std::string to_s () const; + + bool operator== (UUID const & other) const { return !uuid_compare (id, other.id); } + bool operator!= (UUID const & other) const { return uuid_compare (id, other.id); } + bool operator< (UUID const & other) const { return uuid_compare (id, other.id) < 0; } + + operator bool() const { return !uuid_is_null (id); } + + private: + uuid_t id; + +}; + +} // namespace PBD + +#endif // __pbd_uuid_h__ diff --git a/libs/pbd/uuid.cc b/libs/pbd/uuid.cc new file mode 100644 index 0000000000..0ccffa2091 --- /dev/null +++ b/libs/pbd/uuid.cc @@ -0,0 +1,38 @@ +/* + 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. + +*/ + +#include <pbd/uuid.h> + +using namespace PBD; + +UUID& +UUID::operator= (std::string const & str) +{ + uuid_parse (str.c_str(), id); + return *this; +} + +std::string +UUID::to_s () const +{ + char buf[37]; + uuid_unparse (id, buf); + return std::string (buf); +} |