Merge branch 'master' into windows

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

diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h
index 414f332b5e02e430e51643a4a263cb0db90dd5a3..bb42df1b5840f4c9e6a186459ac5f169c873f8ee 100644 (file)
--- a/libs/ardour/ardour/location.h
+++ b/libs/ardour/ardour/location.h
@@ -56,6 +56,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 ();
@@ -159,8 +161,8 @@ 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);
+        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;