add video skin support *finally*, fixed widget for landscape/sizing

1 files changed, 348 insertions, 101 deletions

diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp
index 97997f9..1b38206 100644
--- a/core/multimedia/opieplayer/videowidget.cpp
+++ b/core/multimedia/opieplayer/videowidget.cpp
@@ -22,3 +22,5 @@
 #include <qpe/config.h>
+#include <qpe/qpeapplication.h>
 
+#include <qdir.h>
 #include <qwidget.h>
@@ -47,5 +49,5 @@ static const int yo = 0; // movable y offset
 struct MediaButton {
-    int  xPos, yPos;
+//     int  xPos, yPos;
     bool isToggle, isHeld, isDown;
-    int  controlType;
+//     int  controlType;
 };
@@ -55,31 +57,75 @@ struct MediaButton {
 MediaButton videoButtons[] = {
-    { 5+0*32+xo, 200+yo, FALSE, FALSE, FALSE, 4 }, // previous
-    { 5+1*32+xo, 200+yo, FALSE, FALSE, FALSE, 1 }, // stop
-    { 5+2*32+xo, 200+yo,  TRUE, FALSE, FALSE, 0 }, // play
-    { 5+3*32+xo, 200+yo,  TRUE, FALSE, FALSE, 2 }, // pause
-    { 5+4*32+xo, 200+yo, FALSE, FALSE, FALSE, 3 }, // next
-    { 5+5*32+xo, 200+yo, FALSE, FALSE, FALSE, 8 }, // playlist
-    { 5+6*32+xo, 200+yo,  TRUE, FALSE, FALSE, 9 }  // fullscreen
+   { FALSE, FALSE, FALSE }, // stop
+   { TRUE, FALSE, FALSE }, // play
+   { FALSE, FALSE, FALSE }, // previous
+   { FALSE, FALSE, FALSE }, // next
+   { FALSE, FALSE, FALSE }, // volUp
+   { FALSE, FALSE, FALSE }, // volDown
+   { TRUE, FALSE, FALSE }  // fullscreen
 };
 
+//static const int numButtons = (sizeof(videoButtons)/sizeof(MediaButton));
 
-static const int numButtons = (sizeof(videoButtons)/sizeof(MediaButton));
+const char *skinV_mask_file_names[7] = {
+   "stop","play","back","fwd","up","down","full"
+};
 
+static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton));
 
 VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
-    QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
+   QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 )
+{
     setCaption( tr("OpiePlayer") );
     Config cfg("OpiePlayer");
-    cfg.setGroup("VideoWidget");
-
-    QString backgroundPix, Button0aPix, Button0bPix, controlsPix;
-    backgroundPix=cfg.readEntry( "backgroundPix", "opieplayer/metalFinish");
-    Button0aPix=cfg.readEntry( "Button0aPix", "opieplayer/mediaButton0a");
-    Button0bPix=cfg.readEntry( "Button0bPix","opieplayer/mediaButton0b");
-    controlsPix=cfg.readEntry( "controlsPix","opieplayer/mediaControls0" );
-    
-    setBackgroundPixmap( Resource::loadPixmap( backgroundPix) );
-    pixmaps[0] = new QPixmap( Resource::loadPixmap( Button0aPix ) );
-    pixmaps[1] = new QPixmap( Resource::loadPixmap( Button0bPix ) );
-    pixmaps[2] = new QPixmap( Resource::loadPixmap( controlsPix) );
+
+   cfg.setGroup("Options");
+   skin = cfg.readEntry("Skin","default");
+
+   QString skinPath;
+   skinPath = "opieplayer2/skins/" + skin;
+    if(!QDir(QString(getenv("OPIEDIR")) +"/pics/"+skinPath).exists())
+      skinPath = "opieplayer2/skins/default";
+
+   qDebug("skin path " + skinPath);
+
+//     QString skinPath = "opieplayer2/skins/" + skin;
+
+   pixBg = new QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) );
+   imgUp = new QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) );
+   imgDn = new QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) );
+
+   imgButtonMask = new QImage( imgUp->width(), imgUp->height(), 8, 255 );
+   imgButtonMask->fill( 0 );
+
+   for ( int i = 0; i < 7; i++ )
+   {
+      QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath +
+                                  "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
+      qDebug("loading "+filename);
+      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;
+            }
+         }
+      }
+   }
+   qDebug("finished loading first pics");
+   for ( int i = 0; i < 7; i++ )
+   {
+      buttonPixUp[i] = NULL;
+      buttonPixDown[i] = NULL;
+   }
+
+   setBackgroundPixmap( *pixBg );
+
     currentFrame = new QImage( 220 + 2, 160, (QPixmap::defaultDepth() == 16) ? 16 : 32 );
