author | llornkcor <llornkcor> | 2002-04-21 16:17:55 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-21 16:17:55 (UTC) |
commit | 746afd0d27f33eed5451b54819773cf055858964 (patch) (unidiff) | |
tree | f33bf3e485393e41e7a36ffc6710798e7f3e47c3 | |
parent | 392eb0350465565e2a849ada60e6734be025787b (diff) | |
download | opie-746afd0d27f33eed5451b54819773cf055858964.zip opie-746afd0d27f33eed5451b54819773cf055858964.tar.gz opie-746afd0d27f33eed5451b54819773cf055858964.tar.bz2 |
fixed length display for streams
-rw-r--r-- | core/multimedia/opieplayer/mediaplayer.cpp | 7 |
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 | |||
@@ -96,49 +96,54 @@ void MediaPlayer::setPlaying( bool play ) { | |||
96 | QMessageBox::critical( 0, tr( "No file"), tr( "Error: There is no file selected" ) ); | 96 | QMessageBox::critical( 0, tr( "No file"), tr( "Error: There is no file selected" ) ); |
97 | mediaPlayerState->setPlaying( FALSE ); | 97 | mediaPlayerState->setPlaying( FALSE ); |
98 | return; | 98 | return; |
99 | } | 99 | } |
100 | 100 | ||
101 | if ( ((currentFile->file()).left(4) != "http") && !QFile::exists( currentFile->file() ) ) { | 101 | if ( ((currentFile->file()).left(4) != "http") && !QFile::exists( currentFile->file() ) ) { |
102 | QMessageBox::critical( 0, tr( "File not found"), tr( "The following file was not found: <i>" ) + currentFile->file() + "</i>" ); | 102 | QMessageBox::critical( 0, tr( "File not found"), tr( "The following file was not found: <i>" ) + currentFile->file() + "</i>" ); |
103 | mediaPlayerState->setPlaying( FALSE ); | 103 | mediaPlayerState->setPlaying( FALSE ); |
104 | return; | 104 | return; |
105 | } | 105 | } |
106 | 106 | ||
107 | if ( !mediaPlayerState->newDecoder( currentFile->file() ) ) { | 107 | if ( !mediaPlayerState->newDecoder( currentFile->file() ) ) { |
108 | QMessageBox::critical( 0, tr( "No decoder found"), tr( "Sorry, no appropriate decoders found for this file: <i>" ) + currentFile->file() + "</i>" ); | 108 | QMessageBox::critical( 0, tr( "No decoder found"), tr( "Sorry, no appropriate decoders found for this file: <i>" ) + currentFile->file() + "</i>" ); |
109 | mediaPlayerState->setPlaying( FALSE ); | 109 | mediaPlayerState->setPlaying( FALSE ); |
110 | return; | 110 | return; |
111 | } | 111 | } |
112 | 112 | ||
113 | if ( !loopControl->init( currentFile->file() ) ) { | 113 | if ( !loopControl->init( currentFile->file() ) ) { |
114 | QMessageBox::critical( 0, tr( "Error opening file"), tr( "Sorry, an error occured trying to play the file: <i>" ) + currentFile->file() + "</i>" ); | 114 | QMessageBox::critical( 0, tr( "Error opening file"), tr( "Sorry, an error occured trying to play the file: <i>" ) + currentFile->file() + "</i>" ); |
115 | mediaPlayerState->setPlaying( FALSE ); | 115 | mediaPlayerState->setPlaying( FALSE ); |
116 | return; | 116 | return; |
117 | } | 117 | } |
118 | long seconds = loopControl->totalPlaytime(); | 118 | long seconds = loopControl->totalPlaytime(); |
119 | QString time; time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); | 119 | QString time; time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); |
120 | QString tickerText = tr( " File: " ) + currentFile->name() + tr(", Length: ") + time; | 120 | QString tickerText; |
121 | if( currentFile->file().left(4) == "http" ) | ||
122 | tickerText= tr( " File: " ) + currentFile->name(); | ||
123 | else | ||
124 | tickerText = tr( " File: " ) + currentFile->name() + tr(", Length: ") + time; | ||
125 | |||
121 | QString fileInfo = mediaPlayerState->curDecoder()->fileInfo(); | 126 | QString fileInfo = mediaPlayerState->curDecoder()->fileInfo(); |
122 | if ( !fileInfo.isEmpty() ) | 127 | if ( !fileInfo.isEmpty() ) |
123 | tickerText += ", " + fileInfo; | 128 | tickerText += ", " + fileInfo; |
124 | audioUI->setTickerText( tickerText + "." ); | 129 | audioUI->setTickerText( tickerText + "." ); |
125 | 130 | ||
126 | loopControl->play(); | 131 | loopControl->play(); |
127 | 132 | ||
128 | mediaPlayerState->setView( loopControl->hasVideo() ? 'v' : 'a' ); | 133 | mediaPlayerState->setView( loopControl->hasVideo() ? 'v' : 'a' ); |
129 | } | 134 | } |
130 | 135 | ||
131 | 136 | ||
132 | void MediaPlayer::prev() { | 137 | void MediaPlayer::prev() { |
133 | if ( playList->prev() ) | 138 | if ( playList->prev() ) |
134 | play(); | 139 | play(); |
135 | else if ( mediaPlayerState->looping() ) { | 140 | else if ( mediaPlayerState->looping() ) { |
136 | if ( playList->last() ) | 141 | if ( playList->last() ) |
137 | play(); | 142 | play(); |
138 | } else | 143 | } else |
139 | mediaPlayerState->setList(); | 144 | mediaPlayerState->setList(); |
140 | } | 145 | } |
141 | 146 | ||
142 | 147 | ||
143 | void MediaPlayer::next() { | 148 | void MediaPlayer::next() { |
144 | if ( playList->next() ) | 149 | if ( playList->next() ) |