summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp40
2 files changed, 21 insertions, 21 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index efba6f3..3bf01b6 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -36,5 +36,5 @@ class MediaWidget : public QWidget
Q_OBJECT
public:
- enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back, Undefined };
+ enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back, FullScreen, Undefined };
enum ButtonType { NormalButton, ToggleButton };
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 8409e5c..4867ef1 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -60,8 +60,17 @@ const int xo = 2; // movable x offset
const int yo = 0; // movable y offset
-const char * const skinV_mask_file_names[7] = {
-"play","stop","fwd","back","up","down","full"
+const MediaWidget::SkinButtonInfo skinInfo[] =
+{
+ { MediaWidget::Play, "play", MediaWidget::ToggleButton },
+ { MediaWidget::Stop, "stop", MediaWidget::NormalButton },
+ { MediaWidget::Next, "fwd", MediaWidget::NormalButton },
+ { MediaWidget::Previous, "back", MediaWidget::NormalButton },
+ { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton },
+ { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton },
+ { MediaWidget::FullScreen, "full", MediaWidget::ToggleButton }
};
+const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] );
+
}
@@ -71,15 +80,4 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
setCaption( tr("OpiePlayer - Video") );
- Button defaultButton;
- Button toggleButton = defaultButton;
- toggleButton.type = ToggleButton;
-
- buttons.push_back( toggleButton ); // play
- buttons.push_back( toggleButton ); // stop
- buttons.push_back( toggleButton ); // next
- buttons.push_back( toggleButton ); // previous
- buttons.push_back( toggleButton ); // volUp
- buttons.push_back( toggleButton ); // volDown
- buttons.push_back( toggleButton ); // fullscreen
videoFrame = new XineVideoWidget ( this, "Video frame" );
@@ -100,10 +98,11 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
buttonMask.fill( 0 );
- uint i = 0;
- for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it, ++i ) {
- Button &button = *it;
+ for ( uint i = 0; i < buttonCount; i++ ) {
+ Button button;
+ button.command = skinInfo[ i ].command;
+ button.type = skinInfo[ i ].type;
- QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" );
- button.mask = QBitmap( filename );
+ QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinInfo[i].fileName + ".png" );
+ button.mask =QBitmap( filename );
if ( !button.mask.isNull() ) {
@@ -112,10 +111,11 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye
for ( int y = 0; y < imgUp.height(); y++ ) {
uchar *line = dest[y];
- for ( int x = 0; x < imgUp.width(); x++ ) {
+ for ( int x = 0; x < imgUp.width(); x++ )
if ( !qRed( imgMask.pixel( x, y ) ) )
line[x] = i + 1;
- }
}
}
+
+ buttons.push_back( button );
}