X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fid.cc;h=24cf02ab2ea6f2a0d9591355cb04e2d452a969d4;hb=62ba8d23e33d009e202968408924d00441fe587a;hp=642243a36aeeee8758dc15ea5822d50615f4585d;hpb=449aab3c465bbbf66d221fac3d7ea559f1720357;p=ardour.git

diff --git a/libs/pbd/id.cc b/libs/pbd/id.cc
index 642243a36a..24cf02ab2e 100644
--- a/libs/pbd/id.cc
+++ b/libs/pbd/id.cc
@@ -18,7 +18,6 @@
 */
 
 #include <ostream>
-#include <iostream>
 #include <stdio.h>
 
 #ifndef __STDC_FORMAT_MACROS
@@ -26,25 +25,30 @@
 #endif
 #include <inttypes.h>
 
-#include <pbd/id.h>
+#include "pbd/id.h"
 #include <string>
 
 using namespace std;
 using namespace PBD;
 
-Glib::Mutex* ID::counter_lock = 0;
+Glib::Threads::Mutex* ID::counter_lock = 0;
 uint64_t ID::_counter = 0;
 
 void
 ID::init ()
 {
-	counter_lock = new Glib::Mutex;
+	if (!counter_lock)
+		counter_lock = new Glib::Threads::Mutex;
 }
 
 ID::ID ()
 {
-	Glib::Mutex::Lock lm (*counter_lock);
-	_id = _counter++;
+	reset ();
+}
+
+ID::ID (const ID& other)
+{
+	_id = other._id;
 }
 
 ID::ID (string str)
@@ -52,6 +56,13 @@ ID::ID (string str)
 	string_assign (str);
 }
 
+void
+ID::reset ()
+{
+	Glib::Threads::Mutex::Lock lm (*counter_lock);
+	_id = _counter++;
+}	
+
 int
 ID::string_assign (string str)
 {
@@ -71,6 +82,12 @@ string ID::to_s() const
     return string(buf);
 }
 
+bool
+ID::operator== (const string& str) const
+{
+	return to_s() == str;
+}
+
 ID&
 ID::operator= (string str)
 {
@@ -78,6 +95,15 @@ ID::operator= (string str)
 	return *this;
 }
 
+ID&
+ID::operator= (const ID& other)
+{
+	if (&other != this) {
+		_id = other._id;
+	}
+	return *this;
+}
+
 ostream&
 operator<< (ostream& ostr, const ID& _id)
 {