author | llornkcor <llornkcor> | 2002-04-21 03:39:22 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-21 03:39:22 (UTC) |
commit | e22eee22120129209bf91c91bd3176f977c75493 (patch) (side-by-side diff) | |
tree | d11225387cde06f3c22019f7ea6837b4a2d1ffe7 | |
parent | 6818807a46b80774de328b4c3001d4bc9d788666 (diff) | |
download | opie-e22eee22120129209bf91c91bd3176f977c75493.zip opie-e22eee22120129209bf91c91bd3176f977c75493.tar.gz opie-e22eee22120129209bf91c91bd3176f977c75493.tar.bz2 |
REALLY fixed when playing stream..., stopped stream
-rw-r--r-- | core/multimedia/opieplayer/loopcontrol.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp index 45c2d3e..15175d0 100644 --- a/core/multimedia/opieplayer/loopcontrol.cpp +++ b/core/multimedia/opieplayer/loopcontrol.cpp @@ -218,64 +218,66 @@ void LoopControl::startVideo() { } void LoopControl::startAudio() { //qDebug("start audio"); audioMutex->lock(); if ( moreAudio ) { if ( !isMuted && mediaPlayerState->curDecoder() ) { currentSample = audioSampleCounter + 1; if ( currentSample != audioSampleCounter + 1 ) qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter); long samplesRead = 0; bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream ); long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000; long sampleWaitTime = currentSample - sampleWeShouldBeAt; // this causes drop outs not sure why its even here // if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { // usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); // } // else if ( sampleWaitTime <= -5000 ) { // qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); // //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); // currentSample = sampleWeShouldBeAt; // } audioDevice->write( audioBuffer, samplesRead * 2 * channels ); + if( mediaPlayerState->isStreaming == FALSE); + audioSampleCounter = currentSample + samplesRead - 1; moreAudio = readOk && (audioSampleCounter <= total_audio_samples); } else { moreAudio = FALSE; } } audioMutex->unlock(); } void LoopControl::killTimers() { audioMutex->lock(); if ( hasVideoChannel ) killTimer( videoId ); killTimer( sliderId ); threadOkToGo = FALSE; audioMutex->unlock(); } void LoopControl::startTimers() { audioMutex->lock(); |