4 files changed, 41 insertions, 27 deletions

diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp
index 4de7ea9..da0706e 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.cpp
+++ b/noncore/multimedia/opieplayer2/mediawidget.cpp
@@ -1,263 +1,243 @@
 /*
    Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
              (C) 2002 Max Reiss <harlekin@handhelds.org>
              (C) 2002 L. Potter <ljp@llornkcor.com>
              (C) 2002 Holger Freyther <zecke@handhelds.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library 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 "mediawidget.h"
 #include "playlistwidget.h"
 #include "skin.h"
 
 #include <qpe/config.h>
 #include <qpe/qpeapplication.h>
 
 MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name )
     : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList )
 {
     connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ),
              this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) );
     connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ),
              this, SLOT( setLength( long ) ) );
     connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ),
              this, SLOT( setPlaying( bool ) ) );
 }
 
 MediaWidget::~MediaWidget()
 {
 }
 
 void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
                                 const Skin &skin, const QSize &buttonAreaSize )
 {
-    buttonMask = QImage( buttonAreaSize, 8, 255 );
-    buttonMask.fill( 0 );
+    buttonMask = skin.buttonMask( skinInfo, buttonCount, buttonAreaSize );
 
     buttons.clear();
     buttons.reserve( buttonCount );
 
     for ( uint i = 0; i < buttonCount; ++i ) {
         Button button = setupButton( skinInfo[ i ], skin );
         buttons.push_back( button );
     }
 }
 
 MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin )
 {
     Button button;
     button.command = buttonInfo.command;
     button.type = buttonInfo.type;
-
-    button.mask = setupButtonMask( button.command, skin.buttonMaskImage( buttonInfo.fileName ) );
+    button.mask = skin.buttonMaskImage( buttonInfo.fileName );
 
     return button;
 }
 
-QBitmap MediaWidget::setupButtonMask( const Command &command, const QImage &maskImage )
-{
-    if ( maskImage.isNull() )
-        return QBitmap();
-
-    uchar **dest = buttonMask.jumpTable();
-    for ( int y = 0; y < buttonMask.height(); y++ ) {
-        uchar *line = dest[y];
-        for ( int x = 0; x < buttonMask.width(); x++ )
-            if ( !qRed( maskImage.pixel( x, y ) ) )
-                line[x] = command + 1;
-    }
-
-    // ### grmbl qt2. use constructor when switching to qt3.
-    QBitmap bm; bm = maskImage;
-    return bm;
-}
-
 void MediaWidget::loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix )
 {
     Config cfg( "OpiePlayer" );
     cfg.setGroup( "Options" );
     QString skin = cfg.readEntry( "Skin","default" );
 
     loadSkin( skinInfo, buttonCount, skin, fileNameInfix );
 }
 
 void MediaWidget::loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &name, const QString &fileNameInfix )
 {
     Skin skin( name, fileNameInfix );
 
     QString skinPath = "opieplayer2/skins/" + name;
     backgroundPixmap = skin.backgroundImage();
     buttonUpImage = skin.buttonUpImage();
     buttonDownImage = skin.buttonDownImage();
 
     setupButtons( skinInfo, buttonCount, skin, buttonUpImage.size() );
 }
 
 void MediaWidget::closeEvent( QCloseEvent * )
 {
     mediaPlayerState.setList();
 }
 
 void MediaWidget::paintEvent( QPaintEvent *pe )
 {
     QPainter p( this );
 
     if ( mediaPlayerState.isFullscreen() ) {
         // Clear the background
         p.setBrush( QBrush( Qt::black ) );
         return;
     } 
 
     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(), backgroundPixmap, pe->rect().topLeft() );
         paintAllButtons( p );
         QPainter p2( this );
         p2.drawPixmap( pe->rect().topLeft(), pix );
     } else {
         QPainter p( this );
         paintAllButtons( p );
     }
 }
 
 MediaWidget::Button *MediaWidget::buttonAt( const QPoint &position )
 {
     if ( position.x() <= 0 || position.y() <= 0 ||
          position.x() >= buttonMask.width() ||
          position.y() >= buttonMask.height() )
         return 0;
 
     int pixelIdx = buttonMask.pixelIndex( position.x(), position.y() );
     for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it )
         if ( it->command + 1 == pixelIdx )
             return &( *it );
 
     return 0;
 }
 
 void MediaWidget::mousePressEvent( QMouseEvent *event )
 {
     Button *button = buttonAt( event->pos() - upperLeftOfButtonMask );
 
     if ( !button ) {
         QWidget::mousePressEvent( event );
         return;
     }
 
     switch ( button->command ) {
         case VolumeUp:   emit moreClicked(); return;
         case VolumeDown: emit lessClicked(); return;
         case Back:       emit backClicked(); return;
         case Forward:    emit forwardClicked(); return;
         default: break;
     }
 }
 
 void MediaWidget::mouseReleaseEvent( QMouseEvent *event )
 {
     Button *button = buttonAt( event->pos() - upperLeftOfButtonMask );
 
     if ( !button ) {
         QWidget::mouseReleaseEvent( event );
         return;
     }
 
     if ( button->type == ToggleButton )
         toggleButton( *button );
 
     handleCommand( button->command, button->isDown );
 }
 
 void MediaWidget::makeVisible()
 {
 }
 
 void MediaWidget::handleCommand( Command command, bool buttonDown )
 {
     switch ( command ) {
         case Play:       mediaPlayerState.togglePaused(); return;
         case Stop:       mediaPlayerState.setPlaying(FALSE); return;
         case Next:       if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setNext(); return;
         case Previous:   if( playList.currentTab() == PlayListWidget::CurrentPlayList ) mediaPlayerState.setPrev(); return;
         case Loop:       mediaPlayerState.setLooping( buttonDown ); return;
         case VolumeUp:   emit moreReleased(); return;
         case VolumeDown: emit lessReleased(); return;
         case PlayList:   mediaPlayerState.setList();  return;
         case Forward:    emit forwardReleased(); return;
         case Back:       emit backReleased(); return;
         case FullScreen: mediaPlayerState.setFullscreen( true ); makeVisible(); return;
         default: assert( false );
     }
 }
 
 bool MediaWidget::isOverButton( const QPoint &position, int buttonId ) const
 {
     return ( position.x() > 0 && position.y() > 0 && 
              position.x() < buttonMask.width() && 
              position.y() < buttonMask.height() && 
              buttonMask.pixelIndex( position.x(), position.y() ) == buttonId + 1 );
 }
 
 void MediaWidget::paintAllButtons( QPainter &p )
 {
     for ( ButtonVector::const_iterator it = buttons.begin();
           it != buttons.end(); ++it )
         paintButton( p, *it );
 }
 
 void MediaWidget::paintButton( const Button &button )
 {
     QPainter p( this );
     paintButton( p, button );
 }
 
 void MediaWidget::paintButton( QPainter &p, const Button &button )
 {
     if ( button.isDown )
         p.drawPixmap( upperLeftOfButtonMask, button.pixDown );
     else
         p.drawPixmap( upperLeftOfButtonMask, button.pixUp );
 }
 
 void MediaWidget::setToggleButton( Command command, bool down )
 {
     for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it )
         if ( it->command == command ) {
             setToggleButton( *it, down );
             return;
         }
 }
 
 void MediaWidget::setToggleButton( Button &button, bool down )
 {
     if ( down != button.isDown )
         toggleButton( button );
 }
 
 void MediaWidget::toggleButton( Button &button )
 {
     button.isDown = !button.isDown;
 
     paintButton( button );
 }
 
 /* vim: et sw=4 ts=4
  */
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 0d635aa..4bd8760 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -1,151 +1,150 @@
 /*
    Copyright (C) 2002 Simon Hausmann <hausmann@kde.org>
              (C) 2002 Max Reiss <harlekin@handhelds.org>
              (C) 2002 L. Potter <ljp@llornkcor.com>
              (C) 2002 Holger Freyther <zecke@handhelds.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License as published by the Free Software Foundation; either
    version 2 of the License, or (at your option) any later version.
 
    This library 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 MEDIAWIDGET_H
 #define MEDIAWIDGET_H
 
 #include <qwidget.h>
 #include <qmap.h>
 
 #include "mediaplayerstate.h"
 #include "playlistwidget.h"
 
 #include <vector>
 #include <memory>
 
 namespace
 {
     struct simpleAndStupidAllocator
     {
         static void *allocate( size_t amount )
         { return ::operator new( amount ); }
         static void deallocate( void *p, size_t )
         { ::operator delete( p ); }
     };
 }
 
 class Skin;
 
 class MediaWidget : public QWidget
 {
     Q_OBJECT
 public:
     enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back, FullScreen, Undefined };
     enum ButtonType { NormalButton, ToggleButton };
 
     struct Button
     {
         Button() : command( Undefined ), type( NormalButton ), isDown( false ) {}
 
         Command command;
 
         ButtonType type; // this should be part of the bitfield but gcc2 is too buggy to support this :-(
         bool isDown : 1;
 
         QBitmap mask;
         QPixmap pixUp;
         QPixmap pixDown;
     };
 #if defined( _CC_GNU_ )
     // use that allocator to avoid the default allocator that on gcc2 requires libstdc++ because
     // in the BAD_ALLOC macro it uses std::cerr and friends :-(
     typedef std::vector<Button, std::__allocator<Button, simpleAndStupidAllocator> > ButtonVector;
 #else
     typedef std::vector<Button> ButtonVector;
 #endif
 
     struct SkinButtonInfo
     {
         Command command;
         const char *fileName;
         ButtonType type;
     };
 
     MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
     virtual ~MediaWidget();
 
 public slots:
     virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0;
     virtual void setLength( long length ) = 0;
     virtual void setPlaying( bool playing ) = 0;
 
     virtual void loadSkin() = 0;
 
 signals:
     void moreReleased();
     void lessReleased();
     void forwardReleased();
     void backReleased();
     void forwardClicked();
     void backClicked();
     void moreClicked();
     void lessClicked();
 
 protected:
     void setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount,
                        const Skin &skin, const QSize &buttonAreaSize );
     Button setupButton( const SkinButtonInfo &buttonInfo, const Skin &skin );
-    QBitmap setupButtonMask( const Command &command, const QImage &maskImage );
 
     void loadDefaultSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &fileNameInfix = QString::null );
     void loadSkin( const SkinButtonInfo *skinInfo, uint buttonCount, const QString &name, const QString &fileNameInfix );
 
     virtual void closeEvent( QCloseEvent * );
 
     virtual void paintEvent( QPaintEvent *pe );
 
     Button *buttonAt( const QPoint &position );
 
     virtual void mousePressEvent( QMouseEvent *event );
     virtual void mouseReleaseEvent( QMouseEvent *event );
 
     virtual void makeVisible();
 
     void handleCommand( Command command, bool buttonDown );
 
     bool isOverButton( const QPoint &position, int buttonId ) const;
 
     void paintAllButtons( QPainter &p );
     void paintButton( const Button &button );
     void paintButton( QPainter &p, const Button &button );
 
     void setToggleButton( Button &button, bool down );
     void setToggleButton( Command command, bool down );
     void toggleButton( Button &button );
 
     MediaPlayerState &mediaPlayerState;
     PlayListWidget &playList;
 
     ButtonVector buttons;
 
     QImage buttonMask;
 
     QPoint upperLeftOfButtonMask;
 
     QPixmap backgroundPixmap;
     QImage buttonUpImage;
     QImage buttonDownImage;
 };
 
 #endif // MEDIAWIDGET_H
 /* vim: et sw=4 ts=4
  */
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp
index 7d05d80..ef70957 100644
--- a/noncore/multimedia/opieplayer2/skin.cpp
+++ b/noncore/multimedia/opieplayer2/skin.cpp
@@ -1,54 +1,84 @@
 
 #include "skin.h"
 
 #include <qpe/resource.h>
 
 Skin::Skin( const QString &name, const QString &fileNameInfix )
     : m_name( name ), m_fileNameInfix( fileNameInfix )
 {
     m_skinPath = "opieplayer2/skins/" + name;
 }
 
