Merged with trunk R992.

[ardour.git] / libs / ardour / session_timefx.cc

diff --git a/libs/ardour/session_timefx.cc b/libs/ardour/session_timefx.cc
index b5b143514c21dd0b2e7f01b86c6c3529b008c325..69a42ec8b89755f8aca857b3071986ed8c3c66d3 100644 (file)
--- a/libs/ardour/session_timefx.cc
+++ b/libs/ardour/session_timefx.cc
@@ -48,8 +48,8 @@ Session::tempoize_region (TimeStretchRequest& tsr)
        string region_name;
        string ident = X_("-TIMEFX-");
        float percentage;
-       jack_nframes_t total_frames;
-       jack_nframes_t done;
+       nframes_t total_frames;
+       nframes_t done;
 
        /* the soundtouch code wants a *tempo* change percentage, which is 
           of opposite sign to the length change.  
@@ -91,13 +91,13 @@ Session::tempoize_region (TimeStretchRequest& tsr)
        }
        
        try {
-               const jack_nframes_t bufsize = 16384;
+               const nframes_t bufsize = 16384;
 
                for (uint32_t i = 0; i < sources.size(); ++i) {
                        gain_t gain_buffer[bufsize];
                        Sample buffer[bufsize];
-                       jack_nframes_t pos = 0;
-                       jack_nframes_t this_read = 0;
+                       nframes_t pos = 0;
+                       nframes_t this_read = 0;
 
                        boost::shared_ptr<AudioSource> asrc = boost::dynamic_pointer_cast<AudioSource>(sources[i]);
                        if (!asrc) {
@@ -107,7 +107,7 @@ Session::tempoize_region (TimeStretchRequest& tsr)
 
                        st.clear();
                        while (tsr.running && pos < tsr.region->length()) {
-                               jack_nframes_t this_time;
+                               nframes_t this_time;
                        
                                this_time = min (bufsize, tsr.region->length() - pos);