chris goddard's region list patch; port 2.X marker drag/move changes to 3.0; compilat...

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

diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h
index 57e13de5af3542ba1f9d3d5e338206ceb84f53e6..d5b672a89d00fe95b9e6bea75032eb1ea0e36faa 100644 (file)
--- a/libs/ardour/ardour/location.h
+++ b/libs/ardour/ardour/location.h
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #ifndef __ardour_location_h__
@@ -63,26 +62,34 @@ class Location : public PBD::StatefulDestructible
                : _name (name),
                _start (sample_start),
                _end (sample_end),
-               _flags (bits) { }
+               _flags (bits),
+               _locked (false) { }
        
        Location () {
                _start = 0;
                _end = 0;
                _flags = Flags (0);
+               _locked = false;
        }
 
        Location (const Location& other);
        Location (const XMLNode&);
        Location* operator= (const Location& other);
 
-       nframes_t start() { return _start; }
-       nframes_t end() { return _end; }
-       nframes_t length() { return _end - _start; }
+       bool locked() const { return _locked; }
+       void lock() { _locked = true; changed (this); }
+       void unlock() { _locked = false; changed (this); }
+       
+       nframes_t start() const  { return _start; }
+       nframes_t end() const { return _end; }
+       nframes_t length() const { return _end - _start; }
 
        int set_start (nframes_t s);
        int set_end (nframes_t e);
        int set (nframes_t start, nframes_t end);
 
+       int move_to (nframes_t pos);
+
        const string& name() { return _name; }
        void set_name (const string &str) { _name = str; name_changed(this); }
 
@@ -93,14 +100,15 @@ class Location : public PBD::StatefulDestructible
        void set_is_end (bool yn, void* src);
        void set_is_start (bool yn, void* src);
 
-       bool is_auto_punch ()  { return _flags & IsAutoPunch; }
-       bool is_auto_loop () { return _flags & IsAutoLoop; }
-       bool is_mark () { return _flags & IsMark; }
-       bool is_hidden () { return _flags & IsHidden; }
-       bool is_cd_marker () { return _flags & IsCDMarker; }
-       bool is_end() { return _flags & IsEnd; }
-       bool is_start() { return _flags & IsStart; }
-       bool is_range_marker() { return _flags & IsRangeMarker; }
+       bool is_auto_punch () const { return _flags & IsAutoPunch; }
+       bool is_auto_loop () const { return _flags & IsAutoLoop; }
+       bool is_mark () const { return _flags & IsMark; }
+       bool is_hidden () const { return _flags & IsHidden; }
+       bool is_cd_marker () const { return _flags & IsCDMarker; }
+       bool is_end() const { return _flags & IsEnd; }
+       bool is_start() const { return _flags & IsStart; }
+       bool is_range_marker() const { return _flags & IsRangeMarker; }
+       bool matches (Flags f) const { return _flags & f; }
 
        sigc::signal<void,Location*> name_changed;
        sigc::signal<void,Location*> end_changed;
@@ -125,6 +133,7 @@ class Location : public PBD::StatefulDestructible
        nframes_t     _start;
        nframes_t     _end;
        Flags         _flags;
+       bool          _locked;
 
        void set_mark (bool yn);
        bool set_flag_internal (bool yn, Flags flag);
@@ -137,6 +146,8 @@ class Locations : public PBD::StatefulDestructible
 
        Locations ();
        ~Locations ();
+       
+       const LocationList& list() { return locations; }
 
        void add (Location *, bool make_current = false);
        void remove (Location *);
@@ -159,11 +170,13 @@ class Locations : public PBD::StatefulDestructible
        int set_current (Location *, bool want_lock = true);
        Location *current () const { return current_location; }
 
-       Location *first_location_before (nframes_t);
-       Location *first_location_after (nframes_t);
+       Location *first_location_before (nframes_t, bool include_special_ranges = false);
+       Location *first_location_after (nframes_t, bool include_special_ranges = false);
+
+       nframes_t first_mark_before (nframes_t, bool include_special_ranges = false);
+       nframes_t first_mark_after (nframes_t, bool include_special_ranges = false);
 
-       nframes_t first_mark_before (nframes_t);
-       nframes_t first_mark_after (nframes_t);
+       void find_all_between (nframes64_t start, nframes64_t, LocationList&, Location::Flags);
 
        sigc::signal<void,Location*> current_changed;
        sigc::signal<void>           changed;
@@ -183,8 +196,8 @@ class Locations : public PBD::StatefulDestructible
 
   private:
 
-       LocationList       locations;
-       Location          *current_location;
+       LocationList         locations;
+       Location            *current_location;
        mutable Glib::Mutex  lock;
 
        int set_current_unlocked (Location *);