summaryrefslogtreecommitdiff
path: root/gtk2_ardour/time_selection.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2010-09-17 16:24:22 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2010-09-17 16:24:22 +0000
commit10bdce85a0e7381d1b5db38e3640600c6fd3ec79 (patch)
tree5e6fd6a2e69e972ada31018cbe6761e5ec5c77a7 /gtk2_ardour/time_selection.cc
parente84c3fe5552bc5cf2ed23812c41e7e3b19fbdb84 (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 'gtk2_ardour/time_selection.cc')
-rw-r--r--gtk2_ardour/time_selection.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc
index 185c7e1eea..064e654cff 100644
--- a/gtk2_ardour/time_selection.cc
+++ b/gtk2_ardour/time_selection.cc
@@ -68,14 +68,14 @@ TimeSelection::consolidate ()
return changed;
}
-nframes_t
+framepos_t
TimeSelection::start ()
{
if (empty()) {
return 0;
}
- nframes_t first = max_frames;
+ framepos_t first = max_framepos;
for (std::list<AudioRange>::iterator i = begin(); i != end(); ++i) {
if ((*i).start < first) {
@@ -85,10 +85,10 @@ TimeSelection::start ()
return first;
}
-nframes_t
+framepos_t
TimeSelection::end_frame ()
{
- nframes_t last = 0;
+ framepos_t last = 0;
/* XXX make this work like RegionSelection: no linear search needed */
@@ -100,7 +100,7 @@ TimeSelection::end_frame ()
return last;
}
-nframes_t
+framecnt_t
TimeSelection::length()
{
return end_frame() - start() + 1;