Numerical sort patch from mantis #2654

[ardour.git] / gtk2_ardour / time_selection.cc

diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc
index 551e8611765f26520b5365772a2a30b513fe1b24..eac7bd70f54ebf0dbf4f6caf01462ba40729581d 100644 (file)
--- a/gtk2_ardour/time_selection.cc
+++ b/gtk2_ardour/time_selection.cc
@@ -15,7 +15,6 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #include <algorithm>
@@ -28,6 +27,7 @@
 #include "i18n.h"
 
 using namespace ARDOUR;
+using namespace PBD;
 
 AudioRange&
 TimeSelection::operator[] (uint32_t which)
@@ -37,7 +37,7 @@ TimeSelection::operator[] (uint32_t which)
                        return *i;
                }
        }
-       fatal << compose (_("programming error: request for non-existent audio range (%1)!"), which) << endmsg;
+       fatal << string_compose (_("programming error: request for non-existent audio range (%1)!"), which) << endmsg;
        /*NOTREACHED*/
        return *(new AudioRange(0,0,0)); /* keep the compiler happy; never called */
 }
@@ -68,14 +68,14 @@ TimeSelection::consolidate ()
        return changed;
 }              
 
-jack_nframes_t 
+nframes_t 
 TimeSelection::start ()
 {
        if (empty()) {
                return 0;
        }
 
-       jack_nframes_t first = max_frames;
+       nframes_t first = max_frames;
 
        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 
+nframes_t 
 TimeSelection::end_frame ()
 {
-       jack_nframes_t last = 0;
+       nframes_t last = 0;
 
        /* XXX make this work like RegionSelection: no linear search needed */
 
@@ -100,7 +100,7 @@ TimeSelection::end_frame ()
        return last;
 }
 
-jack_nframes_t
+nframes_t
 TimeSelection::length()
 {
        return end_frame() - start() + 1;