diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 16:24:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-09-17 16:24:22 +0000 |
| commit | 10bdce85a0e7381d1b5db38e3640600c6fd3ec79 (patch) | |
| tree | 5e6fd6a2e69e972ada31018cbe6761e5ec5c77a7 /libs/ardour/location.cc | |
| parent | e84c3fe5552bc5cf2ed23812c41e7e3b19fbdb84 (diff) | |
megaopus commit: (1) add __STD_(LIMIT|FORMAT)_MACROS to command line flags for cc and c++ builds, remove them from source (2) add new Property::midi_data used by MidiRegion to signal that its (MIDI) contents have changed (3) massive switch from nframes_t to framepos_t/framecnt_t including removal of ARDOUR::max_frames (replaced by ARDOUR::max_frame{pos,cnt} (lots more to do but this set was driven by changes to the Diskstream API to use framepos_t
git-svn-id: svn://localhost/ardour2/branches/3.0@7791 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/location.cc')
| -rw-r--r-- | libs/ardour/location.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index ddf95b1649..ad6fd1859d 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -901,13 +901,13 @@ Locations::first_location_after (nframes64_t frame, bool include_special_ranges) * side of a frame. Note that if frame is exactly on a `mark', that mark will not be considered for returning * as before/after. * @param frame Frame to look for. - * @param before Filled in with the position of the last `mark' before `frame' (or max_frames if none exists) - * @param after Filled in with the position of the next `mark' after `frame' (or max_frames if none exists) + * @param before Filled in with the position of the last `mark' before `frame' (or max_framepos if none exists) + * @param after Filled in with the position of the next `mark' after `frame' (or max_framepos if none exists) */ void Locations::marks_either_side (nframes64_t const frame, nframes64_t& before, nframes64_t& after) const { - before = after = max_frames; + before = after = max_framepos; LocationList locs; |