Respond to MMC even when synced to JACK. Fixes #3700.

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

diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h
index 6f750e6fd00573b1523ce880c35623cbc5f7d576..64dd88d094fd5492326715a0816fbe2c327d0e39 100644 (file)
--- a/libs/ardour/ardour/source.h
+++ b/libs/ardour/ardour/source.h
@@ -64,7 +64,7 @@ class Source : public SessionObject
        virtual framecnt_t length (framepos_t pos) const = 0;
        virtual void       update_length (framepos_t pos, framecnt_t cnt) = 0;
 
-       virtual const Glib::ustring& path() const = 0;
+       virtual const std::string& path() const = 0;
 
        virtual framepos_t natural_position() const { return 0; }
 
@@ -84,7 +84,6 @@ class Source : public SessionObject
        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; }
@@ -97,16 +96,16 @@ class Source : public SessionObject
        std::string get_transients_path() const;
        int load_transients (const std::string&);
 
-       sframes_t    timeline_position() const { return _timeline_position; }
-       virtual void set_timeline_position (sframes_t pos);
+       framepos_t    timeline_position() const { return _timeline_position; }
+       virtual void set_timeline_position (framepos_t pos);
 
        void set_allow_remove_if_empty (bool yn);
 
        Glib::Mutex& mutex()       { return _lock; }
        Flag         flags() const { return _flags; }
 
-        void inc_use_count () { g_atomic_int_inc (&_use_count); }
-        void dec_use_count ();
+        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; }
 
@@ -114,7 +113,7 @@ class Source : public SessionObject
        DataType            _type;
        Flag                _flags;
        time_t              _timestamp;
-       sframes_t           _timeline_position;
+       framepos_t           _timeline_position;
        bool                _analysed;
        mutable Glib::Mutex _lock;
        mutable Glib::Mutex _analysis_lock;