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

diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc
index 518e04cccb..ba9918d116 100644
--- a/gtk2_ardour/time_selection.cc
+++ b/gtk2_ardour/time_selection.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2003-2004 Paul Davis 
+    Copyright (C) 2003-2004 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -15,17 +15,16 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <algorithm>
 
-#include <pbd/error.h>
-#include <ardour/ardour.h>
+#include "pbd/error.h"
+#include "ardour/types.h"
 
 #include "time_selection.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
@@ -39,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 */
 }
 
@@ -56,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;
@@ -67,16 +66,16 @@ TimeSelection::consolidate ()
 	}
 
 	return changed;
-}		
+}
 
-jack_nframes_t 
+samplepos_t
 TimeSelection::start ()
 {
 	if (empty()) {
 		return 0;
 	}
 
-	jack_nframes_t first = max_frames;
+	samplepos_t first = max_samplepos;
 
 	for (std::list<AudioRange>::iterator i = begin(); i != end(); ++i) {
 		if ((*i).start < first) {
@@ -86,10 +85,10 @@ TimeSelection::start ()
 	return first;
 }
 
-jack_nframes_t 
-TimeSelection::end_frame ()
+samplepos_t
+TimeSelection::end_sample ()
 {
-	jack_nframes_t last = 0;
+	samplepos_t last = 0;
 
 	/* XXX make this work like RegionSelection: no linear search needed */
 
@@ -101,9 +100,12 @@ TimeSelection::end_frame ()
 	return last;
 }
 
-jack_nframes_t
+samplecnt_t
 TimeSelection::length()
 {
-	return end_frame() - start() + 1;
+	if (empty()) {
+		return 0;
+	}
+
+	return end_sample() - start() + 1;
 }
-