summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp28
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h2
2 files changed, 26 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 879d0b4..4172da0 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -52,57 +52,77 @@
52 52
53namespace 53namespace
54{ 54{
55 55
56const int xo = -2; // movable x offset 56const int xo = -2; // movable x offset
57const int yo = 22; // movable y offset 57const int yo = 22; // movable y offset
58 58
59struct MediaButton { 59struct MediaButton {
60 bool isToggle, isHeld, isDown; 60 bool isToggle, isHeld, isDown;
61}; 61};
62 62
63//Layout information for the audioButtons (and if it is a toggle button or not) 63//Layout information for the audioButtons (and if it is a toggle button or not)
64/*
64MediaWidget::Button audioButtons[] = { 65MediaWidget::Button audioButtons[] = {
65 { TRUE, FALSE, FALSE }, // play 66 { TRUE, FALSE, FALSE }, // play
66 { FALSE, FALSE, FALSE }, // stop 67 { FALSE, FALSE, FALSE }, // stop
67 { FALSE, FALSE, FALSE }, // next 68 { FALSE, FALSE, FALSE }, // next
68 { FALSE, FALSE, FALSE }, // previous 69 { FALSE, FALSE, FALSE }, // previous
69 { FALSE, FALSE, FALSE }, // volume up 70 { FALSE, FALSE, FALSE }, // volume up
70 { FALSE, FALSE, FALSE }, // volume down 71 { FALSE, FALSE, FALSE }, // volume down
71 { TRUE, FALSE, FALSE }, // repeat/loop 72 { TRUE, FALSE, FALSE }, // repeat/loop
72 { FALSE, FALSE, FALSE }, // playlist 73 { FALSE, FALSE, FALSE }, // playlist
73 { FALSE, FALSE, FALSE }, // forward 74 { FALSE, FALSE, FALSE }, // forward
74 { FALSE, FALSE, FALSE } // back 75 { FALSE, FALSE, FALSE } // back
75}; 76};
77*/
76 78
77const char * const skin_mask_file_names[10] = { 79const char * const skin_mask_file_names[10] = {
78 "play", "stop", "next", "prev", "up", 80 "play", "stop", "next", "prev", "up",
79 "down", "loop", "playlist", "forward", "back" 81 "down", "loop", "playlist", "forward", "back"
80}; 82};
81 83
82void changeTextColor( QWidget * w) { 84void changeTextColor( QWidget * w) {
83 QPalette p = w->palette(); 85 QPalette p = w->palette();
84 p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); 86 p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) );
85 p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); 87 p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) );
86 w->setPalette( p ); 88 w->setPalette( p );
87} 89}
88 90
89const int numButtons = (sizeof(audioButtons)/sizeof(MediaWidget::Button)); 91//const int numButtons = (sizeof(audioButtons)/sizeof(MediaWidget::Button));
90 92
91} 93}
92 94
93AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : 95AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) :
94 96
95 MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { 97 MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) {
96 98
99 Button defaultButton;
100 defaultButton.isToggle = defaultButton.isHeld = defaultButton.isDown = false;
101 Button toggleButton;
102 toggleButton.isToggle = true;
103 toggleButton.isHeld = toggleButton.isDown = false;
104
105 audioButtons.reserve( 10 );
106 audioButtons.push_back( toggleButton ); // play
107 audioButtons.push_back( defaultButton ); // stop
108 audioButtons.push_back( defaultButton ); // next
109 audioButtons.push_back( defaultButton ); // previous
110 audioButtons.push_back( defaultButton ); // volume up
111 audioButtons.push_back( defaultButton ); // volume down
112 audioButtons.push_back( toggleButton ); // repeat/loop
113 audioButtons.push_back( defaultButton ); // playlist
114 audioButtons.push_back( defaultButton ); // forward
115 audioButtons.push_back( defaultButton ); // back
116
97 setCaption( tr("OpiePlayer") ); 117 setCaption( tr("OpiePlayer") );
98 118
99 Config cfg("OpiePlayer"); 119 Config cfg("OpiePlayer");
100 cfg.setGroup("Options"); 120 cfg.setGroup("Options");
101 skin = cfg.readEntry("Skin","default"); 121 skin = cfg.readEntry("Skin","default");
102 //skin = "scaleTest"; 122 //skin = "scaleTest";
103 // color of background, frame, degree of transparency 123 // color of background, frame, degree of transparency
104 124
105 QString skinPath = "opieplayer2/skins/" + skin; 125 QString skinPath = "opieplayer2/skins/" + skin;
106 pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); 126 pixBg = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
107 imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); 127 imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
108 imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); 128 imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
@@ -371,25 +391,25 @@ void AudioWidget::stopSkip() {
371 391
372 392
373void AudioWidget::timerEvent( QTimerEvent * ) { 393void AudioWidget::timerEvent( QTimerEvent * ) {
374 if ( skipDirection == +1 ) { 394 if ( skipDirection == +1 ) {
375 mediaPlayerState.setPosition( mediaPlayerState.position() + 2 ); 395 mediaPlayerState.setPosition( mediaPlayerState.position() + 2 );
376 } else if ( skipDirection == -1 ) { 396 } else if ( skipDirection == -1 ) {
377 mediaPlayerState.setPosition( mediaPlayerState.position() - 2 ); 397 mediaPlayerState.setPosition( mediaPlayerState.position() - 2 );
378 } 398 }
379} 399}
380 400
381 401
382void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { 402void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
383 for ( int i = 0; i < numButtons; i++ ) { 403 for ( unsigned int i = 0; i < audioButtons.size(); i++ ) {
384 if ( event->state() == QMouseEvent::LeftButton ) { 404 if ( event->state() == QMouseEvent::LeftButton ) {
385 // The test to see if the mouse click is inside the button or not 405 // The test to see if the mouse click is inside the button or not
386 int x = event->pos().x() - xoff; 406 int x = event->pos().x() - xoff;
387 int y = event->pos().y() - yoff; 407 int y = event->pos().y() - yoff;
388 408
389 bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask.width() 409 bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask.width()
390 && y < imgButtonMask.height() 410 && y < imgButtonMask.height()
391 && imgButtonMask.pixelIndex( x, y ) == i + 1 ); 411 && imgButtonMask.pixelIndex( x, y ) == i + 1 );
392 412
393 if ( isOnButton && !audioButtons[i].isHeld ) { 413 if ( isOnButton && !audioButtons[i].isHeld ) {
394 audioButtons[i].isHeld = TRUE; 414 audioButtons[i].isHeld = TRUE;
395 toggleButton(i); 415 toggleButton(i);
@@ -439,31 +459,31 @@ void AudioWidget::showEvent( QShowEvent* ) {
439 QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 ); 459 QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
440 mouseMoveEvent( &event ); 460 mouseMoveEvent( &event );
441} 461}
442 462
443 463
444void AudioWidget::paintEvent( QPaintEvent * pe ) { 464void AudioWidget::paintEvent( QPaintEvent * pe ) {
445 if ( !pe->erased() ) { 465 if ( !pe->erased() ) {
446 // Combine with background and double buffer 466 // Combine with background and double buffer
447 QPixmap pix( pe->rect().size() ); 467 QPixmap pix( pe->rect().size() );
448 QPainter p( &pix ); 468 QPainter p( &pix );
449 p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() ); 469 p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
450 p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() ); 470 p.drawTiledPixmap( pe->rect(), pixBg, pe->rect().topLeft() );
451 for ( int i = 0; i < numButtons; i++ ) 471 for ( unsigned int i = 0; i < audioButtons.size(); i++ )
452 paintButton( &p, i ); 472 paintButton( &p, i );
453 QPainter p2( this ); 473 QPainter p2( this );
454 p2.drawPixmap( pe->rect().topLeft(), pix ); 474 p2.drawPixmap( pe->rect().topLeft(), pix );
455 } else { 475 } else {
456 QPainter p( this ); 476 QPainter p( this );
457 for ( int i = 0; i < numButtons; i++ ) 477 for ( unsigned int i = 0; i < audioButtons.size(); i++ )
458 paintButton( &p, i ); 478 paintButton( &p, i );
459 } 479 }
460} 480}
461 481
462void AudioWidget::keyReleaseEvent( QKeyEvent *e) { 482void AudioWidget::keyReleaseEvent( QKeyEvent *e) {
463 switch ( e->key() ) { 483 switch ( e->key() ) {
464 ////////////////////////////// Zaurus keys 484 ////////////////////////////// Zaurus keys
465 case Key_Home: 485 case Key_Home:
466 break; 486 break;
467 case Key_F9: //activity 487 case Key_F9: //activity
468 hide(); 488 hide();
469 // qDebug("Audio F9"); 489 // qDebug("Audio F9");
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 52a358c..e09c5f8 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -101,17 +101,19 @@ private:
101 QImage imgDn; 101 QImage imgDn;
102 QImage imgButtonMask; 102 QImage imgButtonMask;
103 QBitmap *masks[10]; 103 QBitmap *masks[10];
104 QPixmap *buttonPixUp[10]; 104 QPixmap *buttonPixUp[10];
105 QPixmap *buttonPixDown[10]; 105 QPixmap *buttonPixDown[10];
106 106
107 QPixmap *pixmaps[4]; 107 QPixmap *pixmaps[4];
108 OTicker songInfo; 108 OTicker songInfo;
109 QSlider slider; 109 QSlider slider;
110 QLineEdit time; 110 QLineEdit time;
111 int xoff, yoff; 111 int xoff, yoff;
112 bool isStreaming : 1; 112 bool isStreaming : 1;
113
114 ButtonVector audioButtons;
113}; 115};
114 116
115 117
116#endif // AUDIO_WIDGET_H 118#endif // AUDIO_WIDGET_H
117 119