-void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount )
+void Skin::preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize )
 {
     backgroundImage();
     buttonUpImage();
     buttonDownImage();
-    for ( uint i = 0; i < buttonCount; ++i )
-        ( void )buttonMaskImage( skinButtonInfo[ i ].fileName );
+    ( void )buttonMask( skinButtonInfo, buttonCount, buttonAreaSize );
 }
 
 QImage Skin::backgroundImage() const
 {
     if ( m_backgroundImage.isNull() )
         m_backgroundImage = QImage( Resource::findPixmap( QString( "%1/background" ).arg( m_skinPath ) ) );
     return m_backgroundImage;
 }
 
 QImage Skin::buttonUpImage() const
 {
     if ( m_buttonUpImage.isNull() )
         m_buttonUpImage = QImage( Resource::findPixmap( QString( "%1/skin%2_up" ).arg( m_skinPath ).arg( m_fileNameInfix ) ) );
     return m_buttonUpImage;
 }
 
 QImage Skin::buttonDownImage() const
 {
     if ( m_buttonDownImage.isNull() )
         m_buttonDownImage = QImage( Resource::findPixmap( QString( "%1/skin%2_down" ).arg( m_skinPath ).arg( m_fileNameInfix ) ) );
     return m_buttonDownImage;
 }
 
