1 files changed, 6 insertions, 46 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index e6d0525..87184ba 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -56,5 +56,4 @@ void MediaPlayer::setPlaying( bool play ) {
     if ( !play ) {
   mediaPlayerState->setPaused( FALSE );
-//  loopControl->stop( FALSE );
   return;
     }
@@ -67,55 +66,16 @@ void MediaPlayer::setPlaying( bool play ) {
     const DocLnk *playListCurrent = playList->current();
     if ( playListCurrent != NULL ) {
-//  loopControl->stop( TRUE );
   currentFile = playListCurrent;
     }
 
-    /*
+    audioUI->setTickerText( currentFile->file() );
 
-    if ( currentFile == NULL ) {
-  QMessageBox::critical( 0, tr( "No file"), tr( "Error: There is no file selected" ) );
-  mediaPlayerState->setPlaying( FALSE );
-  return;
-    }
-
-    if ( ((currentFile->file()).left(4) != "http") && !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;
-    }
-
-    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;
-    }
-
-//    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;
-//    }
-//   long seconds = loopControl->totalPlaytime();
-    long seconds = 120;
-    QString time;
-   time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
-    QString tickerText;
-    if( currentFile->file().left(4) == "http" )
-     tickerText= tr( " File: " ) + currentFile->name();
-    else
-    tickerText = tr( " File: " ) + currentFile->name() + tr(", Length: ") + time;
-
-    QString fileInfo = mediaPlayerState->curDecoder()->fileInfo();
-    if ( !fileInfo.isEmpty() )
-  tickerText += ", " + fileInfo;
-    audioUI->setTickerText( tickerText + "." );
-
-
-    */ // alles nicht nötig, xine kümmert sich drum, man muss nur den return andio oder video gui geben
 
+    // alles nicht nötig, xine kümmert sich drum, man muss nur den return andio oder video gui geben
 
-    //   loopControl->play();
+    // Ob auch video 'v' : 'a'
+    //  mediaPlayerState->setView( 'v' );
 
-    //  mediaPlayerState->setView( loopControl->hasVideo() ? 'v' : 'a' );
+    // abspielen starten.
 }
 
@@ -146,5 +106,5 @@ void MediaPlayer::startDecreasingVolume() {
     volumeDirection = -1;
     startTimer( 100 );
-    // sollte volumeapplet machen
+    // da kommt demnächst osound denk ich mal
     //  AudioDevice::decreaseVolume();
 }