-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 40 |
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 | |||
@@ -37,3 +37,3 @@ class MediaWidget : public QWidget | |||
37 | public: | 37 | public: |
38 | enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back, Undefined }; | 38 | enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back, FullScreen, Undefined }; |
39 | enum ButtonType { NormalButton, ToggleButton }; | 39 | 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 | |||
@@ -61,6 +61,15 @@ const int yo = 0; // movable y offset | |||
61 | 61 | ||
62 | const char * const skinV_mask_file_names[7] = { | 62 | const MediaWidget::SkinButtonInfo skinInfo[] = |
63 | "play","stop","fwd","back","up","down","full" | 63 | { |
64 | { MediaWidget::Play, "play", MediaWidget::ToggleButton }, | ||
65 | { MediaWidget::Stop, "stop", MediaWidget::NormalButton }, | ||
66 | { MediaWidget::Next, "fwd", MediaWidget::NormalButton }, | ||
67 | { MediaWidget::Previous, "back", MediaWidget::NormalButton }, | ||
68 | { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton }, | ||
69 | { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton }, | ||
70 | { MediaWidget::FullScreen, "full", MediaWidget::ToggleButton } | ||
64 | }; | 71 | }; |
65 | 72 | ||
73 | const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] ); | ||
74 | |||
66 | } | 75 | } |
@@ -72,13 +81,2 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
72 | 81 | ||
73 | Button defaultButton; | ||
74 | Button toggleButton = defaultButton; | ||
75 | toggleButton.type = ToggleButton; | ||
76 | |||
77 | buttons.push_back( toggleButton ); // play | ||
78 | buttons.push_back( toggleButton ); // stop | ||
79 | buttons.push_back( toggleButton ); // next | ||
80 | buttons.push_back( toggleButton ); // previous | ||
81 | buttons.push_back( toggleButton ); // volUp | ||
82 | buttons.push_back( toggleButton ); // volDown | ||
83 | buttons.push_back( toggleButton ); // fullscreen | ||
84 | 82 | ||
@@ -101,8 +99,9 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
101 | 99 | ||
102 | uint i = 0; | 100 | for ( uint i = 0; i < buttonCount; i++ ) { |
103 | for ( ButtonVector::iterator it = buttons.begin(); it != buttons.end(); ++it, ++i ) { | 101 | Button button; |
104 | Button &button = *it; | 102 | button.command = skinInfo[ i ].command; |
103 | button.type = skinInfo[ i ].type; | ||
105 | 104 | ||
106 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinV_mask_file_names[i] + ".png" ); | 105 | QString filename = QString( QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_" + skinInfo[i].fileName + ".png" ); |
107 | button.mask = QBitmap( filename ); | 106 | button.mask =QBitmap( filename ); |
108 | 107 | ||
@@ -113,8 +112,9 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
113 | uchar *line = dest[y]; | 112 | uchar *line = dest[y]; |
114 | for ( int x = 0; x < imgUp.width(); x++ ) { | 113 | for ( int x = 0; x < imgUp.width(); x++ ) |
115 | if ( !qRed( imgMask.pixel( x, y ) ) ) | 114 | if ( !qRed( imgMask.pixel( x, y ) ) ) |
116 | line[x] = i + 1; | 115 | line[x] = i + 1; |
117 | } | ||
118 | } | 116 | } |
119 | } | 117 | } |
118 | |||
119 | buttons.push_back( button ); | ||
120 | } | 120 | } |