author | llornkcor <llornkcor> | 2002-05-30 00:14:35 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-05-30 00:14:35 (UTC) |
commit | 738c08d921cc12c9f6f7846e80889908dce06cc8 (patch) (unidiff) | |
tree | 83f38f243388afb2312a46073f36e8fca5b32b5c | |
parent | 32e4668771e3fc4aad674796e20e4a24d1d09331 (diff) | |
download | opie-738c08d921cc12c9f6f7846e80889908dce06cc8.zip opie-738c08d921cc12c9f6f7846e80889908dce06cc8.tar.gz opie-738c08d921cc12c9f6f7846e80889908dce06cc8.tar.bz2 |
fixed bug with mpeg3 not playing audio in videos
-rw-r--r-- | core/multimedia/opieplayer/loopcontrol.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp index 310d512..6f86b4a 100644 --- a/core/multimedia/opieplayer/loopcontrol.cpp +++ b/core/multimedia/opieplayer/loopcontrol.cpp | |||
@@ -371,26 +371,30 @@ bool LoopControl::init( const QString& filename ) { | |||
371 | 371 | ||
372 | if ( !mediaPlayerState->curDecoder()|| !mediaPlayerState->curDecoder()->open( filename ) ) { | 372 | if ( !mediaPlayerState->curDecoder()|| !mediaPlayerState->curDecoder()->open( filename ) ) { |
373 | audioMutex->unlock(); | 373 | audioMutex->unlock(); |
374 | return FALSE; | 374 | return FALSE; |
375 | } | 375 | } |
376 | 376 | ||
377 | hasAudioChannel = mediaPlayerState->curDecoder()->audioStreams() > 0; | 377 | hasAudioChannel = mediaPlayerState->curDecoder()->audioStreams() > 0; |
378 | hasVideoChannel = mediaPlayerState->curDecoder()->videoStreams() > 0; | 378 | hasVideoChannel = mediaPlayerState->curDecoder()->videoStreams() > 0; |
379 | 379 | ||
380 | if ( hasAudioChannel ) { | 380 | if ( hasAudioChannel ) { |
381 | int astream = 0; | 381 | int astream = 0; |
382 | 382 | ||
383 | channels = mediaPlayerState->curDecoder()->audioChannels( astream ); | 383 | if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMpeg3Plugin") ) |
384 | qDebug( "LC- channels = %d", channels ); | 384 | channels = 2; //dont akx me why, but it needs this hack |
385 | else | ||
386 | channels = mediaPlayerState->curDecoder()->audioChannels( astream ); | ||
387 | |||
388 | qDebug( "LC- channels = %d", channels ); | ||
385 | 389 | ||
386 | if ( !total_audio_samples ) | 390 | if ( !total_audio_samples ) |
387 | total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream ); | 391 | total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream ); |
388 | 392 | ||
389 | total_audio_samples += 1000; | 393 | total_audio_samples += 1000; |
390 | 394 | ||
391 | mediaPlayerState->setLength( total_audio_samples ); | 395 | mediaPlayerState->setLength( total_audio_samples ); |
392 | 396 | ||
393 | freq = mediaPlayerState->curDecoder()->audioFrequency( astream ); | 397 | freq = mediaPlayerState->curDecoder()->audioFrequency( astream ); |
394 | qDebug( "LC- frequency = %d", freq ); | 398 | qDebug( "LC- frequency = %d", freq ); |
395 | 399 | ||
396 | audioSampleCounter = 0; | 400 | audioSampleCounter = 0; |