use ustring more; handle embedding of "paired" files as per mantis #1362

[ardour.git] / gtk2_ardour / time_selection.cc

diff --git a/gtk2_ardour/time_selection.cc b/gtk2_ardour/time_selection.cc
index 518e04cccb3056647415cb72c85a90ad8af8ac1b..c0a05abc458ff13fa2edb0fad6425f5b8f0cfb86 100644 (file)
--- a/gtk2_ardour/time_selection.cc
+++ b/gtk2_ardour/time_selection.cc
@@ -69,14 +69,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) {
@@ -86,10 +86,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 */
 
@@ -101,7 +101,7 @@ TimeSelection::end_frame ()
        return last;
 }
 
-jack_nframes_t
+nframes_t
 TimeSelection::length()
 {
        return end_frame() - start() + 1;