1 files changed, 22 insertions, 9 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 553e3c1..8da7f73 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -97,37 +97,50 @@ void MediaPlayer::setPlaying( bool play ) {
             currentFile = playListCurrent;
         }
         xineControl->play( currentFile->file() );
         fileName = currentFile->name();
         long seconds =  mediaPlayerState->length();//
         time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
-        qDebug(time);
+        //qDebug(time);
         
-    } else { //if playing in file list.. play in a different way
+    } else {
+        //if playing in file list.. play in a different way
           // random and looping settings enabled causes problems here,
           // since there is no selected file in the playlist, but a selected file in the file list,
           // so we remember and shutoff
         l = mediaPlayerState->looping();
-        if(l)
+        if(l) {
             mediaPlayerState->setLooping( false );
+        }
         r = mediaPlayerState->shuffled();
         mediaPlayerState->setShuffled(false);
         
         fileName = playList->currentFileListPathName();
         xineControl->play( fileName);
-        long seconds =  mediaPlayerState->length();//
+        long seconds =  mediaPlayerState->length();
         time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
-        qDebug(time);
-        if( fileName.left(4) != "http" )
+        //qDebug(time);
+        if( fileName.left(4) != "http" ) {
             fileName = QFileInfo( fileName).baseName();
+        }
 
     }
-        if( fileName.left(4) == "http" )
+
+    if( fileName.left(4) == "http" ) {
+       if ( xineControl->getMetaInfo().isEmpty() ) {
             tickerText= tr( " File: " ) + fileName;
-        else
-            tickerText = tr( " File: " ) + fileName + tr(", Length: ") + time;
+       } else {
+           tickerText = xineControl->getMetaInfo();
+       }
+    } else {
+        if ( xineControl->getMetaInfo().isEmpty() ) {
+            tickerText = tr( " File: " ) + fileName + tr( ", Length: " ) + time + "  ";
+        } else {
+            tickerText = xineControl->getMetaInfo() + " Length: " + time + "  ";
+        }
+    }
     audioUI->setTickerText( tickerText );
 }
 
 
 void MediaPlayer::prev() {
     if(playList->whichList() == 0) { //if using the playlist