+QImage Skin::buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize ) const
+{
+    if ( buttonAreaSize != m_buttonMask.size() )
+        m_buttonMask = QImage();
+
+    if ( !m_buttonMask.isNull() )
+        return m_buttonMask;
+
+    m_buttonMask = QImage( buttonAreaSize, 8, 255 );
+    m_buttonMask.fill( 0 );
+
+    for ( uint i = 0; i < buttonCount; ++i )
+        addButtonToMask( skinButtonInfo[ i ].command + 1, buttonMaskImage( skinButtonInfo[ i ].fileName ) );
+
+    return m_buttonMask;
+}
+
+void Skin::addButtonToMask( int tag, const QImage &maskImage ) const
+{
+    if ( maskImage.isNull() )
+        return;
+
+    uchar **dest = m_buttonMask.jumpTable();
+    for ( int y = 0; y < m_buttonMask.height(); y++ ) {
+        uchar *line = dest[y];
+        for ( int x = 0; x < m_buttonMask.width(); x++ )
+            if ( !qRed( maskImage.pixel( x, y ) ) )
+                line[x] = tag;
+    }
+}
+
 QImage Skin::buttonMaskImage( const QString &fileName ) const
 {
     ButtonMaskImageMap::Iterator it = m_buttonMasks.find( fileName );
     if ( it == m_buttonMasks.end() ) {
         QString prefix = m_skinPath + QString::fromLatin1( "/skin%1_mask_" ).arg( m_fileNameInfix );
         QString path = prefix + fileName + ".png";
         it = m_buttonMasks.insert( fileName, QImage( Resource::findPixmap( path ) ) );
     }
     return *it;
 }
 
 /* vim: et sw=4 ts=4
  */
