Update of /cvsroot/audacity/audacity-src/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv6460/src
Modified Files:
AudioIO.cpp
Log Message:
Provides "some" latency correction when using portaudio v19.
Index: AudioIO.cpp
===================================================================
RCS file: /cvsroot/audacity/audacity-src/src/AudioIO.cpp,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- AudioIO.cpp 10 Aug 2006 10:34:36 -0000 1.141
+++ AudioIO.cpp 27 Aug 2006 00:18:00 -0000 1.142
@@ -186,6 +186,7 @@
mLastPaError = paNoError;
+ mLastRecordingOffset = 0.0;
mNumCaptureChannels = 0;
mPaused = false;
mPlayLooped = false;
@@ -1207,7 +1208,7 @@
{
#if USE_PORTAUDIO_V19
if( mPortStreamV19 )
- return Pa_IsStreamActive( mPortStreamV19 );
+ return Pa_IsStreamActive( mPortStreamV19 ) != 0;
else
return false;
#else
@@ -1959,8 +1960,12 @@
// but follow the leader.
if (numCaptureChannels > 0 && numPlaybackChannels > 0 &&
timeInfo->inputBufferAdcTime > 0)
gAudioIO->mLastRecordingOffset = timeInfo->inputBufferAdcTime -
timeInfo->outputBufferDacTime;
- else
- gAudioIO->mLastRecordingOffset = 0;
+ else {
+ if (gAudioIO->mLastRecordingOffset == 0.0) {
+ const PaStreamInfo* si = Pa_GetStreamInfo(
gAudioIO->mPortStreamV19 );
+ gAudioIO->mLastRecordingOffset = -si->inputLatency;
+ }
+ }
#else
if (numCaptureChannels > 0 && numPlaybackChannels > 0)
gAudioIO->mLastRecordingOffset =
(Pa_StreamTime(gAudioIO->mPortStreamV18) - outTime) / gAudioIO->mRate;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
