X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fpbd%2Fid.cc;h=24cf02ab2ea6f2a0d9591355cb04e2d452a969d4;hb=02e38bab162da5887c39f63a90e4f8edf169d892;hp=0de0d052c3d7a5e2d6e5c84697f8d553adba61df;hpb=58631285534b35a325165427490a6ab9419f4c5d;p=ardour.git

diff --git a/libs/pbd/id.cc b/libs/pbd/id.cc
index 0de0d052c3..24cf02ab2e 100644
--- 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,26 +56,38 @@ 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)
 {
-	return sscanf (str.c_str(), "%" PRIu64, &id) != 0;
+	return sscanf (str.c_str(), "%" PRIu64, &_id) != 0;
 }
 
 void
-ID::print (char* buf) const
+ID::print (char* buf, uint32_t bufsize) const
 {
-	/* XXX sizeof buf is unknown. bad API design */
-	snprintf (buf, 16, "%" PRIu64, id);
+	snprintf (buf, bufsize, "%" PRIu64, _id);
 }
 
 string ID::to_s() const
 {
-    char buf[16]; // see print()
-    print(buf);
+    char buf[32]; // see print()
+    print(buf, sizeof (buf));
     return string(buf);
 }
 
+bool
+ID::operator== (const string& str) const
+{
+	return to_s() == str;
+}
+
 ID&
 ID::operator= (string str)
 {
@@ -60,11 +95,20 @@ 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)
+operator<< (ostream& ostr, const ID& _id)
 {
 	char buf[32];
-	id.print (buf);
+	_id.print (buf, sizeof (buf));
 	ostr << buf;
 	return ostr;
 }