author | llornkcor <llornkcor> | 2002-08-03 11:26:12 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-08-03 11:26:12 (UTC) |
commit | 3b1ab71b7bfe42310661764e1089200290c7b817 (patch) (unidiff) | |
tree | 361ad970ec2f4c06bd7d9cc1a94b45040539f844 | |
parent | 7d4b246bc728b73e9d38e110619222dd89c1fd1c (diff) | |
download | opie-3b1ab71b7bfe42310661764e1089200290c7b817.zip opie-3b1ab71b7bfe42310661764e1089200290c7b817.tar.gz opie-3b1ab71b7bfe42310661764e1089200290c7b817.tar.bz2 |
initial fx for time readout
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 21 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 20 |
2 files changed, 33 insertions, 8 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 300a5c8..303834a 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -251,7 +251,7 @@ void AudioWidget::sliderReleased() { | |||
251 | } | 251 | } |
252 | 252 | ||
253 | void AudioWidget::setPosition( long i ) { | 253 | void AudioWidget::setPosition( long i ) { |
254 | // qDebug("set position %d",i); | 254 | qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i); |
255 | updateSlider( i, mediaPlayerState->length() ); | 255 | updateSlider( i, mediaPlayerState->length() ); |
256 | } | 256 | } |
257 | 257 | ||
@@ -262,17 +262,22 @@ void AudioWidget::setLength( long max ) { | |||
262 | 262 | ||
263 | 263 | ||
264 | void AudioWidget::setView( char view ) { | 264 | void AudioWidget::setView( char view ) { |
265 | if (mediaPlayerState->streaming() ) { | 265 | slider.show(); |
266 | if( !slider.isHidden()) slider.hide(); | 266 | |
267 | disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 267 | // this isnt working for some reason |
268 | disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 268 | |
269 | } else { | 269 | // if ( mediaPlayerState->streaming() ) { |
270 | // qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); | ||
271 | // if( !slider.isHidden()) slider.hide(); | ||
272 | // disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | ||
273 | // disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | ||
274 | // } else { | ||
270 | // this stops the slider from being moved, thus | 275 | // this stops the slider from being moved, thus |
271 | // does not stop stream when it reaches the end | 276 | // does not stop stream when it reaches the end |
272 | slider.show(); | 277 | slider.show(); |
273 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 278 | connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
274 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 279 | connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
275 | } | 280 | // } |
276 | 281 | ||
277 | if ( view == 'a' ) { | 282 | if ( view == 'a' ) { |
278 | startTimer( 150 ); | 283 | startTimer( 150 ); |
@@ -292,7 +297,9 @@ static QString timeAsString( long length ) { | |||
292 | } | 297 | } |
293 | 298 | ||
294 | void AudioWidget::updateSlider( long i, long max ) { | 299 | void AudioWidget::updateSlider( long i, long max ) { |
300 | |||
295 | time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); | 301 | time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); |
302 | |||
296 | if ( max == 0 ) { | 303 | if ( max == 0 ) { |
297 | return; | 304 | return; |
298 | } | 305 | } |
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 | |||
@@ -72,9 +72,27 @@ void MediaPlayer::setPlaying( bool play ) { | |||
72 | currentFile = playListCurrent; | 72 | currentFile = playListCurrent; |
73 | } | 73 | } |
74 | 74 | ||
75 | xineControl->play( currentFile->file() ); | ||
76 | |||
77 | xineControl->length(); | ||
78 | long seconds = mediaPlayerState->length();// | ||
79 | QString time; time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); | ||
80 | qDebug(time); | ||
81 | |||
82 | QString tickerText; | ||
83 | if( currentFile->file().left(4) == "http" ) | ||
84 | tickerText= tr( " File: " ) + currentFile->name(); | ||
85 | else | ||
86 | tickerText = tr( " File: " ) + currentFile->name() + tr(", Length: ") + time; | ||
87 | |||
88 | // QString fileInfo = mediaPlayerState->curDecoder()->fileInfo(); | ||
89 | |||
90 | // if ( !fileInfo.isEmpty() ) | ||
91 | // tickerText += ", " + fileInfo; | ||
92 | // audioUI->setTickerText( tickerText + "." ); | ||
93 | |||
75 | audioUI->setTickerText( currentFile->file( ) ); | 94 | audioUI->setTickerText( currentFile->file( ) ); |
76 | 95 | ||
77 | xineControl->play( currentFile->file() ); | ||
78 | } | 96 | } |
79 | 97 | ||
80 | 98 | ||