2 files changed, 23 insertions, 14 deletions

diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 2cb1385..cc6187c 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -1,568 +1,577 @@
 /*
                             This file is part of the Opie Project
 
                              Copyright (c)  2002 Max Reiss <harlekin@handhelds.org>
                              Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
                              Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <qwidget.h>
 #include <qpixmap.h>
 #include <qbutton.h>
 #include <qpainter.h>
 #include <qframe.h>
 #include <qlayout.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 
 #include "audiowidget.h"
 #include "mediaplayerstate.h"
 
 extern MediaPlayerState *mediaPlayerState;
 
 static const int xo = -2; // movable x offset
 static const int yo = 22; // movable y offset
 
 
 Ticker::Ticker( QWidget* parent=0 ) : QFrame( parent ) {
         setFrameStyle( WinPanel | Sunken );
         setText( "No Song" );
 }
 
 Ticker::~Ticker() {
 }
 
 void Ticker::setText( const QString& text ) {
     pos = 0; // reset it everytime the text is changed
     scrollText = text;
     pixelLen = fontMetrics().width( scrollText );
     killTimers();
     if ( pixelLen > width() ) {
         startTimer( 50 );
     }
     update();
 }
 
 
 void Ticker::timerEvent( QTimerEvent * ) {
     pos = ( pos + 1 > pixelLen ) ? 0 : pos + 1;
     scroll( -1, 0, contentsRect() );
     repaint( FALSE );
 }
 
 void Ticker::drawContents( QPainter *p ) {
   for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen )
       p->drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText );
     QPixmap pm( width(), height() );
     pm.fill( colorGroup().base() );
     QPainter pmp( &pm );
     for ( int i = 0; i - pos < width() && (i < 1 || pixelLen > width()); i += pixelLen ) {
         pmp.drawText( i - pos, 0, INT_MAX, height(), AlignVCenter, scrollText );
     }
     p->drawPixmap( 0, 0, pm );
 }
 
 struct MediaButton {
    bool isToggle, isHeld, isDown;
 };
 
 //Layout information for the audioButtons (and if it is a toggle button or not)
 MediaButton audioButtons[] = {
    { TRUE,  FALSE, FALSE }, // play
    { FALSE, FALSE, FALSE }, // stop
-   { FALSE,  FALSE, FALSE }, // pause
    { FALSE, FALSE, FALSE }, // next
    { FALSE, FALSE, FALSE }, // previous
    { FALSE, FALSE, FALSE }, // volume up
    { FALSE, FALSE, FALSE }, // volume down
    { TRUE,  FALSE, FALSE }, // repeat/loop
    { FALSE, FALSE, FALSE }, // playlist
    { FALSE, FALSE, FALSE }, // forward
    { FALSE, FALSE, FALSE }  // back
 };
 
-const char *skin_mask_file_names[11] = {
-   "play", "stop", "pause", "next", "prev", "up",
+const char *skin_mask_file_names[10] = {
+   "play", "stop", "next", "prev", "up",
    "down", "loop", "playlist", "forward", "back"
 };
 
 
 static void changeTextColor( QWidget *w ) {
    QPalette p = w->palette();
    p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) );
    p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) );
    w->setPalette( p );
 }
 
 static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
 
 
 AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
         QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ),  time( this ) {
     setCaption( tr("OpiePlayer") );
 
     Config cfg("OpiePlayer");
     cfg.setGroup("Options");
     skin = cfg.readEntry("Skin","default");
       //skin = "scaleTest";
 // color of background, frame, degree of transparency
 
     QString skinPath = "opieplayer2/skins/" + skin;
     pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
     imgUp = new QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) );
     imgDn = new QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) );
 
     imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
     imgButtonMask->fill( 0 );
 
-    for ( int i = 0; i < 11; i++ ) {
+    for ( int i = 0; i < 10; i++ ) {
         QString filename = QString(getenv("OPIEDIR")) + "/pics/" + skinPath + "/skin_mask_" + skin_mask_file_names[i] + ".png";
         masks[i] = new QBitmap( filename );
 
         if ( !masks[i]->isNull() ) {
             QImage imgMask = masks[i]->convertToImage();
             uchar **dest = imgButtonMask->jumpTable();
             for ( int y = 0; y < imgUp->height(); y++ ) {
                 uchar *line = dest[y];
                 for ( int x = 0; x < imgUp->width(); x++ )
                     if ( !qRed( imgMask.pixel( x, y ) ) )
                         line[x] = i + 1;
             }
         }
 
     }
 
-    for ( int i = 0; i < 11; i++ ) {
+    for ( int i = 0; i < 10; i++ ) {
         buttonPixUp[i] = NULL;
         buttonPixDown[i] = NULL;
     }
 
     setBackgroundPixmap( *pixBg );
 
     songInfo.setFocusPolicy( QWidget::NoFocus );
     changeTextColor( &songInfo );
 
     slider.setFixedHeight( 20 );
     slider.setMinValue( 0 );
     slider.setMaxValue( 1 );
     slider.setFocusPolicy( QWidget::NoFocus );
     slider.setBackgroundPixmap( *pixBg );
 
     time.setFocusPolicy( QWidget::NoFocus );
     time.setAlignment( Qt::AlignCenter );
     time.setFrame(FALSE);
     changeTextColor( &time );
 
     resizeEvent( NULL );
 
     connect( &slider,           SIGNAL( sliderPressed() ),      this, SLOT( sliderPressed() ) );
     connect( &slider,           SIGNAL( sliderReleased() ),     this, SLOT( sliderReleased() ) );
 
     connect( mediaPlayerState, SIGNAL( lengthChanged(long) ),  this, SLOT( setLength(long) ) );
     connect( mediaPlayerState, SIGNAL( viewChanged(char) ),    this, SLOT( setView(char) ) );
     connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
     connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ),  this, SLOT( setPaused(bool) ) );
     connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
 
     connect( this,  SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) );
     connect( this,  SIGNAL( backClicked() ),  this, SLOT( skipBack() ) );
     connect( this,  SIGNAL( forwardReleased() ), this, SLOT( stopSkip() ) );
     connect( this,  SIGNAL( backReleased() ), this, SLOT( stopSkip() ) );
 
 
 
     // Intialise state
     setLength( mediaPlayerState->length() );
     setPosition( mediaPlayerState->position() );
     setLooping( mediaPlayerState->fullscreen() );
     setPaused( mediaPlayerState->paused() );
     setPlaying( mediaPlayerState->playing() );
 
 }
 
 AudioWidget::~AudioWidget() {
 
-    for ( int i = 0; i < 11; i++ ) {
+    for ( int i = 0; i < 10; i++ ) {
         delete buttonPixUp[i];
         delete buttonPixDown[i];
     }
     delete pixBg;
     delete imgUp;
     delete imgDn;
     delete imgButtonMask;
-    for ( int i = 0; i < 11; i++ ) {
+    for ( int i = 0; i < 10; i++ ) {
         delete masks[i];
     }
 }
 
 QPixmap *combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) {
     QPixmap pix( img.width(), img.height() );
     QPainter p( &pix );
     p.drawTiledPixmap( pix.rect(), bg, offset );
     p.drawImage( 0, 0, img );
     return new QPixmap( pix );
 }
 
 
 QPixmap *maskPixToMask( QPixmap pix, QBitmap mask )
 {
     QPixmap *pixmap = new QPixmap( pix );
     pixmap->setMask( mask );
     return pixmap;
 }
 
 
 
 void AudioWidget::resizeEvent( QResizeEvent * ) {
     int h = height();
     int w = width();
 
     songInfo.setGeometry( QRect( 2, 10, w - 4, 20 ) );
     slider.setFixedWidth( w - 110 );
     slider.setGeometry( QRect( 15, h - 30, w - 90, 20 ) );
     slider.setBackgroundOrigin( QWidget::ParentOrigin );
     time.setGeometry( QRect( w - 85, h - 30, 70, 20 ) );
 
     xoff = ( w - imgUp->width() ) / 2;
     yoff = (( h - imgUp->height() ) / 2) - 10;
     QPoint p( xoff, yoff );
 
     QPixmap *pixUp = combineImageWithBackground( *imgUp, *pixBg, p );
     QPixmap *pixDn = combineImageWithBackground( *imgDn, *pixBg, p );
 
-    for ( int i = 0; i < 11; i++ ) {
+    for ( int i = 0; i < 10; i++ ) {
         if ( !masks[i]->isNull() ) {
             delete buttonPixUp[i];
             delete buttonPixDown[i];
             buttonPixUp[i] = maskPixToMask( *pixUp, *masks[i] );
             buttonPixDown[i] = maskPixToMask( *pixDn, *masks[i] );
         }
     }
 
     delete pixUp;
     delete pixDn;
 }
 
 static bool audioSliderBeingMoved = FALSE;
 
 
 void AudioWidget::sliderPressed() {
     audioSliderBeingMoved = TRUE;
 }
 
 
 void AudioWidget::sliderReleased() {
     audioSliderBeingMoved = FALSE;
     if ( slider.width() == 0 )
   return;
     long val = long((double)slider.value() * mediaPlayerState->length() / slider.width());
     mediaPlayerState->setPosition( val );
 }
 
 void AudioWidget::setPosition( long i ) {
 //    qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i);
     updateSlider( i, mediaPlayerState->length() );
 }
 
 
 void AudioWidget::setLength( long max ) {
     updateSlider( mediaPlayerState->position(), max );
 }
 
 
 void AudioWidget::setView( char view ) {
 
 // this isnt working for some reason
 
     if ( mediaPlayerState->streaming() ) {
         qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>");
         if( !slider.isHidden()) {
             slider.hide();
         }
         disconnect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         disconnect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
     } else {
         // this stops the slider from being moved, thus
         // does not stop stream when it reaches the end
         slider.show();
         connect( mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) );
         connect( mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) );
     }
 
     if ( view == 'a' ) {
         // startTimer( 150 );
         showMaximized();
     } else {
         killTimers();
         hide();
     }
 }
 
 
 static QString timeAsString( long length ) {
     int minutes = length / 60;
     int seconds = length % 60;
     return QString("%1:%2%3").arg( minutes ).arg( seconds / 10 ).arg( seconds % 10 );
 }
 
 void AudioWidget::updateSlider( long i, long max ) {
 
     time.setText( timeAsString( i ) + " / " + timeAsString( max ) );
 //    qDebug( timeAsString( i ) + " / " + timeAsString( max ) ) ;
 
     if ( max == 0 ) {
         return;
     }
     // Will flicker too much if we don't do this
     // Scale to something reasonable
     int width = slider.width();
     int val = int((double)i * width / max);
     if ( !audioSliderBeingMoved ) {
         if ( slider.value() != val ) {
             slider.setValue( val );
         }
 
         if ( slider.maxValue() != width ) {
             slider.setMaxValue( width );
         }
     }
 }
 
 
 void AudioWidget::setToggleButton( int i, bool down ) {
     if ( down != audioButtons[i].isDown ) {
         toggleButton( i );
     }
 }
 
 
 void AudioWidget::toggleButton( int i ) {
     audioButtons[i].isDown = !audioButtons[i].isDown;
     QPainter p(this);
     paintButton ( &p, i );
 }
 
 
 void AudioWidget::paintButton( QPainter *p, int i ) {
     if ( audioButtons[i].isDown ) {
         p->drawPixmap( xoff, yoff, *buttonPixDown[i] );
     } else {
         p->drawPixmap( xoff, yoff, *buttonPixUp[i] );
     }
 }
 
 
 void AudioWidget::skipFor() {
     skipDirection = +1;
     startTimer( 50 );
     mediaPlayerState->setPosition(  mediaPlayerState->position() + 2 );
 }
 
 void AudioWidget::skipBack() {
     skipDirection = -1;
     startTimer( 50 );
     mediaPlayerState->setPosition(  mediaPlayerState->position() - 2 );
 }
 
 
 
 void AudioWidget::stopSkip() {
     killTimers();
 }
 
 
 void AudioWidget::timerEvent( QTimerEvent * ) {
        if ( skipDirection == +1 ) {
            mediaPlayerState->setPosition(  mediaPlayerState->position() + 2 );
     }  else if ( skipDirection == -1 ) {
         mediaPlayerState->setPosition(  mediaPlayerState->position() - 2 );
     }
 }
 
 
 void AudioWidget::mouseMoveEvent( QMouseEvent *event ) {
     for ( int i = 0; i < numButtons; i++ ) {
         if ( event->state() == QMouseEvent::LeftButton ) {
             // The test to see if the mouse click is inside the button or not
             int x = event->pos().x() - xoff;
             int y = event->pos().y() - yoff;
 
             bool isOnButton = ( x > 0 && y > 0 && x < imgButtonMask->width()
                                 && y < imgButtonMask->height()
                                 && imgButtonMask->pixelIndex( x, y ) == i + 1 );
 
             if ( isOnButton && !audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = TRUE;
                 toggleButton(i);
 
                 switch (i) {
                 case AudioVolumeUp:
-                    qDebug("more clicked");
                     emit moreClicked();
                     return;
                 case AudioVolumeDown:
                     emit lessClicked();
                     return;
                 case AudioForward:
                     emit forwardClicked();
                     return;
                 case AudioBack:
                     emit backClicked();
                     return;
                 }
             } else if ( !isOnButton && audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = FALSE;
                 toggleButton(i);
             }
         } else {
             if ( audioButtons[i].isHeld ) {
                 audioButtons[i].isHeld = FALSE;
                 if ( !audioButtons[i].isToggle ) {
                     setToggleButton( i, FALSE );
                     qDebug("button toggled3  %d",i);
                 }
                 switch (i) {
-                case AudioPlay:       mediaPlayerState->setPlaying(audioButtons[i].isDown); return;
+                case AudioPlay:
+                    if( mediaPlayerState->isPaused ) {
+                        setToggleButton( i, FALSE );
+                        mediaPlayerState->setPaused( FALSE );
+                        return;
+                    } else if( !mediaPlayerState->isPaused ) {
+                        setToggleButton( i, TRUE );
+                        mediaPlayerState->setPaused( TRUE );
+                        return;
+                    } else {
+                        //  setToggleButton( i, TRUE );
+                        // mediaPlayerState->setPlaying( videoButtons[i].isDown );
+                    }
                 case AudioStop:       mediaPlayerState->setPlaying(FALSE); return;
-                case AudioPause:      mediaPlayerState->setPaused( audioButtons[i].isDown); return;
                 case AudioNext:       mediaPlayerState->setNext(); return;
                 case AudioPrevious:   mediaPlayerState->setPrev(); return;
                 case AudioLoop:       mediaPlayerState->setLooping(audioButtons[i].isDown); return;
                 case AudioVolumeUp:   emit moreReleased(); return;
                 case AudioVolumeDown: emit lessReleased(); return;
                 case AudioPlayList:   mediaPlayerState->setList();  return;
                 case AudioForward:    emit forwardReleased(); return;
                 case AudioBack:       emit backReleased(); return;
                 }
             }
         }
     }
 }
 
 
 void AudioWidget::mousePressEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
 }
 
 
 void AudioWidget::mouseReleaseEvent( QMouseEvent *event ) {
     mouseMoveEvent( event );
 }
 
 
 void AudioWidget::showEvent( QShowEvent* ) {
     QMouseEvent event( QEvent::MouseMove, QPoint( 0, 0 ), 0, 0 );
     mouseMoveEvent( &event );
 }
 
 
 void AudioWidget::closeEvent( QCloseEvent* ) {
     mediaPlayerState->setList();
 }
 
 
 void AudioWidget::paintEvent( QPaintEvent * pe) {
     if ( !pe->erased() ) {
           // Combine with background and double buffer
         QPixmap pix( pe->rect().size() );
         QPainter p( &pix );
         p.translate( -pe->rect().topLeft().x(), -pe->rect().topLeft().y() );
         p.drawTiledPixmap( pe->rect(), *pixBg, pe->rect().topLeft() );
         for ( int i = 0; i < numButtons; i++ )
             paintButton( &p, i );
         QPainter p2( this );
         p2.drawPixmap( pe->rect().topLeft(), pix );
     } else {
         QPainter p( this );
         for ( int i = 0; i < numButtons; i++ )
             paintButton( &p, i );
     }
 }
 
 void AudioWidget::keyReleaseEvent( QKeyEvent *e)
 {
     switch ( e->key() ) {
 ////////////////////////////// Zaurus keys
       case Key_Home:
           break;
       case Key_F9: //activity
            hide();
 //           qDebug("Audio F9");
           break;
       case Key_F10: //contacts
           break;
       case Key_F11: //menu
           break;
       case Key_F12: //home
           break;
       case Key_F13: //mail
           break;
       case Key_Space: {
           if(mediaPlayerState->playing()) {
 //                toggleButton(1);
               mediaPlayerState->setPlaying(FALSE);
 //                toggleButton(1);
           } else {
 //                toggleButton(0);
               mediaPlayerState->setPlaying(TRUE);
 //                toggleButton(0);
           }
       }
           break;
       case Key_Down:
             toggleButton(6);
           emit lessClicked();
           emit lessReleased();
           toggleButton(6);
           break;
       case Key_Up:
            toggleButton(5);
            emit moreClicked();
            emit moreReleased();
            toggleButton(5);
            break;
       case Key_Right:
 //            toggleButton(3);
           mediaPlayerState->setNext();
 //            toggleButton(3);
           break;
       case Key_Left:
 //            toggleButton(4);
           mediaPlayerState->setPrev();
 //            toggleButton(4);
           break;
       case Key_Escape:
           break;
 
     };
 }
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index e05188e..772d1d1 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -1,149 +1,149 @@
 /*
                             This file is part of the Opie Project
 
                              Copyright (c)  2002 Max Reiss <harlekin@handhelds.org>
                              Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
                              Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #ifndef AUDIO_WIDGET_H
 #define AUDIO_WIDGET_H
 
 #include <qwidget.h>
 #include <qpainter.h>
 #include <qdrawutil.h>
 #include <qpixmap.h>
 #include <qstring.h>
 #include <qslider.h>
 #include <qframe.h>
 #include <qlineedit.h>
 
 
 class QPixmap;
 
 enum AudioButtons {
     AudioPlay=0,
     AudioStop,
     AudioPause,
     AudioNext,
     AudioPrevious,
     AudioVolumeUp,
     AudioVolumeDown,
     AudioLoop,
     AudioPlayList,
     AudioForward,
     AudioBack
 };
 
 
 class Ticker : public QFrame {
     Q_OBJECT
 
 public:
     Ticker( QWidget* parent=0 );
     ~Ticker();
     void setText( const QString& text ) ;
 
 protected:
     void timerEvent( QTimerEvent * );
     void drawContents( QPainter *p );
 private:
     QString scrollText;
     int pos, pixelLen;
 };
 
 
 class AudioWidget : public QWidget {
     Q_OBJECT
 public:
     AudioWidget( QWidget* parent=0, const char* name=0, WFlags f=0 );
     ~AudioWidget();
     void setTickerText( const QString &text ) { songInfo.setText( text ); }
     bool isStreaming;
 public slots:
     void updateSlider( long, long );
     void sliderPressed( );
     void sliderReleased( );
     void setPaused( bool b)  { setToggleButton( AudioPause, b ); }
     void setLooping( bool b) { setToggleButton( AudioLoop, b ); }
     void setPlaying( bool b) { setToggleButton( AudioPlay, b ); }
     void setPosition( long );
     void setLength( long );
     void setView( char );
 
 signals:
     void moreClicked();
     void lessClicked();
     void moreReleased();
     void lessReleased();
     void forwardClicked();
     void backClicked();
     void forwardReleased();
     void backReleased();
     void sliderMoved(long);
 
 protected:
     void doBlank();
     void doUnblank();
     void paintEvent( QPaintEvent *pe );
     void showEvent( QShowEvent *se );
     void resizeEvent( QResizeEvent *re );
     void mouseMoveEvent( QMouseEvent *event );
     void mousePressEvent( QMouseEvent *event );
     void mouseReleaseEvent( QMouseEvent *event );
     void timerEvent( QTimerEvent *event );
     void closeEvent( QCloseEvent *event );
     void keyReleaseEvent( QKeyEvent *e);
 private slots:
     void skipFor();
     void skipBack();
     void stopSkip();
 private:
     void toggleButton( int );
     void setToggleButton( int, bool );
     void paintButton( QPainter *p, int i );
     int skipDirection;
     QString skin;
     QPixmap *pixBg;
     QImage  *imgUp;
     QImage  *imgDn;
     QImage  *imgButtonMask;
-    QBitmap *masks[11];
-    QPixmap *buttonPixUp[11];
-    QPixmap *buttonPixDown[11];
+    QBitmap *masks[10];
+    QPixmap *buttonPixUp[10];
+    QPixmap *buttonPixDown[10];
 
     QPixmap *pixmaps[4];
     Ticker  songInfo;
     QSlider slider;
     QLineEdit time;
     int xoff, yoff;
 };
 
 
 #endif // AUDIO_WIDGET_H