author | llornkcor <llornkcor> | 2002-06-17 12:54:54 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-06-17 12:54:54 (UTC) |
commit | 282007e58a8a038a0db042341528510e73ac80fc (patch) (unidiff) | |
tree | f1a16c9a6a380bdc4217e9f92ac6ef6128d10717 /core/multimedia/opieplayer/loopcontrol.cpp | |
parent | 2917d7481dc8c1b053e3212a699e64948a90ec4c (diff) | |
download | opie-282007e58a8a038a0db042341528510e73ac80fc.zip opie-282007e58a8a038a0db042341528510e73ac80fc.tar.gz opie-282007e58a8a038a0db042341528510e73ac80fc.tar.bz2 |
fixes for goofy crap going on
Diffstat (limited to 'core/multimedia/opieplayer/loopcontrol.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/loopcontrol.cpp | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp index 3171c4b..70e4a78 100644 --- a/core/multimedia/opieplayer/loopcontrol.cpp +++ b/core/multimedia/opieplayer/loopcontrol.cpp | |||
@@ -155,3 +155,3 @@ void LoopControl::setPosition( long pos ) { | |||
155 | audioMutex->lock(); | 155 | audioMutex->lock(); |
156 | 156 | // qDebug("Loop control %d", pos); | |
157 | if ( hasVideoChannel && hasAudioChannel ) { | 157 | if ( hasVideoChannel && hasAudioChannel ) { |
@@ -222,3 +222,2 @@ void LoopControl::startAudio() { | |||
222 | 222 | ||
223 | //qDebug("start audio"); | ||
224 | audioMutex->lock(); | 223 | audioMutex->lock(); |
@@ -239,10 +238,10 @@ void LoopControl::startAudio() { | |||
239 | // this causes drop outs not sure why its even here | 238 | // this causes drop outs not sure why its even here |
240 | if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { | 239 | // if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) { |
241 | usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); | 240 | // usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) ); |
242 | } | 241 | // } |
243 | else if ( sampleWaitTime <= -5000 ) { | 242 | // else if ( sampleWaitTime <= -5000 ) { |
244 | qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); | 243 | // qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt ); |
245 | // //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); | 244 | // // //mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream ); |
246 | currentSample = sampleWeShouldBeAt; | 245 | // currentSample = sampleWeShouldBeAt; |
247 | } | 246 | // } |
248 | 247 | ||
@@ -347,4 +346,6 @@ void LoopControl::stop( bool willPlayAgainShortly ) { | |||
347 | audioMutex->unlock(); | 346 | audioMutex->unlock(); |
348 | |||
349 | } | 347 | } |
348 | audioSampleCounter=0; | ||
349 | current_frame=0; | ||
350 | total_audio_samples=0; | ||
350 | } | 351 | } |
@@ -354,3 +355,2 @@ bool LoopControl::init( const QString& filename ) { | |||
354 | stop(); | 355 | stop(); |
355 | |||
356 | audioMutex->lock(); | 356 | audioMutex->lock(); |
@@ -452,2 +452,4 @@ void LoopControl::play() { | |||
452 | qDebug("LC- play"); | 452 | qDebug("LC- play"); |
453 | mediaPlayerState->setPosition( 0); //uglyhack | ||
454 | |||
453 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 455 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |