1 files changed, 30 insertions, 35 deletions

diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp
index ce42c2c..c971a3c 100644
--- a/core/multimedia/opieplayer/mediaplayer.cpp
+++ b/core/multimedia/opieplayer/mediaplayer.cpp
@@ -45,14 +45,14 @@ extern MediaPlayerState *mediaPlayerState;
 
 MediaPlayer::MediaPlayer( QObject *parent, const char *name )
     : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
 
     connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
     connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pauseCheck( bool ) ) );
-            connect( mediaPlayerState, SIGNAL( next() ),         this, SLOT( next() ) );
-            connect( mediaPlayerState, SIGNAL( prev() ),         this, SLOT( prev() ) );
+    connect( mediaPlayerState, SIGNAL( next() ),     this, SLOT( next() ) );
+    connect( mediaPlayerState, SIGNAL( prev() ),     this, SLOT( prev() ) );
 
     connect( audioUI,  SIGNAL( moreClicked() ),         this, SLOT( startIncreasingVolume() ) );
     connect( audioUI,  SIGNAL( lessClicked() ),         this, SLOT( startDecreasingVolume() ) );
     connect( audioUI,  SIGNAL( moreReleased() ),        this, SLOT( stopChangingVolume() ) );
     connect( audioUI,  SIGNAL( lessReleased() ),        this, SLOT( stopChangingVolume() ) );
 }
@@ -62,99 +62,94 @@ MediaPlayer::~MediaPlayer() {
 }
 
 
 void MediaPlayer::pauseCheck( bool b ) {
     // Only pause if playing
     if ( b && !mediaPlayerState->playing() )
-        mediaPlayerState->setPaused( FALSE );
+  mediaPlayerState->setPaused( FALSE );
 }
 
 
 void MediaPlayer::play() {
     mediaPlayerState->setPlaying( FALSE );
     mediaPlayerState->setPlaying( TRUE );
 }
 
 
 void MediaPlayer::setPlaying( bool play ) {
-
     if ( !play ) {
-        mediaPlayerState->setPaused( FALSE );
-        loopControl->stop( FALSE );
-        return;
+  mediaPlayerState->setPaused( FALSE );
+  loopControl->stop( FALSE );
+  return;
     }
 
     if ( mediaPlayerState->paused() ) {
-        mediaPlayerState->setPaused( FALSE );
-        return;
+  mediaPlayerState->setPaused( FALSE );
+  return;
     }
 
     const DocLnk *playListCurrent = playList->current();
-
     if ( playListCurrent != NULL ) {
-        loopControl->stop( TRUE );
-        currentFile = playListCurrent;
+  loopControl->stop( TRUE );
+  currentFile = playListCurrent;
     }
-
     if ( currentFile == NULL ) {
-        QMessageBox::critical( 0, tr( "No file"), tr( "Error: There is no file selected" ) );
-        mediaPlayerState->setPlaying( FALSE );
-        return;
+  QMessageBox::critical( 0, tr( "No file"), tr( "Error: There is no file selected" ) );
+  mediaPlayerState->setPlaying( FALSE );
+  return;
     }
-
     if ( !QFile::exists( currentFile->file() ) ) {
-        QMessageBox::critical( 0, tr( "File not found"), tr( "The following file was not found: <i>" ) + currentFile->file() + "</i>" );
-        mediaPlayerState->setPlaying( FALSE );
-        return;
+  QMessageBox::critical( 0, tr( "File not found"), tr( "The following file was not found: <i>" ) + currentFile->file() + "</i>" );
+  mediaPlayerState->setPlaying( FALSE );
+  return;
     }
 
     if ( !mediaPlayerState->newDecoder( currentFile->file() ) ) {
-        QMessageBox::critical( 0, tr( "No decoder found"), tr( "Sorry, no appropriate decoders found for this file: <i>" ) + currentFile->file() + "</i>" );
-        mediaPlayerState->setPlaying( FALSE );
-        return;
+  QMessageBox::critical( 0, tr( "No decoder found"), tr( "Sorry, no appropriate decoders found for this file: <i>" ) + currentFile->file() + "</i>" );
+  mediaPlayerState->setPlaying( FALSE );
+  return;
     }
 
     if ( !loopControl->init( currentFile->file() ) ) {
-        QMessageBox::critical( 0, tr( "Error opening file"), tr( "Sorry, an error occured trying to play the file: <i>" ) + currentFile->file() + "</i>" );
-        mediaPlayerState->setPlaying( FALSE );
-        return;
+  QMessageBox::critical( 0, tr( "Error opening file"), tr( "Sorry, an error occured trying to play the file: <i>" ) + currentFile->file() + "</i>" );
+  mediaPlayerState->setPlaying( FALSE );
+  return;
     }
-
     long seconds = loopControl->totalPlaytime();
     QString time; time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
     QString tickerText = tr( " File: " ) + currentFile->name() + tr(", Length: ") + time;
     QString fileInfo = mediaPlayerState->curDecoder()->fileInfo();
     if ( !fileInfo.isEmpty() )
-        tickerText += ", " + fileInfo;
+  tickerText += ", " + fileInfo;
     audioUI->setTickerText( tickerText + "." );
 
     loopControl->play();
 
     mediaPlayerState->setView( loopControl->hasVideo() ? 'v' : 'a' );
 }
 
 
 void MediaPlayer::prev() {
     if ( playList->prev() )
-        play();
+  play();
     else if ( mediaPlayerState->looping() ) {
         if ( playList->last() )
-            play();
+      play();
     } else 
-        mediaPlayerState->setList();
+  mediaPlayerState->setList();
 }
 
 
 void MediaPlayer::next() {
     if ( playList->next() ) 
-        play(); 
+  play(); 
     else if ( mediaPlayerState->looping() ) {
         if ( playList->first() )
-            play();
+      play();
     } else
-        mediaPlayerState->setList();
+  mediaPlayerState->setList();
 }
 
 
 void MediaPlayer::startDecreasingVolume() {
     volumeDirection = -1;
     startTimer( 100 );
@@ -173,11 +168,11 @@ void MediaPlayer::stopChangingVolume() {
     killTimers();
 }
 
 
 void MediaPlayer::timerEvent( QTimerEvent * ) {
     if ( volumeDirection == +1 ) 
-        AudioDevice::increaseVolume();
+  AudioDevice::increaseVolume();
     else if ( volumeDirection == -1 ) 
         AudioDevice::decreaseVolume();
 }