add slave,transport and event debugging traces

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

diff --git a/libs/ardour/resampled_source.cc b/libs/ardour/resampled_source.cc
index 8330196d8abd24988353f427cef9c4149f84c730..57811312f15b5167ade5b0f46da18d0be9a4b8e7 100644 (file)
--- a/libs/ardour/resampled_source.cc
+++ b/libs/ardour/resampled_source.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2007 Paul Davis 
+    Copyright (C) 2007 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
@@ -17,28 +17,27 @@
 
 */
 
-#include <pbd/error.h>
-#include <ardour/resampled_source.h>
-#include <pbd/failed_constructor.h>
+#include "pbd/error.h"
+#include "ardour/resampled_source.h"
+#include "pbd/failed_constructor.h"
 
 #include "i18n.h"
 
 using namespace ARDOUR;
 using namespace PBD;
 
-const uint32_t ResampledImportableSource::blocksize = 4096U;
+const uint32_t ResampledImportableSource::blocksize = 16384U;
 
-ResampledImportableSource::ResampledImportableSource (const std::string& path,
-               nframes_t rate, SrcQuality srcq)
-       : ImportableSource (path) 
+ResampledImportableSource::ResampledImportableSource (boost::shared_ptr<ImportableSource> src, nframes_t rate, SrcQuality srcq)
+       : source (src)
 {
        int err;
-       
-       sf_seek (in.get(), 0, SEEK_SET) ;
-       
+
+       source->seek (0);
+
        /* Initialize the sample rate converter. */
-       
-       int src_type;
+
+       int src_type = SRC_SINC_BEST_QUALITY;
 
        switch (srcq) {
        case SrcBest:
@@ -57,21 +56,21 @@ ResampledImportableSource::ResampledImportableSource (const std::string& path,
                src_type = SRC_LINEAR;
                break;
        }
-       
-       if ((src_state = src_new (src_type, sf_info.channels, &err)) == 0) {    
+
+       if ((src_state = src_new (src_type, source->channels(), &err)) == 0) {
                error << string_compose(_("Import: src_new() failed : %1"), src_strerror (err)) << endmsg ;
                throw failed_constructor ();
        }
-       
+
        src_data.end_of_input = 0 ; /* Set this later. */
-       
+
        /* Start with zero to force load in while loop. */
-       
+
        src_data.input_frames = 0 ;
        src_data.data_in = input ;
-       
-       src_data.src_ratio = ((float) rate) / sf_info.samplerate ;
-       
+
+       src_data.src_ratio = ((float) rate) / source->samplerate();
+
        input = new float[blocksize];
 }
 
@@ -81,31 +80,31 @@ ResampledImportableSource::~ResampledImportableSource ()
        delete [] input;
 }
 
-nframes_t 
+nframes_t
 ResampledImportableSource::read (Sample* output, nframes_t nframes)
 {
        int err;
 
        /* If the input buffer is empty, refill it. */
-       
-       if (src_data.input_frames == 0) {       
 
-               src_data.input_frames = ImportableSource::read (input, blocksize);
+       if (src_data.input_frames == 0) {
+
+               src_data.input_frames = source->read (input, blocksize);
 
                /* The last read will not be a full buffer, so set end_of_input. */
 
                if ((nframes_t) src_data.input_frames < blocksize) {
-                       src_data.end_of_input = SF_TRUE ;
-               }               
+                       src_data.end_of_input = true;
+               }
+
+               src_data.input_frames /= source->channels();
+               src_data.data_in = input;
+       }
 
-               src_data.input_frames /= sf_info.channels;
-               src_data.data_in = input ;
-       } 
-       
        src_data.data_out = output;
 
        if (!src_data.end_of_input) {
-               src_data.output_frames = nframes / sf_info.channels ;
+               src_data.output_frames = nframes / source->channels();
        } else {
                src_data.output_frames = src_data.input_frames;
        }
@@ -113,17 +112,17 @@ ResampledImportableSource::read (Sample* output, nframes_t nframes)
        if ((err = src_process (src_state, &src_data))) {
                error << string_compose(_("Import: %1"), src_strerror (err)) << endmsg ;
                return 0 ;
-       } 
-       
+       }
+
        /* Terminate if at end */
-       
+
        if (src_data.end_of_input && src_data.output_frames_gen == 0) {
                return 0;
        }
-       
-       src_data.data_in += src_data.input_frames_used * sf_info.channels ;
+
+       src_data.data_in += src_data.input_frames_used * source->channels();
        src_data.input_frames -= src_data.input_frames_used ;
 
-       return src_data.output_frames_gen * sf_info.channels;
+       return src_data.output_frames_gen * source->channels();
 }