Merge branch 'master' into windows

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

diff --git a/libs/pbd/signals.cc b/libs/pbd/signals.cc
index b37c6e211a96618b7b744b967de98f4853fd7ad5..ff535603ef41a85d937d07ec68ba3b37605cf939 100644 (file)
--- a/libs/pbd/signals.cc
+++ b/libs/pbd/signals.cc
@@ -22,29 +22,26 @@
 
 using namespace PBD;
 
-Glib::StaticMutex ScopedConnectionList::_lock = GLIBMM_STATIC_MUTEX_INIT;
-
 ScopedConnectionList::ScopedConnectionList()
 {
 }
 
 ScopedConnectionList::~ScopedConnectionList()
 {
-       std::cout << "~ScopedConnectionList " << this << " " << PBD::demangled_name (*this) << "\n";
        drop_connections ();
 }
 
 void
 ScopedConnectionList::add_connection (const UnscopedConnection& c)
 {
-       Glib::Mutex::Lock lm (_lock);
+       Glib::Threads::Mutex::Lock lm (_lock);
        _list.push_back (new ScopedConnection (c));
 }
 
 void
 ScopedConnectionList::drop_connections ()
 {
-       Glib::Mutex::Lock lm (_lock);
+       Glib::Threads::Mutex::Lock lm (_lock);
 
        for (ConnectionList::iterator i = _list.begin(); i != _list.end(); ++i) {
                delete *i;