enough with umpteen "i18n.h" files. Consolidate on pbd/i18n.h

[ardour.git] / gtk2_ardour / time_selection.cc

diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc
index 551e8611765f26520b5365772a2a30b513fe1b24..2f40dcb8e4afe0a06c80f963193fa94660bb1caf 100644 (file)
--- 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,19 +15,19 @@
     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;
 
 AudioRange&
 TimeSelection::operator[] (uint32_t which)
@@ -37,8 +37,8 @@ TimeSelection::operator[] (uint32_t which)
                        return *i;
                }
        }
-       fatal << compose (_("programming error: request for non-existent audio range (%1)!"), which) << endmsg;
-       /*NOTREACHED*/
+       fatal << string_compose (_("programming error: request for non-existent audio range (%1)!"), which) << endmsg;
+       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;
@@ -66,16 +66,16 @@ TimeSelection::consolidate ()
        }
 
        return changed;
-}              
+}
 
-jack_nframes_t 
+framepos_t
 TimeSelection::start ()
 {
        if (empty()) {
                return 0;
        }
 
-       jack_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;
 }
 
-jack_nframes_t 
+framepos_t
 TimeSelection::end_frame ()
 {
-       jack_nframes_t last = 0;
+       framepos_t last = 0;
 
        /* XXX make this work like RegionSelection: no linear search needed */
 
@@ -100,9 +100,12 @@ TimeSelection::end_frame ()
        return last;
 }
 
-jack_nframes_t
+framecnt_t
 TimeSelection::length()
 {
+       if (empty()) {
+               return 0;
+       }
+
        return end_frame() - start() + 1;
 }
-