comparison audioio/AudioPortAudioTarget.cpp @ 450:d9d132c0e240 alignment_view

Merge from default branch

     }
 
     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;
     op.device = Pa_GetDefaultOutputDevice();
     op.channelCount = 2;

     m_source->setTargetSampleRate(m_sampleRate);
 }
 
 int
 AudioPortAudioTarget::process(const void *, void *outputBuffer,
-                              int nframes,
+                              sv_frame_t nframes,
                               const PaStreamCallbackTimeInfo *,
                               PaStreamCallbackFlags)
 {
 #ifdef DEBUG_AUDIO_PORT_AUDIO_TARGET    
     SVDEBUG << "AudioPortAudioTarget::process(" << nframes << ")" << endl;

 	for (int i = 0; i < tmpbufch; ++i) {
 	    tmpbuf[i] = new float[tmpbufsz];
 	}
     }
 	
-    int received = m_source->getSourceSamples(nframes, tmpbuf);
+    sv_frame_t received = m_source->getSourceSamples(nframes, tmpbuf);
 
     float peakLeft = 0.0, peakRight = 0.0;
 
     for (int ch = 0; ch < 2; ++ch) {