extend PBD::ID API to allow construction and operator== using uint64_t

[ardour.git] / libs / pbd / pbd / id.h

diff --git a/libs/pbd/pbd/id.h b/libs/pbd/pbd/id.h
index d25ca81ef0ad512c71c6ff7a56d08ddbac268ce6..a597b6512b471397973225cb3132c41fbb3fb9c7 100644 (file)
--- a/libs/pbd/pbd/id.h
+++ b/libs/pbd/pbd/id.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     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
@@ -23,17 +23,24 @@
 #include <stdint.h>
 #include <string>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
+
+#include "pbd/libpbd_visibility.h"
 
 namespace PBD {
 
-class ID {
+/** a unique ID to identify objects numerically */
+class LIBPBD_API ID {
   public:
        ID ();
        ID (std::string);
-       
+       ID (const ID&);
+       ID (uint64_t);
+
+       void reset ();
+
        bool operator== (const ID& other) const {
-               return _id == other._id; 
+               return _id == other._id;
        }
 
        bool operator!= (const ID& other) const {
@@ -41,29 +48,33 @@ class ID {
        }
 
        bool operator== (const std::string&) const;
+       bool operator== (uint64_t n) const {
+               return _id == n;
+       }
 
-       ID& operator= (std::string); 
+       ID& operator= (std::string);
+       ID& operator= (const ID&);
 
        bool operator< (const ID& other) const {
                return _id < other._id;
        }
 
-       void print (char* buf, uint32_t bufsize) const;
-        std::string to_s() const;
-       
+       std::string to_s () const;
+
        static uint64_t counter() { return _counter; }
        static void init_counter (uint64_t val) { _counter = val; }
        static void init ();
 
   private:
        uint64_t _id;
-       int string_assign (std::string);
+       bool string_assign (std::string);
 
-       static Glib::Mutex* counter_lock;
+       static Glib::Threads::Mutex* counter_lock;
        static uint64_t _counter;
 };
 
 }
-std::ostream& operator<< (std::ostream& ostr, const PBD::ID&);
+
+LIBPBD_API std::ostream& operator<< (std::ostream& ostr, const PBD::ID&);
 
 #endif /* __pbd_id_h__ */