Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (ignore 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 | |||
@@ -112,49 +112,49 @@ void AudioWidget::resizeEvent( QResizeEvent *e ) { | |||
112 | slider.setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); | 112 | slider.setGeometry( QRect( 15, h - 22, w - 90, 20 ) ); |
113 | slider.setBackgroundOrigin( QWidget::ParentOrigin ); | 113 | slider.setBackgroundOrigin( QWidget::ParentOrigin ); |
114 | time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); | 114 | time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); |
115 | 115 | ||
116 | upperLeftOfButtonMask.rx() = ( w - buttonUpImage.width() ) / 2; | 116 | upperLeftOfButtonMask.rx() = ( w - buttonUpImage.width() ) / 2; |
117 | upperLeftOfButtonMask.ry() = (( h - buttonUpImage.height() ) / 2) - 10; | 117 | upperLeftOfButtonMask.ry() = (( h - buttonUpImage.height() ) / 2) - 10; |
118 | 118 | ||
119 | MediaWidget::resizeEvent( e ); | 119 | MediaWidget::resizeEvent( e ); |
120 | } | 120 | } |
121 | 121 | ||
122 | void AudioWidget::sliderPressed() { | 122 | void AudioWidget::sliderPressed() { |
123 | audioSliderBeingMoved = TRUE; | 123 | audioSliderBeingMoved = TRUE; |
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 ); |
149 | QPEApplication::showWidget( this ); | 149 | QPEApplication::showWidget( this ); |
150 | return; | 150 | return; |
151 | } | 151 | } |
152 | 152 | ||
153 | killTimers(); | 153 | killTimers(); |
154 | hide(); | 154 | hide(); |
155 | } | 155 | } |
156 | 156 | ||
157 | void AudioWidget::loadSkin() | 157 | void AudioWidget::loadSkin() |
158 | { | 158 | { |
159 | loadDefaultSkin( guiInfo() ); | 159 | loadDefaultSkin( guiInfo() ); |
160 | 160 | ||
@@ -166,61 +166,61 @@ void AudioWidget::loadSkin() | |||
166 | // songInfo.setForegroundColor(Qt::white); | 166 | // songInfo.setForegroundColor(Qt::white); |
167 | 167 | ||
168 | slider.setFixedHeight( 20 ); | 168 | slider.setFixedHeight( 20 ); |
169 | slider.setMinValue( 0 ); | 169 | slider.setMinValue( 0 ); |
170 | slider.setMaxValue( 1 ); | 170 | slider.setMaxValue( 1 ); |
171 | slider.setFocusPolicy( QWidget::NoFocus ); | 171 | slider.setFocusPolicy( QWidget::NoFocus ); |
172 | slider.setBackgroundPixmap( backgroundPixmap ); | 172 | slider.setBackgroundPixmap( backgroundPixmap ); |
173 | 173 | ||
174 | // Config cofg("qpe"); | 174 | // Config cofg("qpe"); |
175 | // cofg.setGroup("Appearance"); | 175 | // cofg.setGroup("Appearance"); |
176 | // QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) ); | 176 | // QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) ); |
177 | 177 | ||
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 ); |
215 | } | 215 | } |
216 | 216 | ||
217 | void AudioWidget::updateSlider( long i, long max ) { | 217 | void AudioWidget::updateSlider( long i, long max ) { |
218 | 218 | ||
219 | time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); | 219 | time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); |
220 | // qDebug( timeAsString( i ) + " / " + timeAsString( max ) ) ; | 220 | // qDebug( timeAsString( i ) + " / " + timeAsString( max ) ) ; |
221 | 221 | ||
222 | if ( max == 0 ) { | 222 | if ( max == 0 ) { |
223 | return; | 223 | return; |
224 | } | 224 | } |
225 | // Will flicker too much if we don't do this | 225 | // Will flicker too much if we don't do this |
226 | // Scale to something reasonable | 226 | // Scale to something reasonable |
@@ -250,49 +250,49 @@ void AudioWidget::skipBack() { | |||
250 | } | 250 | } |
251 | 251 | ||
252 | 252 | ||
253 | 253 | ||
254 | void AudioWidget::stopSkip() { | 254 | void AudioWidget::stopSkip() { |
255 | killTimers(); | 255 | killTimers(); |
256 | } | 256 | } |
257 | 257 | ||
258 | 258 | ||
259 | void AudioWidget::timerEvent( QTimerEvent * ) { | 259 | void AudioWidget::timerEvent( QTimerEvent * ) { |
260 | if ( skipDirection == +1 ) { | 260 | if ( skipDirection == +1 ) { |
261 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); | 261 | mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); |
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(); |
287 | e->accept(); | 287 | e->accept(); |
288 | break; | 288 | break; |
289 | case Key_Space: { | 289 | case Key_Space: { |
290 | e->accept(); | 290 | e->accept(); |
291 | mediaPlayerState.togglePaused(); | 291 | mediaPlayerState.togglePaused(); |
292 | } | 292 | } |
293 | break; | 293 | break; |
294 | case Key_Down: | 294 | case Key_Down: |
295 | // toggleButton(6); | 295 | // toggleButton(6); |
296 | emit lessClicked(); | 296 | emit lessClicked(); |
297 | emit lessReleased(); | 297 | emit lessReleased(); |
298 | // toggleButton(6); | 298 | // toggleButton(6); |