Selection of visible note range (full range vs fit contents, selectable from midi...

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

diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h
index 94f70bb4e8ecf02fcf249eeca8f0619883975f48..6625b7dbf5b384307a5954952a86814aa4f1fbc6 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__
@@ -68,7 +67,7 @@ class Location : public PBD::StatefulDestructible
        Location () {
                _start = 0;
                _end = 0;
-               _flags = 0;     
+               _flags = Flags (0);
        }
 
        Location (const Location& other);
@@ -124,7 +123,7 @@ class Location : public PBD::StatefulDestructible
        string        _name;
        nframes_t     _start;
        nframes_t     _end;
-       uint32_t _flags;
+       Flags         _flags;
 
        void set_mark (bool yn);
        bool set_flag_internal (bool yn, Flags flag);
@@ -153,16 +152,17 @@ class Locations : public PBD::StatefulDestructible
        Location* end_location() const;
        Location* start_location() const;
 
+       int next_available_name(string& result,string base);
        uint32_t num_range_markers() const;
 
        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);
-       nframes_t first_mark_after (nframes_t);
+       nframes_t first_mark_before (nframes_t, bool include_special_ranges = false);
+       nframes_t first_mark_after (nframes_t, bool include_special_ranges = false);
 
        sigc::signal<void,Location*> current_changed;
        sigc::signal<void>           changed;