1 files changed, 19 insertions, 20 deletions

diff --git a/core/multimedia/opieplayer/loopcontrol.cpp b/core/multimedia/opieplayer/loopcontrol.cpp
index dd466ed..90a7cc6 100644
--- a/core/multimedia/opieplayer/loopcontrol.cpp
+++ b/core/multimedia/opieplayer/loopcontrol.cpp
@@ -1,46 +1,49 @@
 /**********************************************************************
-** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
-** This file is part of the Qtopia Environment.
+** This file is part of Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+// L.J.Potter added changes Fri 02-15-2002
+
+
 #include <qpe/qpeapplication.h>
-#ifdef Q_WS_QWS
 
+#ifdef Q_WS_QWS
 #include <qpe/qcopenvelope_qws.h>
 #endif
-#include <qpe/mediaplayerplugininterface.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
 #include <errno.h>
 #include <unistd.h>
 #include "loopcontrol.h"
 #include "videowidget.h"
 #include "audiodevice.h"
+#include "mediaplayerplugininterface.h"
 #include "mediaplayerstate.h"
 
 
 extern VideoWidget *videoUI; // now only needed to tell it to play a frame
 extern MediaPlayerState *mediaPlayerState;
 
 
 //#define DecodeLoopDebug(x)  qDebug x
 #define DecodeLoopDebug(x)
 
 
 static char	    *audioBuffer = NULL;
@@ -93,42 +96,37 @@ void *startAudioThread( void *ptr ) {
 
 Mutex *audioMutex;
 
 
 LoopControl::LoopControl( QObject *parent, const char *name )
     : QObject( parent, name ) {
     isMuted = FALSE;
     connect( qApp, SIGNAL( volumeChanged(bool) ), this, SLOT( setMute(bool) ) );
 
     audioMutex = new Mutex;
 
     pthread_attr_init(&audio_attr);
-
-    if ( getuid() == 0 ) {
-        printf("true, guid = %i\n", getuid());
-
+#define USE_REALTIME_AUDIO_THREAD
+#ifdef USE_REALTIME_AUDIO_THREAD
 	// Attempt to set it to real-time round robin
 	if ( pthread_attr_setschedpolicy( &audio_attr, SCHED_RR ) == 0 ) {
 	    sched_param params;
 	    params.sched_priority = 50;
 	    pthread_attr_setschedparam(&audio_attr,&params);
 	} else {
 	    qDebug( "Error setting up a realtime thread, reverting to using a normal thread." );
 	    pthread_attr_destroy(&audio_attr);
 	    pthread_attr_init(&audio_attr);
 	}
-    }
-//    printf("false, guid = %i\n", getuid());
-    usleep( 100 );
-
+#endif
     pthread_create(&audio_tid, &audio_attr, (void * (*)(void *))startAudioThread, this);
 }
 
 
 LoopControl::~LoopControl() {
     stop();
 }
 
 
 static long prev_frame = 0;
 static int currentSample = 0;
 
@@ -225,40 +223,41 @@ void LoopControl::startAudio() {
     audioMutex->lock();
 
     if ( moreAudio ) {
 
 	if ( !isMuted && mediaPlayerState->curDecoder() ) {
 
 	    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 ) {
+        }
+      else if ( sampleWaitTime <= -5000 ) {
 		qDebug("need to catch up by: %li (%i,%li)", -sampleWaitTime, currentSample, sampleWeShouldBeAt );
 		//mediaPlayerState->curDecoder()->audioSetSample( sampleWeShouldBeAt, stream );
 		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;
 
 	}
 
     }
 
     audioMutex->unlock();
 }
 
@@ -370,41 +369,41 @@ bool LoopControl::init( const QString& filename ) {
     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;
 
 	channels = mediaPlayerState->curDecoder()->audioChannels( astream );
-	DecodeLoopDebug(( "channels = %d\n", channels ));
+  qDebug( "LC- channels = %d", channels );
 	
 	if ( !total_audio_samples )
 	    total_audio_samples = mediaPlayerState->curDecoder()->audioSamples( astream );
 
-	total_audio_samples += 1000;
+//  total_audio_samples += 1000;
 
 	mediaPlayerState->setLength( total_audio_samples );
 	
 	freq = mediaPlayerState->curDecoder()->audioFrequency( astream );
-	DecodeLoopDebug(( "frequency = %d\n", freq ));
+  qDebug( "LC- frequency = %d", freq );
 
 	audioSampleCounter = 0;
 
-	static const int bytes_per_sample = 2; //16 bit
+   int bits_per_sample = mediaPlayerState->curDecoder()->audioBitsPerSample( astream);
 
-	audioDevice = new AudioDevice( freq, channels, bytes_per_sample );
+  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 );