missing include for rand() in self-tests

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

diff --git a/libs/pbd/id.cc b/libs/pbd/id.cc
index 353776de9f5c585acc89be5ef59cf2a420dcc25e..9a610c7418e4135f6980653375e4d42a40746642 100644 (file)
--- a/libs/pbd/id.cc
+++ b/libs/pbd/id.cc
@@ -1,5 +1,23 @@
+/*
+    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
+    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 <ostream>
-#include <iostream>
 #include <stdio.h>
 
 #ifndef __STDC_FORMAT_MACROS
@@ -7,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)
@@ -33,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)
 {
@@ -52,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)
 {
@@ -59,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)
 {