X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_selection.cc;h=ba9918d1165bf9ea6476d01b977d5a21fe778972;hb=d6b5c23579dc02d2f98fc1f48bf038c1070057fb;hp=19fc321f785a5378f0899f1d625841cabdd52133;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc
index 19fc321f78..ba9918d116 100644
--- a/gtk2_ardour/time_selection.cc
+++ b/gtk2_ardour/time_selection.cc
@@ -20,11 +20,11 @@
 #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;
@@ -38,7 +38,7 @@ TimeSelection::operator[] (uint32_t which)
 		}
 	}
 	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 */
 }
 
@@ -55,9 +55,9 @@ TimeSelection::consolidate ()
 				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;
@@ -68,14 +68,14 @@ TimeSelection::consolidate ()
 	return changed;
 }
 
-nframes_t
+samplepos_t
 TimeSelection::start ()
 {
 	if (empty()) {
 		return 0;
 	}
 
-	nframes_t first = max_frames;
+	samplepos_t first = max_samplepos;
 
 	for (std::list<AudioRange>::iterator i = begin(); i != end(); ++i) {
 		if ((*i).start < first) {
@@ -85,10 +85,10 @@ TimeSelection::start ()
 	return first;
 }
 
-nframes_t
-TimeSelection::end_frame ()
+samplepos_t
+TimeSelection::end_sample ()
 {
-	nframes_t last = 0;
+	samplepos_t last = 0;
 
 	/* XXX make this work like RegionSelection: no linear search needed */
 
@@ -100,9 +100,12 @@ TimeSelection::end_frame ()
 	return last;
 }
 
-nframes_t
+samplecnt_t
 TimeSelection::length()
 {
-	return end_frame() - start() + 1;
-}
+	if (empty()) {
+		return 0;
+	}
 
+	return end_sample() - start() + 1;
+}