X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_selection.cc;h=064e654cff21cda513fb29bcac6433d518f2e875;hb=dadee4622d15218e0190b72797897fbb7b247711;hp=eac7bd70f54ebf0dbf4f6caf01462ba40729581d;hpb=99904735e066804358f1d0bd138a84f1e9ecda91;p=ardour.git

diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc
index eac7bd70f5..064e654cff 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
@@ -19,8 +19,8 @@
 
 #include <algorithm>
 
-#include <pbd/error.h>
-#include <ardour/ardour.h>
+#include "pbd/error.h"
+#include "ardour/ardour.h"
 
 #include "time_selection.h"
 
@@ -66,16 +66,16 @@ 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,9 +100,8 @@ TimeSelection::end_frame ()
 	return last;
 }
 
-nframes_t
+framecnt_t
 TimeSelection::length()
 {
 	return end_frame() - start() + 1;
 }
-