remove UUIDs as implemention of PBD::ID, use static counter (not finished - counter...

git-svn-id: svn://localhost/ardour2/trunk@671 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/SConstruct b/SConstruct
index 95664ec1ff555dd01d9d6b8fea9ebb03918dfbfc..3fff60f04b6b529fa8f18c41430de2ce81ecbceb 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -453,15 +453,6 @@ conf = Configure (libraries['flac'])
 conf.CheckLib ('FLAC', 'FLAC__stream_decoder_new')
 libraries['flac'] = conf.Finish ()
 
-#
-# Check for UUID stuff
-
-libraries['uuid'] = LibraryInfo ()
-
-conf = Configure (libraries['uuid'])
-conf.CheckLib ('uuid', 'uuid_generate')
-libraries['uuid'] = conf.Finish ()
-
 #
 # Check for liblo
 

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 8d66b9298c77e62541e1aaeca4ae12080081910c..68e07ebd2245d032875fb5976e6c563ed8ab53ab 100644 (file)
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -42,7 +42,6 @@ gtkardour.Merge ([
     libraries['gdkmm2'],
     libraries['sigc2'],
     libraries['gtk2'],
-    libraries['uuid'],
     libraries['xml'],
     libraries['xslt'],
     libraries['soundtouch'],

diff --git a/libs/pbd/SConscript b/libs/pbd/SConscript
index ba8d6ef91ef0c41c5e47608a58dc6fc06d536521..36fb02885ff16a352865cc16fca3d32e514cf726 100644 (file)
--- a/libs/pbd/SConscript
+++ b/libs/pbd/SConscript
@@ -50,7 +50,6 @@ if conf.CheckCHeader('execinfo.h'):
 pbd = conf.Finish()
 
 pbd.Merge ([ libraries['sigc2'],
-             libraries['uuid'],
              libraries['xml'],
              libraries['glibmm2'],
              libraries['glib2'] ])

diff --git a/libs/pbd/id.cc b/libs/pbd/id.cc
index 57ddb5b1282d2a54a3e40e1bfb41b2fda013d8fa..f483ff911c27b993bec4a05c249153f8038c4d50 100644 (file)
--- a/libs/pbd/id.cc
+++ b/libs/pbd/id.cc
@@ -1,17 +1,24 @@
 #include <ostream>
 #include <iostream>
+#include <stdio.h>
 
-#include <string.h>
-#include <uuid/uuid.h>
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+#include <inttypes.h>
 
 #include <pbd/id.h>
 
 using namespace std;
 using namespace PBD;
 
+Glib::Mutex ID::counter_lock;
+uint64_t ID::_counter = 0;
+
 ID::ID ()
 {
-       uuid_generate (id);
+       Glib::Mutex::Lock lm (counter_lock);
+       id = _counter++;
 }
 
 ID::ID (string str)
@@ -22,33 +29,14 @@ ID::ID (string str)
 int
 ID::string_assign (string str)
 {
-       /* first check for old-style all-numeric ID's */
-
-       if (strcspn (str.c_str(), "0123456789") == 0) {
-               /* all chars are numeric. just render the existing ID into the space in 
-                  which we would otherwise store a UUID.
-               */
-
-               memset (id, ' ', sizeof (id));
-               snprintf ((char*) id, sizeof (id), str.c_str());
-
-       } else {
-
-               /* OK, its UUID, probably */
-
-               if (uuid_parse (str.c_str(), id)) {
-                       /* XXX error */
-                       return -1;
-               }
-       }
-
-       return 0;
+       return sscanf (str.c_str(), "%" PRIu64, &id) != 0;
 }
 
 void
 ID::print (char* buf) const
 {
-       uuid_unparse (id, buf);
+       /* XXX sizeof buf is unknown. bad API design */
+       snprintf (buf, 16, "%" PRIu64, id);
 }
 
 ID&
@@ -58,16 +46,10 @@ ID::operator= (string str)
        return *this;
 }
 
-bool
-ID::operator== (const ID& other) const
-{
-       return memcmp (id, other.id, sizeof (id)) == 0;
-}
-
 ostream&
 operator<< (ostream& ostr, const ID& id)
 {
-       char buf[37];
+       char buf[32];
        id.print (buf);
        ostr << buf;
        return ostr;

diff --git a/libs/pbd/pbd/id.h b/libs/pbd/pbd/id.h
index 95ac00bed071759e0beaa88690cf34033b7608c8..e7e796fdc8dc972818dc88eeaa2551936e48ac7e 100644 (file)
--- a/libs/pbd/pbd/id.h
+++ b/libs/pbd/pbd/id.h
@@ -1,9 +1,11 @@
 #ifndef __pbd_id_h__
 #define __pbd_id_h__
 
-#include <uuid/uuid.h>
+#include <stdint.h>
 #include <string>
 
+#include <glibmm/thread.h>
+
 namespace PBD {
 
 class ID {
@@ -11,21 +13,31 @@ class ID {
        ID ();
        ID (std::string);
        
-       bool operator== (const ID& other) const;
+       bool operator== (const ID& other) const {
+               return id == other.id; 
+       }
+
        bool operator!= (const ID& other) const {
-               return !operator== (other);
+               return id != other.id;
        }
+
        ID& operator= (std::string); 
 
        bool operator< (const ID& other) const {
-               return memcmp (id, other.id, sizeof (id)) < 0;
+               return id < other.id;
        }
 
        void print (char* buf) const;
        
+       static uint64_t counter() { return _counter; }
+       static void init_counter (uint64_t val) { _counter = val; }
+
   private:
-       uuid_t id;
+       uint64_t id;
        int string_assign (std::string);
+
+       static Glib::Mutex counter_lock;
+       static uint64_t _counter;
 };
 
 }