@@ -91,3 +137,3 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
     slider->setFocusPolicy( QWidget::NoFocus );
-    slider->setGeometry( QRect( 7, 250, 220, 20 ) );
+//    slider->setGeometry( QRect( 7, 250, 220, 20 ) );
 
@@ -113,5 +159,21 @@ VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) :
 VideoWidget::~VideoWidget() {
-    for ( int i = 0; i < 3; i++ )
-  delete pixmaps[i];
-    delete currentFrame;
+
+   for ( int i = 0; i < 7; i++ )
+   {
+      delete buttonPixUp[i];
+      delete buttonPixDown[i];
+   }
+
+   delete pixBg;
+   delete imgUp;
+   delete imgDn;
+   delete imgButtonMask;
+   for ( int i = 0; i < 7; i++ )
+   {
+      delete masks[i];
+   }
+
+//     for ( int i = 0; i < 3; i++ )
+//   delete pixmaps[i];
+//     delete currentFrame;
 }
@@ -121,2 +183,53 @@ static bool videoSliderBeingMoved = FALSE;
 
+QPixmap *combineVImageWithBackground( 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 *maskVPixToMask( QPixmap pix, QBitmap mask ) {
+   QPixmap *pixmap = new QPixmap( pix );
+   pixmap->setMask( mask );
+   return pixmap;
+}
+
+void VideoWidget::resizeEvent( QResizeEvent * ) {
+   int h = height();
+   int w = width();
+   //int Vh = 160;
+   //int Vw = 220;
+
+   slider->setFixedWidth( w - 20 );
+   slider->setGeometry( QRect( 15, h - 22, w - 90, 20 ) );
+   slider->setBackgroundOrigin( QWidget::ParentOrigin );
+   slider->setFocusPolicy( QWidget::NoFocus );
+   slider->setBackgroundPixmap( *pixBg );
+
+   xoff = 0;// ( imgUp->width() ) / 2;
+   if(w>h)
+      yoff = 0;
+   else
+      yoff = 185;//(( Vh  - imgUp->height() ) / 2) - 10;
+   QPoint p( xoff, yoff );
+
+   QPixmap *pixUp = combineVImageWithBackground( *imgUp, *pixBg, p );
+   QPixmap *pixDn = combineVImageWithBackground( *imgDn, *pixBg, p );
+
+   for ( int i = 0; i < 7; i++ )
+   {
+      if ( !masks[i]->isNull() )
+      {
+         delete buttonPixUp[i];
+         delete buttonPixDown[i];
+         buttonPixUp[i] = maskVPixToMask( *pixUp, *masks[i] );
+         buttonPixDown[i] = maskVPixToMask( *pixDn, *masks[i] );
+      }
+   }
+
+   delete pixUp;
+   delete pixDn;
+}
+
 
@@ -147,5 +260,8 @@ void VideoWidget::setLength( long max ) {
 void VideoWidget::setView( char view ) {
-    if ( view == 'v' ) {
+   if ( view == 'v' )
+   {
   makeVisible();
-    } else {
+   }
+   else
+   {
   // Effectively blank the view next time we show it so it looks nicer
@@ -164,3 +280,4 @@ void VideoWidget::updateSlider( long i, long max ) {
     int val = int((double)i * width / max);
-    if ( !mediaPlayerState->fullscreen() && !videoSliderBeingMoved ) {
+   if ( !mediaPlayerState->fullscreen() && !videoSliderBeingMoved )
+   {
   if ( slider->value() != val )
@@ -187,7 +304,15 @@ void VideoWidget::toggleButton( int i ) {
 void VideoWidget::paintButton( QPainter *p, int i ) {
-    int x = videoButtons[i].xPos;
-    int y = videoButtons[i].yPos;
-    int offset = 10 + videoButtons[i].isDown;
-    p->drawPixmap( x, y, *pixmaps[videoButtons[i].isDown] );
-    p->drawPixmap( x + 1 + offset, y + offset, *pixmaps[2], 9 * videoButtons[i].controlType, 0, 9, 9 );
+   if ( videoButtons[i].isDown )
+   {
+      p->drawPixmap( xoff, yoff, *buttonPixDown[i] );
+   }
+   else
+   {
+      p->drawPixmap( xoff, yoff, *buttonPixUp[i] );
+   }
+//     int x = videoButtons[i].xPos;
+//     int y = videoButtons[i].yPos;
+//     int offset = 10 + videoButtons[i].isDown;
+//     p->drawPixmap( x, y, *pixmaps[videoButtons[i].isDown] );
+//     p->drawPixmap( x + 1 + offset, y + offset, *pixmaps[2], 9 * videoButtons[i].controlType, 0, 9, 9 );
 }
@@ -196,34 +321,84 @@ void VideoWidget::paintButton( QPainter *p, int i ) {
 void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
-    for ( int i = 0; i < numButtons; i++ ) {
-        int x = videoButtons[i].xPos;
-        int y = videoButtons[i].yPos;
-        if ( event->state() == QMouseEvent::LeftButton ) {
-              // The test to see if the mouse click is inside the circular button or not
-              // (compared with the radius squared to avoid a square-root of our distance)
-            int radius = 16;
-            QPoint center = QPoint( x + radius, y + radius );
-            QPoint dXY = center - event->pos();
-            int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y();
-            bool isOnButton = dist <= (radius * radius);
-            if ( isOnButton != videoButtons[i].isHeld ) {
-                videoButtons[i].isHeld = isOnButton;
+
+   for ( int i = 0; i < numVButtons; 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 && !videoButtons[i].isHeld )
+         {
+            videoButtons[i].isHeld = TRUE;
                 toggleButton(i);
+
+//                 switch (i) {
+//                 case VideoVolUp:
+//                     emit moreClicked();
+//                     return;
+//                 case VideoVolDown:
+//                     emit lessClicked();
+//                     return;
+//                 }
             }
-        } else {
-            if ( videoButtons[i].isHeld ) {
+         else if ( !isOnButton && videoButtons[i].isHeld )
+         {
+            videoButtons[i].isHeld = FALSE;
+            toggleButton(i);
+         }
+      }
+      else
+      {
+
+         if ( videoButtons[i].isHeld )
+         {
                 videoButtons[i].isHeld = FALSE;
                 if ( !videoButtons[i].isToggle )
+            {
                     setToggleButton( i, FALSE );
             }
-        }
-        switch (i) {
+            qDebug("key %d", i);
+            switch(i)
+            {
+//                 case VideoPlay:
+//                 {
+//                     if( mediaPlayerState->isPaused )
+//                     {
+//                         setToggleButton( i, FALSE );
+//                         mediaPlayerState->setPaused( FALSE );
+//                         return;
+//                     }
+//                     else if( !mediaPlayerState->isPaused )
+//                     {
+//                         setToggleButton( i, TRUE );
+//                         mediaPlayerState->setPaused( TRUE );
+//                         return;
+//                     }
+//                     else
+//                     {
+//                         return;
+//                     }
+//                 }
+
           case VideoPlay:       mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
           case VideoStop:       mediaPlayerState->setPlaying(FALSE); return;
-          case VideoPause:      mediaPlayerState->setPaused(videoButtons[i].isDown); return;
+//           case VideoPause:      mediaPlayerState->setPaused(videoButtons[i].isDown); return;
           case VideoNext:       mediaPlayerState->setNext(); return;
           case VideoPrevious:   mediaPlayerState->setPrev(); return;
-          case VideoPlayList:   mediaPlayerState->setList(); return;
+//           case VideoPlayList:   mediaPlayerState->setList(); return;
           case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
-        }
 
+//                 case VideoStop:       mediaPlayerState->setPlaying( FALSE ); return;
+//                 case VideoNext:       if(playList->whichList() ==0) mediaPlayerState->setNext(); return;
+//                 case VideoPrevious:   if(playList->whichList() ==0) mediaPlayerState->setPrev(); return;
+//                  case VideoVolUp:      emit moreReleased(); return;
+//                  case VideoVolDown:    emit lessReleased(); return;
+//                 case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
+            }
+         }
     }
@@ -232,2 +407,43 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) {
 
+
+
+
+
+//     for ( int i = 0; i < numButtons; i++ ) {
+//         int x = videoButtons[i].xPos;
+//         int y = videoButtons[i].yPos;
+//         if ( event->state() == QMouseEvent::LeftButton ) {
+//               // The test to see if the mouse click is inside the circular button or not
+//               // (compared with the radius squared to avoid a square-root of our distance)
+//             int radius = 16;
+//             QPoint center = QPoint( x + radius, y + radius );
+//             QPoint dXY = center - event->pos();
+//             int dist = dXY.x() * dXY.x() + dXY.y() * dXY.y();
+//             bool isOnButton = dist <= (radius * radius);
+//             if ( isOnButton != videoButtons[i].isHeld ) {
+//                 videoButtons[i].isHeld = isOnButton;
+//                 toggleButton(i);
+//             }
+//         } else {
+//             if ( videoButtons[i].isHeld ) {
+//                 videoButtons[i].isHeld = FALSE;
+//                 if ( !videoButtons[i].isToggle )
+//                     setToggleButton( i, FALSE );
+//             }
+//         }
+
+//         switch (i) {
+//           case VideoPlay:       mediaPlayerState->setPlaying(videoButtons[i].isDown); return;
+//           case VideoStop:       mediaPlayerState->setPlaying(FALSE); return;
+//           case VideoPause:      mediaPlayerState->setPaused(videoButtons[i].isDown); return;
+//           case VideoNext:       mediaPlayerState->setNext(); return;
+//           case VideoPrevious:   mediaPlayerState->setPrev(); return;
+//           case VideoPlayList:   mediaPlayerState->setList(); return;
+//           case VideoFullscreen: mediaPlayerState->setFullscreen( TRUE ); makeVisible(); return;
+//         }
+
+//     }
+}
+
+
 void VideoWidget::mousePressEvent( QMouseEvent *event ) {
@@ -238,3 +454,4 @@ void VideoWidget::mousePressEvent( QMouseEvent *event ) {
 void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
-    if ( mediaPlayerState->fullscreen() ) {
+   if ( mediaPlayerState->fullscreen() )
+   {
   mediaPlayerState->setFullscreen( FALSE );
@@ -248,3 +465,4 @@ void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) {
 void VideoWidget::makeVisible() {
-    if ( mediaPlayerState->fullscreen() ) {
+   if ( mediaPlayerState->fullscreen() )
+   {
   setBackgroundMode( QWidget::NoBackground );
@@ -253,4 +471,6 @@ void VideoWidget::makeVisible() {
   slider->hide();
-    } else {
-  setBackgroundPixmap( Resource::loadPixmap( "opieplayer/metalFinish" ) );
+   }
+   else
+   {
+      setBackgroundPixmap( *pixBg );
   showNormal();
@@ -262,3 +482,3 @@ void VideoWidget::makeVisible() {
 
-void VideoWidget::paintEvent( QPaintEvent * ) {
+void VideoWidget::paintEvent( QPaintEvent * pe) {
     QPainter p( this );
@@ -269,21 +489,19 @@ void VideoWidget::paintEvent( QPaintEvent * ) {
   p.drawRect( rect() );
-
-  // Draw the current frame
-  //p.drawImage( ); // If using directpainter we won't have a copy except whats on the screen
     } else {
-  // draw border
-  qDrawShadePanel( &p, 4, 15, 230, 170, colorGroup(), TRUE, 5, NULL );
-
-  // Clear the movie screen first
-  p.setBrush( QBrush( Qt::black ) );
-  p.drawRect( 9, 20, 220, 160 );
-
-  // draw current frame (centrally positioned from scaling to maintain aspect ratio)
-  p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight );
-
-  // draw the buttons
-  for ( int i = 0; i < numButtons; i++ )
+      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 < numVButtons; i++ ) {
       paintButton( &p, i );
-
-  // draw the slider
+         }
+         QPainter p2( this );
+         p2.drawPixmap( pe->rect().topLeft(), pix );
+      } else {
+         QPainter p( this );
+         for ( int i = 0; i < numVButtons; i++ )
+            paintButton( &p, i );
+      }
   slider->repaint( TRUE );
@@ -300,3 +518,3 @@ bool VideoWidget::playVideo() {
     bool result = FALSE;
-
+//   qDebug("<<<<<<<<<<<<<<<< play video");
     int stream = 0;
@@ -311,3 +529,4 @@ bool VideoWidget::playVideo() {
 
-    if ( mediaPlayerState->fullscreen() ) {
+   if ( mediaPlayerState->fullscreen() )
+   {
 #ifdef USE_DIRECT_PAINTER
@@ -316,3 +535,4 @@ bool VideoWidget::playVideo() {
   if ( ( qt_screen->transformOrientation() == 3 ) &&
-       ( ( dd == 16 ) || ( dd == 32 ) ) && ( p.numRects() == 1 ) ) {
+           ( ( dd == 16 ) || ( dd == 32 ) ) && ( p.numRects() == 1 ) )
+      {
 
@@ -321,3 +541,4 @@ bool VideoWidget::playVideo() {
 
-      if ( mediaPlayerState->scaled() ) {
+         if ( mediaPlayerState->scaled() )
+         {
     // maintain aspect ratio
@@ -327,3 +548,5 @@ bool VideoWidget::playVideo() {
         h = sh * w / sw;
-      } else  {
+         }
+         else
+         {
     w = sw;
@@ -342,3 +565,5 @@ bool VideoWidget::playVideo() {
       uchar **jt = new uchar*[h];
-      for ( int i = h; i; i-- ) {
+
+         for ( int i = h; i; i-- )
+         {
     jt[h - i] = fp;
@@ -350,3 +575,5 @@ bool VideoWidget::playVideo() {
       delete [] jt;
-  } else {
+      }
+      else
+      {
 #endif
@@ -357,3 +584,4 @@ bool VideoWidget::playVideo() {
 
-      if ( mediaPlayerState->scaled() ) {
+         if ( mediaPlayerState->scaled() )
+         {
     // maintain aspect ratio
@@ -363,3 +591,5 @@ bool VideoWidget::playVideo() {
         h = sh * w / sw;
-      } else  {
+         }
+         else
+         {
     w = sw;
@@ -372,3 +602,5 @@ bool VideoWidget::playVideo() {
               0, 0, sw, sh, w, h, format, 0) == 0;
-      if ( result && mediaPlayerState->fullscreen() ) {
+
+         if ( result && mediaPlayerState->fullscreen() )
+         {
 
@@ -380,4 +612,7 @@ bool VideoWidget::playVideo() {
     int spl = rotatedFrame.bytesPerLine() / bytes;
-    for (int x=0; x<h; x++) {
-        if ( bytes == 2 ) {
+
+            for (int x=0; x<h; x++)
+            {
+               if ( bytes == 2 )
+               {
       ushort* lout = out++ + (w - 1)*spl;
@@ -387,5 +622,8 @@ bool VideoWidget::playVideo() {
       }
-        } else {
+               }
+               else
+               {
       ulong* lout = ((ulong *)out)++ + (w - 1)*spl;
-      for (int y=0; y<w; y++) {
+                  for (int y=0; y<w; y++)
+                  {
           *lout=*((ulong*)in)++;
@@ -401,3 +639,5 @@ bool VideoWidget::playVideo() {
 #endif
-    } else {
+   }
+   else
+   {
 
@@ -415,7 +655,8 @@ bool VideoWidget::playVideo() {
   QPainter p( this );
-
+      int deskW = qApp->desktop()->width();
   // Image changed size, therefore need to blank the possibly unpainted regions first
-  if ( scaledWidth != w || scaledHeight != h ) {
+      if ( scaledWidth != w || scaledHeight != h )
+      {
       p.setBrush( QBrush( Qt::black ) );
-      p.drawRect( 9, 20, 220, 160 );
+         p.drawRect( ( deskW -scaledWidth)/2, 20, scaledWidth, 160 );
   }
@@ -425,4 +666,5 @@ bool VideoWidget::playVideo() {
 
-  if ( result ) {
-      p.drawImage( 9 + (220 - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight );
+      if ( result )
+      {
+         p.drawImage(  (deskW  - scaledWidth) / 2, 20 + (160 - scaledHeight) / 2, *currentFrame, 0, 0, scaledWidth, scaledHeight );
   }
@@ -438,3 +680,4 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e)
 {
-    switch ( e->key() ) {
+   switch ( e->key() )
+   {
 ////////////////////////////// Zaurus keys
@@ -453,6 +696,10 @@ void VideoWidget::keyReleaseEvent( QKeyEvent *e)
           break;
-      case Key_Space: {
-          if(mediaPlayerState->playing()) {
+   case Key_Space:
+   {
+      if(mediaPlayerState->playing())
+      {
               mediaPlayerState->setPlaying(FALSE);
-          } else {
+      }
+      else
+      {
               mediaPlayerState->setPlaying(TRUE);