Mediaplayer hang fix

3 files changed, 7 insertions, 7 deletions

diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.cpp b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
index b2b876f..9d04f7e 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.cpp
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.cpp
@@ -490,27 +490,27 @@ bool LibMadPlugin::audioReadStereoSamples( short *output, long samples, long& sa
 bool LibMadPlugin::audioReadSamples( short *output, int /*channels*/, long samples, long& samplesMade, int ) {
     debugMsg( "LibMadPlugin::audioReadStereoSamples" );
 
     static bool needInput = TRUE;
     
     if ( samples == 0 )
-        return TRUE;
+        return FALSE;
 
     do {
         if ( needInput )
             if ( !read() ) {
         //      if ( d->input.eof )
         //          needInput = FALSE;
         //      else
-                    return TRUE;
+                    return FALSE;
             }
 
         needInput = FALSE;
 
         if ( decode( output, samples, samplesMade ) )
-            return FALSE;
+            return TRUE;
         else
             needInput = TRUE;
     }
     while ( ( samplesMade < samples ) && ( !d->input.eof ) );
 /*
     static bool firstTimeThru = TRUE;
@@ -518,13 +518,13 @@ bool LibMadPlugin::audioReadSamples( short *output, int /*channels*/, long sampl
     if ( firstTimeThru ) {
         firstTimeThru = FALSE;
         decode( output, samples, samplesMade );
         return FALSE;
     } else
 */
-        return TRUE;
+        return FALSE;
 }
 
 
 double LibMadPlugin::getTime() {
     debugMsg( "LibMadPlugin::getTime" );
     return 0.0;
diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp
index 93a6e3f..6dfd057 100644
--- a/core/multimedia/opieplayer/loopcontrol.cpp
+++ b/core/multimedia/opieplayer/loopcontrol.cpp
@@ -225,13 +225,13 @@ void LoopControl::startAudio() {
             currentSample = audioSampleCounter + 1;
 
             if ( currentSample != audioSampleCounter + 1 )
                 qDebug("out of sync with decoder %i %i", currentSample, audioSampleCounter);
 
             long samplesRead = 0;
-            mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream );
+            bool readOk=mediaPlayerState->curDecoder()->audioReadSamples( (short*)audioBuffer, channels, 1024, samplesRead, stream );
             long sampleWeShouldBeAt = long( playtime.elapsed() ) * freq / 1000;
             long sampleWaitTime = currentSample - sampleWeShouldBeAt;
 
             if ( ( sampleWaitTime > 2000 ) && ( sampleWaitTime < 20000 ) ) {
                 usleep( (long)((double)sampleWaitTime * 1000000.0 / freq) );
             } else if ( sampleWaitTime <= -5000 ) {
@@ -240,13 +240,13 @@ void LoopControl::startAudio() {
                 currentSample = sampleWeShouldBeAt;
             }
 
             audioDevice->write( audioBuffer, samplesRead * 2 * channels );
             audioSampleCounter = currentSample + samplesRead - 1;
 
-            moreAudio = audioSampleCounter <= total_audio_samples;
+            moreAudio = readOk && (audioSampleCounter <= total_audio_samples);
 
         } else {
 
             moreAudio = FALSE;
 
         }
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.cpp b/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
index 60a0024..a6bd974 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.cpp
@@ -320,13 +320,13 @@ bool WavPlugin::audioReadStereoSamples( short *output, long samples, long& sampl
     return !d->add( output, samples, samplesMade, TRUE );
 }
 */
 
 bool WavPlugin::audioReadSamples( short *output, int channels, long samples, long& samplesMade, int ) {
     debugMsg( "WavPlugin::audioReadSamples" );
-    return !d->add( output, samples, samplesMade, channels != 1 );
+    return d->add( output, samples, samplesMade, channels != 1 );
 }
 
 double WavPlugin::getTime() {
     debugMsg( "WavPlugin::getTime" );
     return 0.0;
 }