fixed bug with mpeg3 not playing audio in videos

1 files changed, 4 insertions, 0 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
@@ -335,97 +335,101 @@ void LoopControl::stop( bool willPlayAgainShortly ) {
 
   audioMutex->lock();
 
   mediaPlayerState->curDecoder()->close();
 
   if ( audioDevice ) {
       delete audioDevice;
       delete audioBuffer;
       audioDevice = 0;
       audioBuffer = 0;
   }
 
   audioMutex->unlock();
 
     }
 }
 
 
 bool LoopControl::init( const QString& filename ) {
     stop();
 
     audioMutex->lock();
 
     fileName = filename;
     stream = 0; // only play stream 0 for now
     current_frame = total_video_frames = total_audio_samples = 0;
     
     qDebug( "Using the %s decoder", mediaPlayerState->curDecoder()->pluginName() );
    
     // ### Hack to use libmpeg3plugin to get the number of audio samples if we are using the libmad plugin
     if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMadPlugin") ) {
         if ( mediaPlayerState->libMpeg3Decoder() && mediaPlayerState->libMpeg3Decoder()->open( filename )) {
             total_audio_samples = mediaPlayerState->libMpeg3Decoder()->audioSamples( 0 );
             mediaPlayerState->libMpeg3Decoder()->close();
         }
     }
     
     if ( !mediaPlayerState->curDecoder()|| !mediaPlayerState->curDecoder()->open( filename ) ) {
   audioMutex->unlock();
   return FALSE;
     }
 
     hasAudioChannel = mediaPlayerState->curDecoder()->audioStreams() > 0;
     hasVideoChannel = mediaPlayerState->curDecoder()->videoStreams() > 0;
 
     if ( hasAudioChannel ) {
   int astream = 0;
 
+    if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibMpeg3Plugin") )
+        channels = 2; //dont akx me why, but it needs this hack
+    else
   channels = mediaPlayerState->curDecoder()->audioChannels( astream );
+
   qDebug( "LC- channels = %d", channels );
   
   if ( !total_audio_samples )
       total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream );
 
   total_audio_samples += 1000;
 
   mediaPlayerState->setLength( total_audio_samples );
   
   freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
   qDebug( "LC- frequency = %d", freq );
 
   audioSampleCounter = 0;
    int bits_per_sample;
    if ( mediaPlayerState->curDecoder()->pluginName() == QString("LibWavPlugin") ) {
        bits_per_sample =(int) mediaPlayerState->curDecoder()->getTime();
        qDebug("using stupid hack");
    } else {
            bits_per_sample=0;
    }
 
   audioDevice = new AudioDevice( freq, channels, bits_per_sample);
   audioBuffer = new char[ audioDevice->bufferSize() ];
   channels = audioDevice->channels();
 
   //### must check which frequency is actually used.
   static const int size = 1;
   short int buf[size];
   long samplesRead = 0;
   mediaPlayerState->curDecoder()->audioReadSamples( buf, channels, size, samplesRead, stream );
     }
 
     if ( hasVideoChannel ) {
   total_video_frames = mediaPlayerState->curDecoder()->videoFrames( stream );
 
   mediaPlayerState->setLength( total_video_frames );
 
   framerate = mediaPlayerState->curDecoder()->videoFrameRate( stream );
   DecodeLoopDebug(( "Frame rate %g total %ld", framerate, total_video_frames ));
 
   if ( framerate <= 1.0 ) {
       DecodeLoopDebug(( "Crazy frame rate, resetting to sensible" ));
       framerate = 25;
   }
 
   if ( total_video_frames == 1 ) {
       DecodeLoopDebug(( "Cannot seek to frame" ));
   }