Mercurial > hg > svapp

diff audioio/AudioPortAudioTarget.cpp @ 450:d9d132c0e240 alignment_view

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from default branch
author Chris Cannam
date Mon, 20 Apr 2015 09:21:32 +0100
parents 72c662fe7ea3
children
line wrap: on
line diff
--- a/audioio/AudioPortAudioTarget.cpp	Fri Nov 28 10:33:25 2014 +0000
+++ b/audioio/AudioPortAudioTarget.cpp	Mon Apr 20 09:21:32 2015 +0100
@@ -52,7 +52,7 @@
     m_bufferSize = 2048;
     m_sampleRate = 44100;
     if (m_source && (m_source->getSourceSampleRate() != 0)) {
-	m_sampleRate = m_source->getSourceSampleRate();
+	m_sampleRate = int(m_source->getSourceSampleRate());
     }
 
     PaStreamParameters op;
@@ -185,7 +185,7 @@
 
 int
 AudioPortAudioTarget::process(const void *, void *outputBuffer,
-                              int nframes,
+                              sv_frame_t nframes,
                               const PaStreamCallbackTimeInfo *,
                               PaStreamCallbackFlags)
 {
@@ -244,7 +244,7 @@
 	}
     }
 	
-    int received = m_source->getSourceSamples(nframes, tmpbuf);
+    sv_frame_t received = m_source->getSourceSamples(nframes, tmpbuf);
 
     float peakLeft = 0.0, peakRight = 0.0;