#include <algorithm>
#include "pbd/error.h"
-#include "ardour/ardour.h"
+#include "ardour/types.h"
#include "time_selection.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace ARDOUR;
using namespace PBD;
}
}
fatal << string_compose (_("programming error: request for non-existent audio range (%1)!"), which) << endmsg;
- /*NOTREACHED*/
+ abort(); /*NOTREACHED*/
return *(new AudioRange(0,0,0)); /* keep the compiler happy; never called */
}
continue;
}
- if ((*a).coverage ((*b).start, (*b).end) != OverlapNone) {
- (*a).start = std::min ((*a).start, (*b).start);
- (*a).end = std::max ((*a).end, (*b).end);
+ if (a->coverage (b->start, b->end) != Evoral::OverlapNone) {
+ a->start = std::min (a->start, b->start);
+ a->end = std::max (a->end, b->end);
erase (b);
changed = true;
goto restart;
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) {
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 */
return last;
}
-nframes_t
+framecnt_t
TimeSelection::length()
{
+ if (empty()) {
+ return 0;
+ }
+
return end_frame() - start() + 1;
}
-