summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/audiowidget.cpp
Unidiff
Diffstat (limited to 'noncore/multimedia/opieplayer2/audiowidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp10
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
@@ -127,25 +127,25 @@ void AudioWidget::sliderPressed() {
127} 127}
128 128
129 129
130void AudioWidget::sliderReleased() { 130void AudioWidget::sliderReleased() {
131 audioSliderBeingMoved = FALSE; 131 audioSliderBeingMoved = FALSE;
132 if ( slider.width() == 0 ) 132 if ( slider.width() == 0 )
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
138void AudioWidget::setPosition( long i ) { 138void 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
144void AudioWidget::setLength( long max ) { 144void AudioWidget::setLength( long max ) {
145 updateSlider( mediaPlayerState.position(), max ); 145 updateSlider( mediaPlayerState.position(), max );
146} 146}
147 147
148 148
149void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) { 149void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) {
150 if ( mediaType == MediaPlayerState::Audio ) { 150 if ( mediaType == MediaPlayerState::Audio ) {
151 // startTimer( 150 ); 151 // startTimer( 150 );
@@ -181,55 +181,55 @@ void AudioWidget::loadSkin()
181 time.setFocusPolicy( QWidget::NoFocus ); 181 time.setFocusPolicy( QWidget::NoFocus );
182 time.setAlignment( Qt::AlignCenter ); 182 time.setAlignment( Qt::AlignCenter );
183 183
184// time.setFrame(FALSE); 184// time.setFrame(FALSE);
185// changeTextColor( &time ); 185// changeTextColor( &time );
186 186
187 resizeEvent( 0 ); 187 resizeEvent( 0 );
188} 188}
189 189
190void AudioWidget::setSeekable( bool isSeekable ) { 190void 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}
212 212
213 213
214static QString timeAsString( long length ) { 214static QString timeAsString( long length ) {
215 int minutes = length / 60; 215 int minutes = length / 60;
216 int seconds = length % 60; 216 int seconds = length % 60;
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
220void AudioWidget::updateSlider( long i, long max ) { 220void 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
230 int width = slider.width(); 230 int width = slider.width();
231 int val = int((double)i * width / max); 231 int val = int((double)i * width / max);
232 if ( !audioSliderBeingMoved ) { 232 if ( !audioSliderBeingMoved ) {
233 if ( slider.value() != val ) { 233 if ( slider.value() != val ) {
234 slider.setValue( val ); 234 slider.setValue( val );
235 } 235 }
@@ -265,25 +265,25 @@ void AudioWidget::timerEvent( QTimerEvent * ) {
265 } else if ( skipDirection == -1 ) { 265 } else if ( skipDirection == -1 ) {
266 mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); 266 mediaPlayerState.setPosition( mediaPlayerState.position() - 2 );
267 } 267 }
268} 268}
269 269
270void AudioWidget::keyReleaseEvent( QKeyEvent *e) { 270void 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();
284 e->accept(); 284 e->accept();
285 break; 285 break;
286 case Key_F12: //home 286 case Key_F12: //home
287 break; 287 break;
288 case Key_F13: //mail 288 case Key_F13: //mail
289 mediaPlayerState.toggleBlank(); 289 mediaPlayerState.toggleBlank();