diff --git a/noncore/multimedia/opieplayer2/skin.h b/noncore/multimedia/opieplayer2/skin.h
index 9276a5b..14873e7 100644
--- a/noncore/multimedia/opieplayer2/skin.h
+++ b/noncore/multimedia/opieplayer2/skin.h
@@ -1,41 +1,46 @@
 #ifndef SKIN_H
 #define SKIN_H
 
 #include <qstring.h>
 #include <qimage.h>
 #include <qmap.h>
 
 #include "mediawidget.h"
 
 class Skin
 {
 public:
     Skin( const QString &name, const QString &fileNameInfix );
 
-    void preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount );
+    void preload( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize );
 
     QImage backgroundImage() const;
     QImage buttonUpImage() const;
     QImage buttonDownImage() const;
 
+    QImage buttonMask( const MediaWidget::SkinButtonInfo *skinButtonInfo, uint buttonCount, const QSize &buttonAreaSize ) const;
+
     QImage buttonMaskImage( const QString &fileName ) const;
 
 private:
+    void addButtonToMask( int tag, const QImage &maskImage ) const;
+
     QString m_name;
     QString m_fileNameInfix;
     QString m_skinPath;
 
     typedef QMap<QString, QImage> ButtonMaskImageMap;
 
     mutable QImage m_backgroundImage;
     mutable QImage m_buttonUpImage;
     mutable QImage m_buttonDownImage;
+    mutable QImage m_buttonMask;
     mutable ButtonMaskImageMap m_buttonMasks;
 
     Skin( const Skin & );
     Skin &operator=( const Skin & );
 };
 
 #endif // SKIN_H
 /* vim: et sw=4 ts=4
  */