# HG changeset patch
# User Chris Cannam
# Date 1420652541 0
# Node ID 39ab248a49989ebecf87a072390b564f9306b7a1
# Parent  1020db1698c01ab04851fcb583e9e26a0bad7c1f# Parent  ad998a2fe9e286113edd3e2f2cfa70b835b3f7e9
Merge from default branch

diff -r 1020db1698c0 -r 39ab248a4998 audioio/AudioCallbackPlaySource.cpp
--- a/audioio/AudioCallbackPlaySource.cpp	Mon Jun 15 14:35:27 2015 +0100
+++ b/audioio/AudioCallbackPlaySource.cpp	Wed Jan 07 17:42:21 2015 +0000
@@ -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;
 	
diff -r 1020db1698c0 -r 39ab248a4998 audioio/AudioPulseAudioTarget.cpp
--- a/audioio/AudioPulseAudioTarget.cpp	Mon Jun 15 14:35:27 2015 +0100
+++ b/audioio/AudioPulseAudioTarget.cpp	Wed Jan 07 17:42:21 2015 +0000
@@ -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);