-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 8c781e9..3b3a263 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -31,30 +31,29 @@ | |||
31 | 31 | ||
32 | #include <vector> | 32 | #include <vector> |
33 | 33 | ||
34 | class MediaWidget : public QWidget | 34 | class MediaWidget : public QWidget |
35 | { | 35 | { |
36 | Q_OBJECT | 36 | Q_OBJECT |
37 | public: | 37 | public: |
38 | enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back, FullScreen, 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 }; |
40 | 40 | ||
41 | struct Button | 41 | struct Button |
42 | { | 42 | { |
43 | Button() : command( Undefined ), type( NormalButton ), isHeld( false ), isDown( false ) {} | 43 | Button() : command( Undefined ), type( NormalButton ), isDown( false ) {} |
44 | 44 | ||
45 | Command command; | 45 | Command command; |
46 | 46 | ||
47 | ButtonType type; // this should be part of the bitfield but gcc2 is too buggy to support this :-( | 47 | ButtonType type; // this should be part of the bitfield but gcc2 is too buggy to support this :-( |
48 | bool isHeld : 1; | ||
49 | bool isDown : 1; | 48 | bool isDown : 1; |
50 | 49 | ||
51 | QBitmap mask; | 50 | QBitmap mask; |
52 | QPixmap pixUp; | 51 | QPixmap pixUp; |
53 | QPixmap pixDown; | 52 | QPixmap pixDown; |
54 | }; | 53 | }; |
55 | typedef std::vector<Button> ButtonVector; | 54 | typedef std::vector<Button> ButtonVector; |
56 | 55 | ||
57 | struct SkinButtonInfo | 56 | struct SkinButtonInfo |
58 | { | 57 | { |
59 | Command command; | 58 | Command command; |
60 | const char *fileName; | 59 | const char *fileName; |