Remove now unused PBD::string_is_affirmative function

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

diff --git a/libs/pbd/id.cc b/libs/pbd/id.cc
index f9afa72c985a359f667e985c5666544759c5c64e..d50782434931ea37fd38fbf2d9ffb05157c60f58 100644 (file)
--- a/libs/pbd/id.cc
+++ b/libs/pbd/id.cc
@@ -1,30 +1,51 @@
+/*
+    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
-#define __STDC_FORMAT_MACROS
-#endif
-#include <inttypes.h>
+#include "pbd/id.h"
+#include "pbd/string_convert.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)
@@ -32,17 +53,29 @@ ID::ID (string str)
        string_assign (str);
 }
 
-int
+void
+ID::reset ()
+{
+       Glib::Threads::Mutex::Lock lm (*counter_lock);
+       _id = _counter++;
+}
+
+bool
 ID::string_assign (string str)
 {
-       return sscanf (str.c_str(), "%" PRIu64, &id) != 0;
+       return string_to_uint64 (str, _id);
 }
 
-void
-ID::print (char* buf) const
+std::string
+ID::to_s () const
+{
+       return to_string (_id);
+}
+
+bool
+ID::operator== (const string& str) const
 {
-       /* XXX sizeof buf is unknown. bad API design */
-       snprintf (buf, 16, "%" PRIu64, id);
+       return to_string (_id) == str;
 }
 
 ID&
@@ -52,12 +85,19 @@ 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)
 {
-       char buf[32];
-       id.print (buf);
-       ostr << buf;
+       ostr << id.to_s();
        return ostr;
 }