rather hacky fix for the change of the SyncSource > JACK enum to SyncSource > Engine

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

diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index 4af94d44b82090be2706051af64f48abec1bfad1..5e851702d4114944e6a1ee40b80c873933575eeb 100644 (file)
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -23,7 +23,7 @@
 #include <string>
 #include <set>
 
-#include <glib.h>
+#include <glibmm/threads.h>
 
 #include <boost/utility.hpp>
 #include "pbd/statefuldestructible.h"
@@ -62,7 +62,7 @@ class Source : public SessionObject
 
        virtual bool       empty () const = 0;
        virtual framecnt_t length (framepos_t pos) const = 0;
-       virtual void       update_length (framepos_t pos, framecnt_t cnt) = 0;
+       virtual void       update_length (framecnt_t cnt) = 0;
 
        virtual framepos_t natural_position() const { return 0; }
 
@@ -99,13 +99,13 @@ class Source : public SessionObject
 
        void set_allow_remove_if_empty (bool yn);
 
-       Glib::Mutex& mutex()       { return _lock; }
+        Glib::Threads::Mutex& mutex() { return _lock; }
        Flag         flags() const { return _flags; }
 
-        virtual void inc_use_count ();
-        virtual void dec_use_count ();
-        int  use_count() const { return g_atomic_int_get (&_use_count); }
-        bool used() const { return use_count() > 0; }
+       virtual void inc_use_count ();
+       virtual void dec_use_count ();
+        int  use_count() const { return g_atomic_int_get (const_cast<gint*>(&_use_count)); }
+       bool used() const { return use_count() > 0; }
        uint32_t level() const { return _level; }
 
   protected:
@@ -114,10 +114,9 @@ class Source : public SessionObject
        time_t              _timestamp;
        framepos_t          _timeline_position;
        bool                _analysed;
-       mutable Glib::Mutex _lock;
-       mutable Glib::Mutex _analysis_lock;
-       Glib::Mutex         _playlist_lock;
-        gint                _use_count; /* atomic */
+        mutable Glib::Threads::Mutex _lock;
+        mutable Glib::Threads::Mutex _analysis_lock;
+       gint                _use_count; /* atomic */
        uint32_t            _level; /* how deeply nested is this source w.r.t a disk file */
 
   private: