X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=libs%2Fpbd%2Fid.cc;h=24cf02ab2ea6f2a0d9591355cb04e2d452a969d4;hb=e3329000557015ce54691235769db8821e75666b;hp=57ddb5b1282d2a54a3e40e1bfb41b2fda013d8fa;hpb=8b46567e0677eb25c965ed46b80da8808fa33b2b;p=ardour.git

diff --git a/libs/pbd/id.cc b/libs/pbd/id.cc
index 57ddb5b128..24cf02ab2e 100644
--- a/libs/pbd/id.cc
+++ b/libs/pbd/id.cc
@@ -1,17 +1,54 @@
+/*
+    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>
 
-#include <string.h>
-#include <uuid/uuid.h>
+#ifndef __STDC_FORMAT_MACROS
+#define __STDC_FORMAT_MACROS
+#endif
+#include <inttypes.h>
 
-#include <pbd/id.h>
+#include "pbd/id.h"
+#include <string>
 
 using namespace std;
 using namespace PBD;
 
+Glib::Threads::Mutex* ID::counter_lock = 0;
+uint64_t ID::_counter = 0;
+
+void
+ID::init ()
+{
+	if (!counter_lock)
+		counter_lock = new Glib::Threads::Mutex;
+}
+
 ID::ID ()
 {
-	uuid_generate (id);
+	reset ();
+}
+
+ID::ID (const ID& other)
+{
+	_id = other._id;
 }
 
 ID::ID (string str)
@@ -19,36 +56,36 @@ 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)
 {
-	/* first check for old-style all-numeric ID's */
-
-	if (strcspn (str.c_str(), "0123456789") == 0) {
-		/* all chars are numeric. just render the existing ID into the space in 
-		   which we would otherwise store a UUID.
-		*/
-
-		memset (id, ' ', sizeof (id));
-		snprintf ((char*) id, sizeof (id), str.c_str());
-
-	} else {
-
-		/* OK, its UUID, probably */
+	return sscanf (str.c_str(), "%" PRIu64, &_id) != 0;
+}
 
-		if (uuid_parse (str.c_str(), id)) {
-			/* XXX error */
-			return -1;
-		}
-	}
+void
+ID::print (char* buf, uint32_t bufsize) const
+{
+	snprintf (buf, bufsize, "%" PRIu64, _id);
+}
 
-	return 0;
+string ID::to_s() const
+{
+    char buf[32]; // see print()
+    print(buf, sizeof (buf));
+    return string(buf);
 }
 
-void
-ID::print (char* buf) const
+bool
+ID::operator== (const string& str) const
 {
-	uuid_unparse (id, buf);
+	return to_s() == str;
 }
 
 ID&
@@ -58,17 +95,20 @@ ID::operator= (string str)
 	return *this;
 }
 
-bool
-ID::operator== (const ID& other) const
+ID&
+ID::operator= (const ID& other)
 {
-	return memcmp (id, other.id, sizeof (id)) == 0;
+	if (&other != this) {
+		_id = other._id;
+	}
+	return *this;
 }
 
 ostream&
-operator<< (ostream& ostr, const ID& id)
+operator<< (ostream& ostr, const ID& _id)
 {
-	char buf[37];
-	id.print (buf);
+	char buf[32];
+	_id.print (buf, sizeof (buf));
 	ostr << buf;
 	return ostr;
 }