Merge branch 'cairocanvas' of git.ardour.org:ardour/ardour into cairocanvas

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

diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h
index 9639d9a34d0ceb9a149559dc093d47a842f8a179..6cea208f05014e7af62c40147d758ed7c747aa9a 100644 (file)
--- a/libs/ardour/ardour/location.h
+++ b/libs/ardour/ardour/location.h
@@ -27,18 +27,21 @@
 
 #include <sys/types.h>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "pbd/undo.h"
 #include "pbd/stateful.h"
 #include "pbd/statefuldestructible.h"
 
 #include "ardour/ardour.h"
+#include "ardour/scene_change.h"
 #include "ardour/session_handle.h"
 
 namespace ARDOUR {
 
-class Location : public SessionHandleRef, public PBD::StatefulDestructible
+class SceneChange;
+
+class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDestructible
 {
   public:
        enum Flags {
@@ -56,6 +59,8 @@ class Location : public SessionHandleRef, public PBD::StatefulDestructible
        Location (const Location& other);
        Location (Session &, const XMLNode&);
        Location* operator= (const Location& other);
+    
+        bool operator==(const Location& other);
 
        bool locked() const { return _locked; }
        void lock ();
@@ -63,7 +68,7 @@ class Location : public SessionHandleRef, public PBD::StatefulDestructible
 
        framepos_t start() const  { return _start; }
        framepos_t end() const { return _end; }
-       framepos_t length() const { return _end - _start; }
+       framecnt_t length() const { return _end - _start; }
 
        int set_start (framepos_t s, bool force = false, bool allow_bbt_recompute = true);
        int set_end (framepos_t e, bool force = false, bool allow_bbt_recompute = true);
@@ -91,6 +96,9 @@ class Location : public SessionHandleRef, public PBD::StatefulDestructible
 
        Flags flags () const { return _flags; }
 
+       boost::shared_ptr<SceneChange> scene_change() const { return _scene_change; }
+       void set_scene_change (boost::shared_ptr<SceneChange>);
+
        PBD::Signal1<void,Location*> name_changed;
        PBD::Signal1<void,Location*> end_changed;
        PBD::Signal1<void,Location*> start_changed;
@@ -114,6 +122,8 @@ class Location : public SessionHandleRef, public PBD::StatefulDestructible
        void set_position_lock_style (PositionLockStyle ps);
        void recompute_frames_from_bbt ();
 
+       static PBD::Signal0<void> scene_changed;
+
   private:
        std::string        _name;
        framepos_t         _start;
@@ -123,13 +133,14 @@ class Location : public SessionHandleRef, public PBD::StatefulDestructible
        Flags              _flags;
        bool               _locked;
        PositionLockStyle  _position_lock_style;
+       boost::shared_ptr<SceneChange> _scene_change;
 
        void set_mark (bool yn);
        bool set_flag_internal (bool yn, Flags flag);
        void recompute_bbt_from_frames ();
 };
 
-class Locations : public SessionHandleRef, public PBD::StatefulDestructible
+class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDestructible
 {
   public:
        typedef std::list<Location *> LocationList;
@@ -147,7 +158,7 @@ class Locations : public SessionHandleRef, public PBD::StatefulDestructible
 
        XMLNode& get_state (void);
        int set_state (const XMLNode&, int version);
-        Location *get_location_by_id(PBD::ID);
+       Location *get_location_by_id(PBD::ID);
 
        Location* auto_loop_location () const;
        Location* auto_punch_location () const;
@@ -159,8 +170,10 @@ class Locations : public SessionHandleRef, public PBD::StatefulDestructible
        int set_current (Location *, bool want_lock = true);
        Location *current () const { return current_location; }
 
-       Location* first_location_before (framepos_t, bool include_special_ranges = false);
-       Location* first_location_after (framepos_t, bool include_special_ranges = false);
+       Location* mark_at (framepos_t, framecnt_t slop = 0) const;
+
+        framepos_t first_mark_before (framepos_t, bool include_special_ranges = false);
+       framepos_t first_mark_after (framepos_t, bool include_special_ranges = false);
 
        void marks_either_side (framepos_t const, framepos_t &, framepos_t &) const;
 
@@ -181,12 +194,12 @@ class Locations : public SessionHandleRef, public PBD::StatefulDestructible
        PBD::Signal1<void,const PBD::PropertyChange&>    StateChanged;
 
        template<class T> void apply (T& obj, void (T::*method)(LocationList&)) {
-               Glib::Mutex::Lock lm (lock);
+               Glib::Threads::Mutex::Lock lm (lock);
                (obj.*method)(locations);
        }
 
        template<class T1, class T2> void apply (T1& obj, void (T1::*method)(LocationList&, T2& arg), T2& arg) {
-               Glib::Mutex::Lock lm (lock);
+               Glib::Threads::Mutex::Lock lm (lock);
                (obj.*method)(locations, arg);
        }
 
@@ -194,7 +207,7 @@ class Locations : public SessionHandleRef, public PBD::StatefulDestructible
 
        LocationList         locations;
        Location            *current_location;
-       mutable Glib::Mutex  lock;
+       mutable Glib::Threads::Mutex  lock;
 
        int set_current_unlocked (Location *);
        void location_changed (Location*);