Mercurial > hg > svapp

changeset 465:1b4e5a567d58 3.0-integration

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch simple-fft-model
author Chris Cannam
date Wed, 01 Jul 2015 18:31:28 +0100
parents 83370e830c95 (current diff) 39ab248a4998 (diff)
children 85e7d2418d9a
files
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/audioio/AudioCallbackPlaySource.cpp	Fri Jun 26 14:14:31 2015 +0100
+++ b/audioio/AudioCallbackPlaySource.cpp	Wed Jul 01 18:31:28 2015 +0100
@@ -1288,7 +1288,7 @@
                       << got << " < " << reqd << ")" << endl;
         }
 
-        ts->process(m_stretcherInputs, got, false);
+        ts->process(m_stretcherInputs, size_t(got), false);
 
         fedToStretcher += got;
 
@@ -1300,7 +1300,7 @@
         }
     }
 
-    ts->retrieve(buffer, count);
+    ts->retrieve(buffer, size_t(count));
 
     for (int c = stretchChannels; c < getTargetChannelCount(); ++c) {
         for (int i = 0; i < count; ++i) {
@@ -1487,8 +1487,8 @@
 	SRC_DATA data;
 	data.data_in = intlv;
 	data.data_out = srcout;
-	data.input_frames = got;
-	data.output_frames = work;
+	data.input_frames = long(got);
+	data.output_frames = long(work);
 	data.src_ratio = ratio;
 	data.end_of_input = 0;
 	
--- a/audioio/AudioPulseAudioTarget.cpp	Fri Jun 26 14:14:31 2015 +0100
+++ b/audioio/AudioPulseAudioTarget.cpp	Wed Jul 01 18:31:28 2015 +0100
@@ -259,7 +259,8 @@
               << nframes * tmpbufch * sizeof(float) << " bytes" << endl;
 #endif
 
-    pa_stream_write(m_stream, output, nframes * tmpbufch * sizeof(float),
+    pa_stream_write(m_stream, output,
+                    size_t(nframes * tmpbufch * sizeof(float)),
                     0, 0, PA_SEEK_RELATIVE);
 
     m_source->setOutputLevels(peakLeft, peakRight);