Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 28a42eb..36def67 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -124,25 +124,25 @@ void AudioWidget::sliderPressed() { | |||
124 | } | 124 | } |
125 | 125 | ||
126 | 126 | ||
127 | void AudioWidget::sliderReleased() { | 127 | void AudioWidget::sliderReleased() { |
128 | audioSliderBeingMoved = FALSE; | 128 | audioSliderBeingMoved = FALSE; |
129 | if ( slider.width() == 0 ) | 129 | if ( slider.width() == 0 ) |
130 | return; | 130 | return; |
131 | long val = long((double)slider.value() * mediaPlayerState.length() / slider.width()); | 131 | long val = long((double)slider.value() * mediaPlayerState.length() / slider.width()); |
132 | mediaPlayerState.setPosition( val ); | 132 | mediaPlayerState.setPosition( val ); |
133 | } | 133 | } |
134 | 134 | ||
135 | void AudioWidget::setPosition( long i ) { | 135 | void AudioWidget::setPosition( long i ) { |
136 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i); | 136 | // odebug << "<<<<<<<<<<<<<<<<<<<<<<<<set position " << i << "" << oendl; |
137 | updateSlider( i, mediaPlayerState.length() ); | 137 | updateSlider( i, mediaPlayerState.length() ); |
138 | } | 138 | } |
139 | 139 | ||
140 | 140 | ||
141 | void AudioWidget::setLength( long max ) { | 141 | void AudioWidget::setLength( long max ) { |
142 | updateSlider( mediaPlayerState.position(), max ); | 142 | updateSlider( mediaPlayerState.position(), max ); |
143 | } | 143 | } |
144 | 144 | ||
145 | 145 | ||
146 | void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) { | 146 | void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) { |
147 | if ( mediaType == MediaPlayerState::Audio ) { | 147 | if ( mediaType == MediaPlayerState::Audio ) { |
148 | // startTimer( 150 ); | 148 | // startTimer( 150 ); |
@@ -178,37 +178,37 @@ void AudioWidget::loadSkin() | |||
178 | time.setFocusPolicy( QWidget::NoFocus ); | 178 | time.setFocusPolicy( QWidget::NoFocus ); |
179 | time.setAlignment( Qt::AlignCenter ); | 179 | time.setAlignment( Qt::AlignCenter ); |
180 | 180 | ||
181 | // time.setFrame(FALSE); | 181 | // time.setFrame(FALSE); |
182 | // changeTextColor( &time ); | 182 | // changeTextColor( &time ); |
183 | 183 | ||
184 | resizeEvent( 0 ); | 184 | resizeEvent( 0 ); |
185 | } | 185 | } |
186 | 186 | ||
187 | void AudioWidget::setSeekable( bool isSeekable ) { | 187 | void AudioWidget::setSeekable( bool isSeekable ) { |
188 | 188 | ||
189 | if ( !isSeekable ) { | 189 | if ( !isSeekable ) { |
190 | qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); | 190 | odebug << "<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>" << oendl; |
191 | if( !slider.isHidden()) { | 191 | if( !slider.isHidden()) { |
192 | slider.hide(); | 192 | slider.hide(); |
193 | } | 193 | } |
194 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 194 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
195 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 195 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
196 | disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 196 | disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
197 | disconnect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | 197 | disconnect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); |
198 | } else { | 198 | } else { |
199 | // this stops the slider from being moved, thus | 199 | // this stops the slider from being moved, thus |
200 | // does not stop stream when it reaches the end | 200 | // does not stop stream when it reaches the end |
201 | slider.show(); | 201 | slider.show(); |
202 | qDebug( " CONNECT SET POSTION " ); | 202 | odebug << " CONNECT SET POSTION " << oendl; |
203 | connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 203 | connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
204 | connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 204 | connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
205 | connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 205 | connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
206 | connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | 206 | connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); |
207 | } | 207 | } |
208 | } | 208 | } |
209 | 209 | ||
210 | 210 | ||
211 | static QString timeAsString( long length ) { | 211 | static QString timeAsString( long length ) { |
212 | int minutes = length / 60; | 212 | int minutes = length / 60; |
213 | int seconds = length % 60; | 213 | int seconds = length % 60; |
214 | return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 ); | 214 | return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 ); |
@@ -262,25 +262,25 @@ void AudioWidget::timerEvent( QTimerEvent * ) { | |||
262 | } else if ( skipDirection == -1 ) { | 262 | } else if ( skipDirection == -1 ) { |
263 | mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); | 263 | mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); |
264 | } | 264 | } |
265 | } | 265 | } |
266 | 266 | ||
267 | void AudioWidget::keyReleaseEvent( QKeyEvent *e) { | 267 | void AudioWidget::keyReleaseEvent( QKeyEvent *e) { |
268 | switch ( e->key() ) { | 268 | switch ( e->key() ) { |
269 | ////////////////////////////// Zaurus keys | 269 | ////////////////////////////// Zaurus keys |
270 | case Key_Home: | 270 | case Key_Home: |
271 | break; | 271 | break; |
272 | case Key_F9: //activity | 272 | case Key_F9: //activity |
273 | hide(); | 273 | hide(); |
274 | // qDebug("Audio F9"); | 274 | // odebug << "Audio F9" << oendl; |
275 | e->accept(); | 275 | e->accept(); |
276 | break; | 276 | break; |
277 | case Key_F10: //contacts | 277 | case Key_F10: //contacts |
278 | break; | 278 | break; |
279 | case Key_F11: //menu | 279 | case Key_F11: //menu |
280 | mediaPlayerState.toggleBlank(); | 280 | mediaPlayerState.toggleBlank(); |
281 | e->accept(); | 281 | e->accept(); |
282 | break; | 282 | break; |
283 | case Key_F12: //home | 283 | case Key_F12: //home |
284 | break; | 284 | break; |
285 | case Key_F13: //mail | 285 | case Key_F13: //mail |
286 | mediaPlayerState.toggleBlank(); | 286 | mediaPlayerState.toggleBlank(); |