1 files changed, 20 insertions, 2 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 13cc4ed..5411a64 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -26,100 +26,118 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
 
 
     xineControl = new XineControl();
 //    QPEApplication::grabKeyboard(); // EVIL
     connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
 
     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( 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() ) );
 
 }
 
 MediaPlayer::~MediaPlayer() {
 }
 
 void MediaPlayer::pauseCheck( bool b ) {
     // Only pause if playing
     if ( b && !mediaPlayerState->playing() ) {
         mediaPlayerState->setPaused( FALSE );
     }
 }
 
 void MediaPlayer::play() {
     mediaPlayerState->setPlaying( FALSE );
     mediaPlayerState->setPlaying( TRUE );
 }
 
 void MediaPlayer::setPlaying( bool play ) {
     if ( !play ) {
         mediaPlayerState->setPaused( FALSE );
         return;
     }
 
     if ( mediaPlayerState->paused() ) {
         mediaPlayerState->setPaused( FALSE );
         return;
     }
 
     const DocLnk *playListCurrent = playList->current();
     if ( playListCurrent != NULL ) {
         currentFile = playListCurrent;
     }
+    
+    xineControl->play( currentFile->file() );
 
-    audioUI->setTickerText( currentFile->file( ) );
+    xineControl->length();
+    long seconds =  mediaPlayerState->length();//
+    QString time; time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
+    qDebug(time);
 
-    xineControl->play( currentFile->file() );
+    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 + "." );
+
+    audioUI->setTickerText( currentFile->file( ) );
+    
 }
 
 
 void MediaPlayer::prev() {
     if ( playList->prev() ) {
         play();
     } else if ( mediaPlayerState->looping() ) {
         if ( playList->last() ) {
             play();
         }
     } else {
         mediaPlayerState->setList();
     }
 }
 
 
 void MediaPlayer::next() {
     if ( playList->next() ) {
         play();
     } else if ( mediaPlayerState->looping() ) {
         if ( playList->first() ) {
             play();
         }
     } else {
         mediaPlayerState->setList();
     }
 }
 
 
 void MediaPlayer::startDecreasingVolume() {
     volumeDirection = -1;
     startTimer( 100 );
     // da kommt demnächst osound denk ich mal
  /////////////////////////// lets just move those change volume here
     //  AudioDevice::decreaseVolume();
 }
 
 
 void MediaPlayer::startIncreasingVolume() {
     volumeDirection = +1;
     startTimer( 100 );
     //  AudioDevice::increaseVolume();
 }
 
 
 bool drawnOnScreenDisplay = FALSE;
 unsigned int onScreenDisplayVolume = 0;
 const int yoff = 110;