fixed length display for streams

1 files changed, 6 insertions, 1 deletions

diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp
index 7ef3e6a..e0c4dba 100644
--- a/core/multimedia/opieplayer/mediaplayer.cpp
+++ b/core/multimedia/opieplayer/mediaplayer.cpp
@@ -72,97 +72,102 @@ void MediaPlayer::pauseCheck( bool b ) {
 void MediaPlayer::play() {
     mediaPlayerState->setPlaying( FALSE );
     mediaPlayerState->setPlaying( TRUE );
 }
 
 
 void MediaPlayer::setPlaying( bool play ) {
     if ( !play ) {
   mediaPlayerState->setPaused( FALSE );
   loopControl->stop( FALSE );
   return;
     }
 
     if ( mediaPlayerState->paused() ) {
   mediaPlayerState->setPaused( FALSE );
   return;
     }
 
     const DocLnk *playListCurrent = playList->current();
     if ( playListCurrent != NULL ) {
   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;
     }
 
     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();
     QString time; time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
-    QString tickerText = tr( " File: " ) + currentFile->name() + tr(", Length: ") + time;
+    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 + "." );
 
     loopControl->play();
 
     mediaPlayerState->setView( loopControl->hasVideo() ? 'v' : 'a' );
 }
 
 
 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 );
     AudioDevice::decreaseVolume();
 }
 
 
 void MediaPlayer::startIncreasingVolume() {
     volumeDirection = +1;
     startTimer( 100 );
     AudioDevice::increaseVolume();
 }
 
 
 void MediaPlayer::stopChangingVolume() {