summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-09 21:06:15 (UTC)
committer harlekin <harlekin>2002-08-09 21:06:15 (UTC)
commit62f9bc4e906784d201d758b9c0bba05a294a31be (patch) (unidiff)
treedfdb5b202046fdd87879fa0f8ccf75eec7369363
parent46eb53b1fd042d2591933a7d89a0e65b79140f16 (diff)
downloadopie-62f9bc4e906784d201d758b9c0bba05a294a31be.zip
opie-62f9bc4e906784d201d758b9c0bba05a294a31be.tar.gz
opie-62f9bc4e906784d201d758b9c0bba05a294a31be.tar.bz2
fix runnaway seek on media change
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 6b656ee..dc90a62 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -48,521 +48,522 @@
48#include "audiowidget.h" 48#include "audiowidget.h"
49#include "mediaplayerstate.h" 49#include "mediaplayerstate.h"
50 50
51extern MediaPlayerState *mediaPlayerState; 51extern MediaPlayerState *mediaPlayerState;
52 52
53static const int xo = -2; // movable x offset 53static const int xo = -2; // movable x offset
54static const int yo = 22; // movable y offset 54static const int yo = 22; // movable y offset
55 55
56 56
57Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) { 57Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) {
58 setFrameStyle( WinPanel | Sunken ); 58 setFrameStyle( WinPanel | Sunken );
59 setText( "No Song" ); 59 setText( "No Song" );
60} 60}
61 61
62Ticker::~Ticker() { 62Ticker::~Ticker() {
63} 63}
64 64
65void Ticker::setText( const QString& text ) { 65void Ticker::setText( const QString& text ) {
66 pos = 0; // reset it everytime the text is changed 66 pos = 0; // reset it everytime the text is changed
67 scrollText = text; 67 scrollText = text;
68 pixelLen = fontMetrics().width( scrollText ); 68 pixelLen = fontMetrics().width( scrollText );
69 killTimers(); 69 killTimers();
70 if ( pixelLen > width() ) { 70 if ( pixelLen > width() ) {
71 startTimer( 50 ); 71 startTimer( 50 );
72 } 72 }
73 update(); 73 update();
74} 74}
75 75
76 76
77void Ticker::timerEvent( QTimerEvent * ) { 77void Ticker::timerEvent( QTimerEvent * ) {
78 pos = ( pos + 1 > pixelLen ) ? 0 : pos + 1; 78 pos = ( pos + 1 > pixelLen ) ? 0 : pos + 1;
79 scroll( -1, 0, contentsRect() ); 79 scroll( -1, 0, contentsRect() );
80 repaint( FALSE ); 80 repaint( FALSE );
81} 81}
82 82
83void Ticker::drawContents( QPainter *p ) { 83void Ticker::drawContents( QPainter *p ) {
84 for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen ) 84 for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen )
85 p->drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText ); 85 p->drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText );
86 QPixmap pm( width(), height() ); 86 QPixmap pm( width(), height() );
87 pm.fill( colorGroup().base() ); 87 pm.fill( colorGroup().base() );
88 QPainter pmp( &pm ); 88 QPainter pmp( &pm );
89 for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen ) { 89 for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen ) {
90 pmp.drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText ); 90 pmp.drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText );
91 } 91 }
92 p->drawPixmap( 0, 0, pm ); 92 p->drawPixmap( 0, 0, pm );
93} 93}
94 94
95struct MediaButton { 95struct MediaButton {
96 bool isToggle, isHeld, isDown; 96 bool isToggle, isHeld, isDown;
97}; 97};
98 98
99//Layout information for the audioButtons (and if it is a toggle button or not) 99//Layout information for the audioButtons (and if it is a toggle button or not)
100MediaButton audioButtons[] = { 100MediaButton audioButtons[] = {
101 { TRUE, FALSE, FALSE }, // play 101 { TRUE, FALSE, FALSE }, // play
102 { FALSE, FALSE, FALSE }, // stop 102 { FALSE, FALSE, FALSE }, // stop
103 { FALSE, FALSE, FALSE }, // pause 103 { FALSE, FALSE, FALSE }, // pause
104 { FALSE, FALSE, FALSE }, // next 104 { FALSE, FALSE, FALSE }, // next
105 { FALSE, FALSE, FALSE }, // previous 105 { FALSE, FALSE, FALSE }, // previous
106 { FALSE, FALSE, FALSE }, // volume up 106 { FALSE, FALSE, FALSE }, // volume up
107 { FALSE, FALSE, FALSE }, // volume down 107 { FALSE, FALSE, FALSE }, // volume down
108 { TRUE, FALSE, FALSE }, // repeat/loop 108 { TRUE, FALSE, FALSE }, // repeat/loop
109 { FALSE, FALSE, FALSE }, // playlist 109 { FALSE, FALSE, FALSE }, // playlist
110 { FALSE, FALSE, FALSE }, // forward 110 { FALSE, FALSE, FALSE }, // forward
111 { FALSE, FALSE, FALSE } // back 111 { FALSE, FALSE, FALSE } // back
112}; 112};
113 113
114const char *skin_mask_file_names[11] = { 114const char *skin_mask_file_names[11] = {
115 "play", "stop", "pause", "next", "prev", "up", 115 "play", "stop", "pause", "next", "prev", "up",
116 "down", "loop", "playlist", "forward", "back" 116 "down", "loop", "playlist", "forward", "back"
117}; 117};
118 118
119 119
120static void changeTextColor( QWidget *w ) { 120static void changeTextColor( QWidget *w ) {
121 QPalette p = w->palette(); 121 QPalette p = w->palette();
122 p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); 122 p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) );
123 p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); 123 p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) );
124 w->setPalette( p ); 124 w->setPalette( p );
125} 125}
126 126
127static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton)); 127static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
128 128
129 129
130AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : 130AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
131 QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { 131 QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) {
132 setCaption( tr("OpiePlayer") ); 132 setCaption( tr("OpiePlayer") );
133 133
134 Config cfg("OpiePlayer"); 134 Config cfg("OpiePlayer");
135 cfg.setGroup("AudioWidget"); 135 cfg.setGroup("AudioWidget");
136 skin = cfg.readEntry("Skin","default"); 136 skin = cfg.readEntry("Skin","default");
137 //skin = "scaleTest"; 137 //skin = "scaleTest";
138// color of background, frame, degree of transparency 138// color of background, frame, degree of transparency
139 139
140 QString skinPath = "opieplayer/skins/" + skin; 140 QString skinPath = "opieplayer/skins/" + skin;
141 pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); 141 pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
142 imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); 142 imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
143 imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); 143 imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
144 144
145 imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 ); 145 imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
146 imgButtonMask->fill( 0 ); 146 imgButtonMask->fill( 0 );
147 147
148 for ( int i = 0; i < 11; i++ ) { 148 for ( int i = 0; i < 11; i++ ) {
149 QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png"; 149 QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png";
150 masks[i] = new QBitmap( filename ); 150 masks[i] = new QBitmap( filename );
151 151
152 if ( !masks[i]->isNull() ) { 152 if ( !masks[i]->isNull() ) {
153 QImage imgMask = masks[i]->convertToImage(); 153 QImage imgMask = masks[i]->convertToImage();
154 uchar **dest = imgButtonMask->jumpTable(); 154 uchar **dest = imgButtonMask->jumpTable();
155 for ( int y = 0; y < imgUp->height(); y++ ) { 155 for ( int y = 0; y < imgUp->height(); y++ ) {
156 uchar *line = dest[y]; 156 uchar *line = dest[y];
157 for ( int x = 0; x < imgUp->width(); x++ ) 157 for ( int x = 0; x < imgUp->width(); x++ )
158 if ( !qRed( imgMask.pixel( x, y ) ) ) 158 if ( !qRed( imgMask.pixel( x, y ) ) )
159 line[x] = i + 1; 159 line[x] = i + 1;
160 } 160 }
161 } 161 }
162 162
163 } 163 }
164 164
165 for ( int i = 0; i < 11; i++ ) { 165 for ( int i = 0; i < 11; i++ ) {
166 buttonPixUp[i] = NULL; 166 buttonPixUp[i] = NULL;
167 buttonPixDown[i] = NULL; 167 buttonPixDown[i] = NULL;
168 } 168 }
169 169
170 setBackgroundPixmap( *pixBg ); 170 setBackgroundPixmap( *pixBg );
171 171
172 songInfo.setFocusPolicy( QWidget::NoFocus ); 172 songInfo.setFocusPolicy( QWidget::NoFocus );
173 changeTextColor( &songInfo ); 173 changeTextColor( &songInfo );
174 174
175 slider.setFixedHeight( 20 ); 175 slider.setFixedHeight( 20 );
176 slider.setMinValue( 0 ); 176 slider.setMinValue( 0 );
177 slider.setMaxValue( 1 ); 177 slider.setMaxValue( 1 );
178 slider.setFocusPolicy( QWidget::NoFocus ); 178 slider.setFocusPolicy( QWidget::NoFocus );
179 slider.setBackgroundPixmap( *pixBg ); 179 slider.setBackgroundPixmap( *pixBg );
180 180
181 time.setFocusPolicy( QWidget::NoFocus ); 181 time.setFocusPolicy( QWidget::NoFocus );
182 time.setAlignment( Qt::AlignCenter ); 182 time.setAlignment( Qt::AlignCenter );
183 time.setFrame(FALSE); 183 time.setFrame(FALSE);
184 changeTextColor( &time ); 184 changeTextColor( &time );
185 185
186 resizeEvent( NULL ); 186 resizeEvent( NULL );
187 187
188 connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); 188 connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) );
189 connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); 189 connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) );
190 190
191 connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); 191 connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) );
192 connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) ); 192 connect( mediaPlayerState, SIGNAL( viewChanged(char) ), this, SLOT( setView(char) ) );
193 connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); 193 connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
194 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) ); 194 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( setPaused(bool) ) );
195 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); 195 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
196 196
197 connect( this, SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) ); 197 connect( this, SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) );
198 connect( this, SIGNAL( backClicked() ), this, SLOT( skipBack() ) ); 198 connect( this, SIGNAL( backClicked() ), this, SLOT( skipBack() ) );
199 connect( this, SIGNAL( forwardReleased() ), this, SLOT( stopSkip() ) ); 199 connect( this, SIGNAL( forwardReleased() ), this, SLOT( stopSkip() ) );
200 connect( this, SIGNAL( backReleased() ), this, SLOT( stopSkip() ) ); 200 connect( this, SIGNAL( backReleased() ), this, SLOT( stopSkip() ) );
201 201
202 202
203 203
204 // Intialise state 204 // Intialise state
205 setLength( mediaPlayerState->length() ); 205 setLength( mediaPlayerState->length() );
206 setPosition( mediaPlayerState->position() ); 206 setPosition( mediaPlayerState->position() );
207 setLooping( mediaPlayerState->fullscreen() ); 207 setLooping( mediaPlayerState->fullscreen() );
208 setPaused( mediaPlayerState->paused() ); 208 setPaused( mediaPlayerState->paused() );
209 setPlaying( mediaPlayerState->playing() ); 209 setPlaying( mediaPlayerState->playing() );
210 210
211} 211}
212 212
213AudioWidget::~AudioWidget() { 213AudioWidget::~AudioWidget() {
214 214
215 for ( int i = 0; i < 11; i++ ) { 215 for ( int i = 0; i < 11; i++ ) {
216 delete buttonPixUp[i]; 216 delete buttonPixUp[i];
217 delete buttonPixDown[i]; 217 delete buttonPixDown[i];
218 } 218 }
219 delete pixBg; 219 delete pixBg;
220 delete imgUp; 220 delete imgUp;
221 delete imgDn; 221 delete imgDn;
222 delete imgButtonMask; 222 delete imgButtonMask;
223 for ( int i = 0; i < 11; i++ ) { 223 for ( int i = 0; i < 11; i++ ) {
224 delete masks[i]; 224 delete masks[i];
225 } 225 }
226} 226}
227 227
228QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { 228QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
229 QPixmap pix( img.width(), img.height() ); 229 QPixmap pix( img.width(), img.height() );
230 QPainter p( &pix ); 230 QPainter p( &pix );
231 p.drawTiledPixmap( pix.rect(), bg, offset ); 231 p.drawTiledPixmap( pix.rect(), bg, offset );
232 p.drawImage( 0, 0, img ); 232 p.drawImage( 0, 0, img );
233 return new QPixmap( pix ); 233 return new QPixmap( pix );
234} 234}
235 235
236 236
237QPixmap *maskPixToMask( QPixmap pix, QBitmap mask ) 237QPixmap *maskPixToMask( QPixmap pix, QBitmap mask )
238{ 238{
239 QPixmap *pixmap = new QPixmap( pix ); 239 QPixmap *pixmap = new QPixmap( pix );
240 pixmap->setMask( mask ); 240 pixmap->setMask( mask );
241 return pixmap; 241 return pixmap;
242} 242}
243 243
244 244
245 245
246void AudioWidget::resizeEvent( QResizeEvent * ) { 246void AudioWidget::resizeEvent( QResizeEvent * ) {
247 int h = height(); 247 int h = height();
248 int w = width(); 248 int w = width();
249 249
250 songInfo.setGeometry( QRect( 2, 10, w - 4, 20 ) ); 250 songInfo.setGeometry( QRect( 2, 10, w - 4, 20 ) );
251 slider.setFixedWidth( w - 110 ); 251 slider.setFixedWidth( w - 110 );
252 slider.setGeometry( QRect( 15, h - 30, w - 90, 20 ) ); 252 slider.setGeometry( QRect( 15, h - 30, w - 90, 20 ) );
253 slider.setBackgroundOrigin( QWidget::ParentOrigin ); 253 slider.setBackgroundOrigin( QWidget::ParentOrigin );
254 time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) ); 254 time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) );
255 255
256 xoff = ( w - imgUp->width() ) / 2; 256 xoff = ( w - imgUp->width() ) / 2;
257 yoff = (( h - imgUp->height() ) / 2) - 10; 257 yoff = (( h - imgUp->height() ) / 2) - 10;
258 QPoint p( xoff, yoff ); 258 QPoint p( xoff, yoff );
259 259
260 QPixmap *pixUp = combineImageWithBackground( *imgUp, *pixBg, p ); 260 QPixmap *pixUp = combineImageWithBackground( *imgUp, *pixBg, p );
261 QPixmap *pixDn = combineImageWithBackground( *imgDn, *pixBg, p ); 261 QPixmap *pixDn = combineImageWithBackground( *imgDn, *pixBg, p );
262 262
263 for ( int i = 0; i < 11; i++ ) { 263 for ( int i = 0; i < 11; i++ ) {
264 if ( !masks[i]->isNull() ) { 264 if ( !masks[i]->isNull() ) {
265 delete buttonPixUp[i]; 265 delete buttonPixUp[i];
266 delete buttonPixDown[i]; 266 delete buttonPixDown[i];
267 buttonPixUp[i] = maskPixToMask( *pixUp, *masks[i] ); 267 buttonPixUp[i] = maskPixToMask( *pixUp, *masks[i] );
268 buttonPixDown[i] = maskPixToMask( *pixDn, *masks[i] ); 268 buttonPixDown[i] = maskPixToMask( *pixDn, *masks[i] );
269 } 269 }
270 } 270 }
271 271
272 delete pixUp; 272 delete pixUp;
273 delete pixDn; 273 delete pixDn;
274} 274}
275 275
276static bool audioSliderBeingMoved = FALSE; 276static bool audioSliderBeingMoved = FALSE;
277 277
278 278
279void AudioWidget::sliderPressed() { 279void AudioWidget::sliderPressed() {
280 audioSliderBeingMoved = TRUE; 280 audioSliderBeingMoved = TRUE;
281} 281}
282 282
283 283
284void AudioWidget::sliderReleased() { 284void AudioWidget::sliderReleased() {
285 audioSliderBeingMoved = FALSE; 285 audioSliderBeingMoved = FALSE;
286 if ( slider.width() == 0 ) 286 if ( slider.width() == 0 )
287 return; 287 return;
288 long val = long((double)slider.value() * mediaPlayerState->length() / slider.width()); 288 long val = long((double)slider.value() * mediaPlayerState->length() / slider.width());
289 mediaPlayerState->setPosition( val ); 289 mediaPlayerState->setPosition( val );
290} 290}
291 291
292void AudioWidget::setPosition( long i ) { 292void AudioWidget::setPosition( long i ) {
293// qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i); 293// qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i);
294 updateSlider( i, mediaPlayerState->length() ); 294 updateSlider( i, mediaPlayerState->length() );
295} 295}
296 296
297 297
298void AudioWidget::setLength( long max ) { 298void AudioWidget::setLength( long max ) {
299 updateSlider( mediaPlayerState->position(), max ); 299 updateSlider( mediaPlayerState->position(), max );
300} 300}
301 301
302 302
303void AudioWidget::setView( char view ) { 303void AudioWidget::setView( char view ) {
304 slider.show();
305 304
306// this isnt working for some reason 305// this isnt working for some reason
307 306
308// if ( mediaPlayerState->streaming() ) { 307 if ( mediaPlayerState->streaming() ) {
309// qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); 308 qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
310// if( !slider.isHidden()) slider.hide(); 309 if( !slider.isHidden()) {
311// disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); 310 slider.hide();
312// disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); 311 }
313// } else { 312 disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
313 disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
314 } else {
314 // this stops the slider from being moved, thus 315 // this stops the slider from being moved, thus
315 // does not stop stream when it reaches the end 316 // does not stop stream when it reaches the end
316 // slider.show(); 317 slider.show();
317 connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); 318 connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
318 connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); 319 connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
319// } 320 }
320 321
321 if ( view == 'a' ) { 322 if ( view == 'a' ) {
322 startTimer( 150 ); 323 // startTimer( 150 );
323 showMaximized(); 324 showMaximized();
324 } else { 325 } else {
325 killTimers(); 326 killTimers();
326 hide(); 327 hide();
327 } 328 }
328} 329}
329 330
330 331
331static QString timeAsString( long length ) { 332static QString timeAsString( long length ) {
332 int minutes = length / 60; 333 int minutes = length / 60;
333 int seconds = length % 60; 334 int seconds = length % 60;
334 return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 ); 335 return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 );
335} 336}
336 337
337void AudioWidget::updateSlider( long i, long max ) { 338void AudioWidget::updateSlider( long i, long max ) {
338 339
339 time.setText( timeAsString( i ) + " / " + timeAsString( max ) ); 340 time.setText( timeAsString( i ) + " / " + timeAsString( max ) );
340// qDebug( timeAsString( i ) + " / " + timeAsString( max ) ) ; 341// qDebug( timeAsString( i ) + " / " + timeAsString( max ) ) ;
341 342
342 if ( max == 0 ) { 343 if ( max == 0 ) {
343 return; 344 return;
344 } 345 }
345 // Will flicker too much if we don't do this 346 // Will flicker too much if we don't do this
346 // Scale to something reasonable 347 // Scale to something reasonable
347 int width = slider.width(); 348 int width = slider.width();
348 int val = int((double)i * width / max); 349 int val = int((double)i * width / max);
349 if ( !audioSliderBeingMoved ) { 350 if ( !audioSliderBeingMoved ) {
350 if ( slider.value() != val ) { 351 if ( slider.value() != val ) {
351 slider.setValue( val ); 352 slider.setValue( val );
352 } 353 }
353 354
354 if ( slider.maxValue() != width ) { 355 if ( slider.maxValue() != width ) {
355 slider.setMaxValue( width ); 356 slider.setMaxValue( width );
356 } 357 }
357 } 358 }
358} 359}
359 360
360 361
361void AudioWidget::setToggleButton( int i, bool down ) { 362void AudioWidget::setToggleButton( int i, bool down ) {
362 if ( down != audioButtons[i].isDown ) { 363 if ( down != audioButtons[i].isDown ) {
363 toggleButton( i ); 364 toggleButton( i );
364 } 365 }
365} 366}
366 367
367 368
368void AudioWidget::toggleButton( int i ) { 369void AudioWidget::toggleButton( int i ) {
369 audioButtons[i].isDown = !audioButtons[i].isDown; 370 audioButtons[i].isDown = !audioButtons[i].isDown;
370 QPainter p(this); 371 QPainter p(this);
371 paintButton ( &p, i ); 372 paintButton ( &p, i );
372} 373}
373 374
374 375
375void AudioWidget::paintButton( QPainter *p, int i ) { 376void AudioWidget::paintButton( QPainter *p, int i ) {
376 if ( audioButtons[i].isDown ) 377 if ( audioButtons[i].isDown )
377 p->drawPixmap( xoff, yoff, *buttonPixDown[i] ); 378 p->drawPixmap( xoff, yoff, *buttonPixDown[i] );
378 else 379 else
379 p->drawPixmap( xoff, yoff, *buttonPixUp[i] ); 380 p->drawPixmap( xoff, yoff, *buttonPixUp[i] );
380} 381}
381 382
382 383
383void AudioWidget::skipFor() { 384void AudioWidget::skipFor() {
384 skipDirection = +1; 385 skipDirection = +1;
385 startTimer( 50 ); 386 startTimer( 50 );
386 mediaPlayerState->setPosition( mediaPlayerState->position() + 2 ); 387 mediaPlayerState->setPosition( mediaPlayerState->position() + 2 );
387} 388}
388 389
389void AudioWidget::skipBack() { 390void AudioWidget::skipBack() {
390 skipDirection = -1; 391 skipDirection = -1;
391 startTimer( 50 ); 392 startTimer( 50 );
392 mediaPlayerState->setPosition( mediaPlayerState->position() - 2 ); 393 mediaPlayerState->setPosition( mediaPlayerState->position() - 2 );
393} 394}
394 395
395 396
396 397
397void AudioWidget::stopSkip() { 398void AudioWidget::stopSkip() {
398 killTimers(); 399 killTimers();
399} 400}
400 401
401 402
402void AudioWidget::timerEvent( QTimerEvent * ) { 403void AudioWidget::timerEvent( QTimerEvent * ) {
403 if ( skipDirection == +1 ) { 404 if ( skipDirection == +1 ) {
404 mediaPlayerState->setPosition( mediaPlayerState->position() + 2 ); 405 mediaPlayerState->setPosition( mediaPlayerState->position() + 2 );
405 } else if ( skipDirection == -1 ) { 406 } else if ( skipDirection == -1 ) {
406 mediaPlayerState->setPosition( mediaPlayerState->position() - 2 ); 407 mediaPlayerState->setPosition( mediaPlayerState->position() - 2 );
407 } 408 }
408} 409}
409 410
410 411
411void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { 412void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
412 for ( int i = 0; i < numButtons; i++ ) { 413 for ( int i = 0; i < numButtons; i++ ) {
413 if ( event->state() == QMouseEvent::LeftButton ) { 414 if ( event->state() == QMouseEvent::LeftButton ) {
414 415
415 // The test to see if the mouse click is inside the button or not 416 // The test to see if the mouse click is inside the button or not
416 int x = event->pos().x() - xoff; 417 int x = event->pos().x() - xoff;
417 int y = event->pos().y() - yoff; 418 int y = event->pos().y() - yoff;
418 419
419 bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width() 420 bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width()
420 && y < imgButtonMask->height() && imgButtonMask->pixelIndex( x, y ) == i + 1 ); 421 && y < imgButtonMask->height() && imgButtonMask->pixelIndex( x, y ) == i + 1 );
421 422
422 if ( isOnButton && i == AudioVolumeUp ) 423 if ( isOnButton && i == AudioVolumeUp )
423 qDebug("on up"); 424 qDebug("on up");
424 425
425 if ( isOnButton && !audioButtons[i].isHeld ) { 426 if ( isOnButton && !audioButtons[i].isHeld ) {
426 audioButtons[i].isHeld = TRUE; 427 audioButtons[i].isHeld = TRUE;
427 toggleButton(i); 428 toggleButton(i);
428 switch (i) { 429 switch (i) {
429 case AudioVolumeUp: 430 case AudioVolumeUp:
430 qDebug("more clicked"); 431 qDebug("more clicked");
431 emit moreClicked(); 432 emit moreClicked();
432 return; 433 return;
433 case AudioVolumeDown: 434 case AudioVolumeDown:
434 emit lessClicked(); 435 emit lessClicked();
435 return; 436 return;
436 case AudioForward: 437 case AudioForward:
437 emit forwardClicked(); 438 emit forwardClicked();
438 return; 439 return;
439 case AudioBack: 440 case AudioBack:
440 emit backClicked(); 441 emit backClicked();
441 return; 442 return;
442 } 443 }
443 } else if ( !isOnButton && audioButtons[i].isHeld ) { 444 } else if ( !isOnButton && audioButtons[i].isHeld ) {
444 audioButtons[i].isHeld = FALSE; 445 audioButtons[i].isHeld = FALSE;
445 toggleButton(i); 446 toggleButton(i);
446 } 447 }
447 } else { 448 } else {
448 if ( audioButtons[i].isHeld ) { 449 if ( audioButtons[i].isHeld ) {
449 audioButtons[i].isHeld = FALSE; 450 audioButtons[i].isHeld = FALSE;
450 if ( !audioButtons[i].isToggle ) { 451 if ( !audioButtons[i].isToggle ) {
451 setToggleButton( i, FALSE ); 452 setToggleButton( i, FALSE );
452 qDebug("button toggled3 %d",i); 453 qDebug("button toggled3 %d",i);
453 } 454 }
454 switch (i) { 455 switch (i) {
455 case AudioPlay: mediaPlayerState->setPlaying(audioButtons[i].isDown); return; 456 case AudioPlay: mediaPlayerState->setPlaying(audioButtons[i].isDown); return;
456 case AudioStop: mediaPlayerState->setPlaying(FALSE); return; 457 case AudioStop: mediaPlayerState->setPlaying(FALSE); return;
457 case AudioPause: mediaPlayerState->setPaused( audioButtons[i].isDown); return; 458 case AudioPause: mediaPlayerState->setPaused( audioButtons[i].isDown); return;
458 case AudioNext: mediaPlayerState->setNext(); return; 459 case AudioNext: mediaPlayerState->setNext(); return;
459 case AudioPrevious: mediaPlayerState->setPrev(); return; 460 case AudioPrevious: mediaPlayerState->setPrev(); return;
460 case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; 461 case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return;
461 case AudioVolumeUp: emit moreReleased(); return; 462 case AudioVolumeUp: emit moreReleased(); return;
462 case AudioVolumeDown: emit lessReleased(); return; 463 case AudioVolumeDown: emit lessReleased(); return;
463 case AudioPlayList: mediaPlayerState->setList(); return; 464 case AudioPlayList: mediaPlayerState->setList(); return;
464 case AudioForward: emit forwardReleased(); return; 465 case AudioForward: emit forwardReleased(); return;
465 case AudioBack: emit backReleased(); return; 466 case AudioBack: emit backReleased(); return;
466 } 467 }
467 } 468 }
468 } 469 }
469 } 470 }
470} 471}
471 472
472 473
473void AudioWidget::mousePressEvent( QMouseEvent *event ) { 474void AudioWidget::mousePressEvent( QMouseEvent *event ) {
474 mouseMoveEvent( event ); 475 mouseMoveEvent( event );
475} 476}
476 477
477 478
478void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) { 479void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) {
479 mouseMoveEvent( event ); 480 mouseMoveEvent( event );
480} 481}
481 482
482 483
483void AudioWidget::showEvent( QShowEvent* ) { 484void AudioWidget::showEvent( QShowEvent* ) {
484 QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); 485 QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
485 mouseMoveEvent( &event ); 486 mouseMoveEvent( &event );
486} 487}
487 488
488 489
489void AudioWidget::closeEvent( QCloseEvent* ) { 490void AudioWidget::closeEvent( QCloseEvent* ) {
490 mediaPlayerState->setList(); 491 mediaPlayerState->setList();
491} 492}
492 493
493 494
494void AudioWidget::paintEvent( QPaintEvent * pe) { 495void AudioWidget::paintEvent( QPaintEvent * pe) {
495 if ( !pe->erased() ) { 496 if ( !pe->erased() ) {
496 // Combine with background and double buffer 497 // Combine with background and double buffer
497 QPixmap pix( pe->rect().size() ); 498 QPixmap pix( pe->rect().size() );
498 QPainter p( &pix ); 499 QPainter p( &pix );
499 p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); 500 p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
500 p.drawTiledPixmap( pe->rect(), *pixBg, pe->rect().topLeft() ); 501 p.drawTiledPixmap( pe->rect(), *pixBg, pe->rect().topLeft() );
501 for ( int i = 0; i < numButtons; i++ ) 502 for ( int i = 0; i < numButtons; i++ )
502 paintButton( &p, i ); 503 paintButton( &p, i );
503 QPainter p2( this ); 504 QPainter p2( this );
504 p2.drawPixmap( pe->rect().topLeft(), pix ); 505 p2.drawPixmap( pe->rect().topLeft(), pix );
505 } else { 506 } else {
506 QPainter p( this ); 507 QPainter p( this );
507 for ( int i = 0; i < numButtons; i++ ) 508 for ( int i = 0; i < numButtons; i++ )
508 paintButton( &p, i ); 509 paintButton( &p, i );
509 } 510 }
510} 511}
511 512
512void AudioWidget::keyReleaseEvent( QKeyEvent *e) 513void AudioWidget::keyReleaseEvent( QKeyEvent *e)
513{ 514{
514 switch ( e->key() ) { 515 switch ( e->key() ) {
515////////////////////////////// Zaurus keys 516////////////////////////////// Zaurus keys
516 case Key_Home: 517 case Key_Home:
517 break; 518 break;
518 case Key_F9: //activity 519 case Key_F9: //activity
519 hide(); 520 hide();
520// qDebug("Audio F9"); 521// qDebug("Audio F9");
521 break; 522 break;
522 case Key_F10: //contacts 523 case Key_F10: //contacts
523 break; 524 break;
524 case Key_F11: //menu 525 case Key_F11: //menu
525 break; 526 break;
526 case Key_F12: //home 527 case Key_F12: //home
527 break; 528 break;
528 case Key_F13: //mail 529 case Key_F13: //mail
529 break; 530 break;
530 case Key_Space: { 531 case Key_Space: {
531 if(mediaPlayerState->playing()) { 532 if(mediaPlayerState->playing()) {
532// toggleButton(1); 533// toggleButton(1);
533 mediaPlayerState->setPlaying(FALSE); 534 mediaPlayerState->setPlaying(FALSE);
534// toggleButton(1); 535// toggleButton(1);
535 } else { 536 } else {
536// toggleButton(0); 537// toggleButton(0);
537 mediaPlayerState->setPlaying(TRUE); 538 mediaPlayerState->setPlaying(TRUE);
538// toggleButton(0); 539// toggleButton(0);
539 } 540 }
540 } 541 }
541 break; 542 break;
542 case Key_Down: 543 case Key_Down:
543 toggleButton(6); 544 toggleButton(6);
544 emit lessClicked(); 545 emit lessClicked();
545 emit lessReleased(); 546 emit lessReleased();
546 toggleButton(6); 547 toggleButton(6);
547 break; 548 break;
548 case Key_Up: 549 case Key_Up:
549 toggleButton(5); 550 toggleButton(5);
550 emit moreClicked(); 551 emit moreClicked();
551 emit moreReleased(); 552 emit moreReleased();
552 toggleButton(5); 553 toggleButton(5);
553 break; 554 break;
554 case Key_Right: 555 case Key_Right:
555// toggleButton(3); 556// toggleButton(3);
556 mediaPlayerState->setNext(); 557 mediaPlayerState->setNext();
557// toggleButton(3); 558// toggleButton(3);
558 break; 559 break;
559 case Key_Left: 560 case Key_Left:
560// toggleButton(4); 561// toggleButton(4);
561 mediaPlayerState->setPrev(); 562 mediaPlayerState->setPrev();
562// toggleButton(4); 563// toggleButton(4);
563 break; 564 break;
564 case Key_Escape: 565 case Key_Escape:
565 break; 566 break;
566 567
567 }; 568 };
568} 569}