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

diff --git a/libs/pbd/id.cc b/libs/pbd/id.cc
index f483ff911c..642243a36a 100644
--- a/libs/pbd/id.cc
+++ b/libs/pbd/id.cc
@@ -1,3 +1,22 @@
+/*
+    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>
@@ -8,17 +27,24 @@
 #include <inttypes.h>
 
 #include <pbd/id.h>
+#include <string>
 
 using namespace std;
 using namespace PBD;
 
-Glib::Mutex ID::counter_lock;
+Glib::Mutex* ID::counter_lock = 0;
 uint64_t ID::_counter = 0;
 
+void
+ID::init ()
+{
+	counter_lock = new Glib::Mutex;
+}
+
 ID::ID ()
 {
-	Glib::Mutex::Lock lm (counter_lock);
-	id = _counter++;
+	Glib::Mutex::Lock lm (*counter_lock);
+	_id = _counter++;
 }
 
 ID::ID (string str)
@@ -29,14 +55,20 @@ ID::ID (string str)
 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
+{
+	snprintf (buf, bufsize, "%" PRIu64, _id);
+}
+
+string ID::to_s() const
 {
-	/* XXX sizeof buf is unknown. bad API design */
-	snprintf (buf, 16, "%" PRIu64, id);
+    char buf[32]; // see print()
+    print(buf, sizeof (buf));
+    return string(buf);
 }
 
 ID&
@@ -47,10 +79,10 @@ ID::operator= (string str)
 }
 
 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;
 }