fix another semantically-significant statement buried in an assert() macro

[ardour.git] / libs / ardour / source.cc

diff --git a/libs/ardour/source.cc b/libs/ardour/source.cc
index 35e1417fb4c14e92abc5a8af7e7b31199b1653c3..618dddc70b75808e63550b53a42b1fb945cb5d7b 100644 (file)
--- a/libs/ardour/source.cc
+++ b/libs/ardour/source.cc
@@ -29,7 +29,7 @@
 #include <algorithm>
 #include <fstream>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 #include <glibmm/miscutils.h>
 #include <glibmm/fileutils.h>
 #include "pbd/xml++.h"
@@ -100,7 +100,7 @@ Source::get_state ()
        node->add_property ("name", name());
        node->add_property ("type", _type.to_string());
        node->add_property (X_("flags"), enum_2_string (_flags));
-       _id.print (buf, sizeof (buf));
+       id().print (buf, sizeof (buf));
        node->add_property ("id", buf);
 
        if (_timestamp != 0) {
@@ -122,9 +122,7 @@ Source::set_state (const XMLNode& node, int version)
                return -1;
        }
 
-       if ((prop = node.property ("id")) != 0) {
-               _id = prop->value ();
-       } else {
+       if (!set_id (node)) {
                return -1;
        }
 
@@ -164,7 +162,7 @@ Source::set_state (const XMLNode& node, int version)
 bool
 Source::has_been_analysed() const
 {
-       Glib::Mutex::Lock lm (_analysis_lock);
+       Glib::Threads::Mutex::Lock lm (_analysis_lock);
        return _analysed;
 }
 
@@ -172,7 +170,7 @@ void
 Source::set_been_analysed (bool yn)
 {
        {
-               Glib::Mutex::Lock lm (_analysis_lock);
+               Glib::Threads::Mutex::Lock lm (_analysis_lock);
                _analysed = yn;
        }
 
@@ -221,7 +219,7 @@ Source::get_transients_path () const
        s = _session.analysis_dir ();
        parts.push_back (s);
 
-       s = _id.to_s();
+       s = id().to_s();
        s += '.';
        s += TransientDetector::operational_identifier();
        parts.push_back (s);
@@ -265,7 +263,7 @@ Source::mark_for_remove ()
 }
 
 void
-Source::set_timeline_position (int64_t pos)
+Source::set_timeline_position (framepos_t pos)
 {
        _timeline_position = pos;
 }
@@ -294,14 +292,14 @@ void
 Source::dec_use_count ()
 {
 #ifndef NDEBUG
-        gint oldval = g_atomic_int_exchange_and_add (&_use_count, -1);
+        gint oldval = g_atomic_int_add (&_use_count, -1);
         if (oldval <= 0) {
                 cerr << "Bad use dec for " << name() << endl;
                 abort ();
         }
         assert (oldval > 0);
 #else
-        g_atomic_int_exchange_and_add (&_use_count, -1);
+        g_atomic_int_add (&_use_count, -1);
 #endif
 }