diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-04-18 21:29:48 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-04-18 21:29:48 +0000 |
| commit | 895bad1dcd817cb8ad32dc255a90271edd6659fb (patch) | |
| tree | 1385c5880cd9958bb2c6d189b6ff13ae4c43be74 /libs/ardour/ardour/location.h | |
| parent | d9cac66b5d7f76a78b1ae1442a275516ef710bc9 (diff) | |
Make the session start/end location a single location (with start and end) rather than two separate ones. Fixes #1298.
git-svn-id: svn://localhost/ardour2/branches/3.0@6929 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/location.h')
| -rw-r--r-- | libs/ardour/ardour/location.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index 938177b102..c0711e0c9b 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -46,9 +46,8 @@ class Location : public PBD::StatefulDestructible IsAutoLoop = 0x4, IsHidden = 0x8, IsCDMarker = 0x10, - IsEnd = 0x20, - IsRangeMarker = 0x40, - IsStart = 0x80 + IsRangeMarker = 0x20, + IsSessionRange = 0x40 }; Location (nframes64_t sample_start, @@ -94,8 +93,7 @@ class Location : public PBD::StatefulDestructible void set_auto_loop (bool yn, void *src); void set_hidden (bool yn, void *src); void set_cd (bool yn, void *src); - void set_is_end (bool yn, void* src); - void set_is_start (bool yn, void* src); + void set_is_session_range (bool yn, void* src); void set_is_range_marker (bool yn, void* src); bool is_auto_punch () const { return _flags & IsAutoPunch; } @@ -103,8 +101,7 @@ class Location : public PBD::StatefulDestructible 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_session_range () const { return _flags & IsSessionRange; } bool is_range_marker() const { return _flags & IsRangeMarker; } bool matches (Flags f) const { return _flags & f; } @@ -159,8 +156,7 @@ class Locations : public PBD::StatefulDestructible Location* auto_loop_location () const; Location* auto_punch_location () const; - Location* end_location() const; - Location* start_location() const; + Location* session_range_location() const; int next_available_name(std::string& result,std::string base); uint32_t num_range_markers() const; |