Merge branch 'master' into cairocanvas

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

diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index b8b3c9c229fa5095162b022adf7b9e1d0868e6fa..78b3cfaa2110f369f80fc2b336fe996e55f7e30a 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"
@@ -36,7 +36,7 @@ namespace ARDOUR {
 
 class Session;
 
-class Source : public SessionObject
+class LIBARDOUR_API Source : public SessionObject
 {
   public:
        enum Flag {
@@ -62,9 +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 const std::string& path() const = 0;
+       virtual void       update_length (framecnt_t cnt) = 0;
 
        virtual framepos_t natural_position() const { return 0; }
 
@@ -79,12 +77,11 @@ class Source : public SessionObject
        int set_state (const XMLNode&, int version);
 
        bool         destructive() const       { return (_flags & Destructive); }
-       bool         writable () const         { return (_flags & Writable); }
+       bool         writable () const;
        virtual bool set_destructive (bool /*yn*/) { return false; }
        virtual bool length_mutable() const    { return false; }
 
        static PBD::Signal1<void,Source*>             SourceCreated;
-       PBD::Signal1<void,boost::shared_ptr<Source> > Switched;
 
        bool has_been_analysed() const;
        virtual bool can_be_analysed() const { return false; }
@@ -102,24 +99,25 @@ 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:
        DataType            _type;
        Flag                _flags;
        time_t              _timestamp;
-       framepos_t           _timeline_position;
+       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:
        void fix_writable_flags ();