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
@@ -492,23 +492,23 @@ bool LibMadPlugin::audioReadSamples( short *output, int /*channels*/, long sampl
 
     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 ) );
@@ -520,9 +520,9 @@ bool LibMadPlugin::audioReadSamples( short *output, int /*channels*/, long sampl
 	decode( output, samples, samplesMade );
 	return FALSE;
     } else
 */
-        return TRUE;
+        return FALSE;
 }
 
 
 double LibMadPlugin::getTime() {
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
@@ -227,9 +227,9 @@ void LoopControl::startAudio() {
 	    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 ) ) {
@@ -242,9 +242,9 @@ void LoopControl::startAudio() {
 
 	    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
@@ -322,9 +322,9 @@ bool WavPlugin::audioReadStereoSamples( short *output, long samples, long& sampl
 */
 
 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" );