diff options
| author | David Robillard <d@drobilla.net> | 2006-10-21 19:01:50 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2006-10-21 19:01:50 +0000 |
| commit | fedf3d34f32264ac57c6a222b678dc90f2bb1a88 (patch) | |
| tree | e816c676d12ccc32b7e666792b9a01ab5b5a0367 /gtk2_ardour/time_selection.cc | |
| parent | 7bd41538d951c3e476655df741adfbebbb990bde (diff) | |
Merged with trunk R992.
Completely untested other than it compiles, runs, and records somewhat (need to merge again).
git-svn-id: svn://localhost/ardour2/branches/midi@999 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_selection.cc')
| -rw-r--r-- | gtk2_ardour/time_selection.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc index 518e04cccb..c0a05abc45 100644 --- a/gtk2_ardour/time_selection.cc +++ b/gtk2_ardour/time_selection.cc @@ -69,14 +69,14 @@ TimeSelection::consolidate () return changed; } -jack_nframes_t +nframes_t TimeSelection::start () { if (empty()) { return 0; } - jack_nframes_t first = max_frames; + nframes_t first = max_frames; for (std::list<AudioRange>::iterator i = begin(); i != end(); ++i) { if ((*i).start < first) { @@ -86,10 +86,10 @@ TimeSelection::start () return first; } -jack_nframes_t +nframes_t TimeSelection::end_frame () { - jack_nframes_t last = 0; + nframes_t last = 0; /* XXX make this work like RegionSelection: no linear search needed */ @@ -101,7 +101,7 @@ TimeSelection::end_frame () return last; } -jack_nframes_t +nframes_t TimeSelection::length() { return end_frame() - start() + 1; |