Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 95a0f45..1c08b41 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -133,13 +133,13 @@ void AudioWidget::sliderReleased() { | |||
133 | return; | 133 | return; |
134 | long val = long((double)slider.value() * mediaPlayerState.length() / slider.width()); | 134 | long val = long((double)slider.value() * mediaPlayerState.length() / slider.width()); |
135 | mediaPlayerState.setPosition( val ); | 135 | mediaPlayerState.setPosition( val ); |
136 | } | 136 | } |
137 | 137 | ||
138 | void AudioWidget::setPosition( long i ) { | 138 | void AudioWidget::setPosition( long i ) { |
139 | // odebug << "<<<<<<<<<<<<<<<<<<<<<<<<set position " << i << "" << oendl; | 139 | // odebug << "<<<<<<<<<<<<<<<<<<<<<<<<set position " << i << "" << oendl; |
140 | updateSlider( i, mediaPlayerState.length() ); | 140 | updateSlider( i, mediaPlayerState.length() ); |
141 | } | 141 | } |
142 | 142 | ||
143 | 143 | ||
144 | void AudioWidget::setLength( long max ) { | 144 | void AudioWidget::setLength( long max ) { |
145 | updateSlider( mediaPlayerState.position(), max ); | 145 | updateSlider( mediaPlayerState.position(), max ); |
@@ -187,25 +187,25 @@ void AudioWidget::loadSkin() | |||
187 | resizeEvent( 0 ); | 187 | resizeEvent( 0 ); |
188 | } | 188 | } |
189 | 189 | ||
190 | void AudioWidget::setSeekable( bool isSeekable ) { | 190 | void AudioWidget::setSeekable( bool isSeekable ) { |
191 | 191 | ||
192 | if ( !isSeekable ) { | 192 | if ( !isSeekable ) { |
193 | odebug << "<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>" << oendl; | 193 | odebug << "<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>" << oendl; |
194 | if( !slider.isHidden()) { | 194 | if( !slider.isHidden()) { |
195 | slider.hide(); | 195 | slider.hide(); |
196 | } | 196 | } |
197 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 197 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
198 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 198 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
199 | disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 199 | disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
200 | disconnect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | 200 | disconnect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); |
201 | } else { | 201 | } else { |
202 | // this stops the slider from being moved, thus | 202 | // this stops the slider from being moved, thus |
203 | // does not stop stream when it reaches the end | 203 | // does not stop stream when it reaches the end |
204 | slider.show(); | 204 | slider.show(); |
205 | odebug << " CONNECT SET POSTION " << oendl; | 205 | odebug << " CONNECT SET POSTION " << oendl; |
206 | connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 206 | connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
207 | connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 207 | connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
208 | connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 208 | connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
209 | connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | 209 | connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); |
210 | } | 210 | } |
211 | } | 211 | } |
@@ -217,13 +217,13 @@ static QString timeAsString( long length ) { | |||
217 | return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 ); | 217 | return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 ); |
218 | } | 218 | } |
219 | 219 | ||
220 | void AudioWidget::updateSlider( long i, long max ) { | 220 | void AudioWidget::updateSlider( long i, long max ) { |
221 | 221 | ||
222 | time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); | 222 | time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); |
223 | // qDebug( timeAsString( i ) + " / " + timeAsString( max ) ) ; | 223 | // odebug << timeAsString( i ) << " / " << timeAsString( max ) << oendl; |
224 | 224 | ||
225 | if ( max == 0 ) { | 225 | if ( max == 0 ) { |
226 | return; | 226 | return; |
227 | } | 227 | } |
228 | // Will flicker too much if we don't do this | 228 | // Will flicker too much if we don't do this |
229 | // Scale to something reasonable | 229 | // Scale to something reasonable |
@@ -271,13 +271,13 @@ void AudioWidget::keyReleaseEvent( QKeyEvent *e) { | |||
271 | switch ( e->key() ) { | 271 | switch ( e->key() ) { |
272 | ////////////////////////////// Zaurus keys | 272 | ////////////////////////////// Zaurus keys |
273 | case Key_Home: | 273 | case Key_Home: |
274 | break; | 274 | break; |
275 | case Key_F9: //activity | 275 | case Key_F9: //activity |
276 | hide(); | 276 | hide(); |
277 | // odebug << "Audio F9" << oendl; | 277 | // odebug << "Audio F9" << oendl; |
278 | e->accept(); | 278 | e->accept(); |
279 | break; | 279 | break; |
280 | case Key_F10: //contacts | 280 | case Key_F10: //contacts |
281 | break; | 281 | break; |
282 | case Key_F11: //menu | 282 | case Key_F11: //menu |
283 | mediaPlayerState.toggleBlank(); | 283 | mediaPlayerState.toggleBlank(); |