From 997e4b1f9cd7ccfc704b7c035051da7f60d831e7 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Mon, 17 Mar 2008 20:54:03 +0000 Subject: merge with 2.0-ongoing @ rev 3147 git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/resampled_source.cc | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'libs/ardour/resampled_source.cc') diff --git a/libs/ardour/resampled_source.cc b/libs/ardour/resampled_source.cc index b5d23fb4a2..083fde95a1 100644 --- a/libs/ardour/resampled_source.cc +++ b/libs/ardour/resampled_source.cc @@ -26,15 +26,14 @@ 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 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. */ @@ -58,7 +57,7 @@ ResampledImportableSource::ResampledImportableSource (const std::string& path, 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 (); } @@ -70,7 +69,7 @@ ResampledImportableSource::ResampledImportableSource (const std::string& path, 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]; } @@ -90,22 +89,22 @@ ResampledImportableSource::read (Sample* output, nframes_t nframes) if (src_data.input_frames == 0) { - src_data.input_frames = ImportableSource::read (input, blocksize); + 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 /= sf_info.channels; - src_data.data_in = input ; + src_data.input_frames /= source->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; } @@ -121,9 +120,9 @@ ResampledImportableSource::read (Sample* output, nframes_t nframes) 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(); } -- cgit v1.2.3