author | zecke <zecke> | 2004-09-23 21:38:02 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-09-23 21:38:02 (UTC) |
commit | 97ab73d99688443d02086b4f00d1de7c81faa3c7 (patch) (unidiff) | |
tree | 63864e847abc41442d2ed88ca27a27ad1942c15a /noncore/multimedia/opieplayer2/mediawidget.h | |
parent | 3080b2095fd9dddc4937cbf74037ce1dbc7fa6b2 (diff) | |
download | opie-97ab73d99688443d02086b4f00d1de7c81faa3c7.zip opie-97ab73d99688443d02086b4f00d1de7c81faa3c7.tar.gz opie-97ab73d99688443d02086b4f00d1de7c81faa3c7.tar.bz2 |
-Remove bogus whitespaces
-Remove stl dependency
-Make switching from fullscreen video to audio work
-Remove debug output
Diffstat (limited to 'noncore/multimedia/opieplayer2/mediawidget.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 8c3a467..d885150 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -20,50 +20,47 @@ | |||
20 | Boston, MA 02111-1307, USA. | 20 | Boston, MA 02111-1307, USA. |
21 | */ | 21 | */ |
22 | 22 | ||
23 | #ifndef MEDIAWIDGET_H | 23 | #ifndef MEDIAWIDGET_H |
24 | #define MEDIAWIDGET_H | 24 | #define MEDIAWIDGET_H |
25 | 25 | ||
26 | #include <qwidget.h> | 26 | #include <qwidget.h> |
27 | #include <qmap.h> | 27 | #include <qmap.h> |
28 | 28 | ||
29 | #include "mediaplayerstate.h" | 29 | #include "mediaplayerstate.h" |
30 | #include "playlistwidget.h" | 30 | #include "playlistwidget.h" |
31 | 31 | ||
32 | #include <vector> | ||
33 | #include <memory> | ||
34 | |||
35 | class Skin; | 32 | class Skin; |
36 | 33 | ||
37 | class MediaWidget : public QWidget | 34 | class MediaWidget : public QWidget |
38 | { | 35 | { |
39 | Q_OBJECT | 36 | Q_OBJECT |
40 | public: | 37 | public: |
41 | 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 }; |
42 | enum ButtonType { NormalButton, ToggleButton }; | 39 | enum ButtonType { NormalButton, ToggleButton }; |
43 | 40 | ||
44 | struct Button | 41 | struct Button |
45 | { | 42 | { |
46 | Button() : command( Undefined ), type( NormalButton ), isDown( false ) {} | 43 | Button() : command( Undefined ), type( NormalButton ), isDown( false ) {} |
47 | 44 | ||
48 | Command command; | 45 | Command command; |
49 | 46 | ||
50 | 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 :-( |
51 | bool isDown : 1; | 48 | bool isDown : 1; |
52 | 49 | ||
53 | QBitmap mask; | 50 | QBitmap mask; |
54 | QPixmap pixUp; | 51 | QPixmap pixUp; |
55 | QPixmap pixDown; | 52 | QPixmap pixDown; |
56 | }; | 53 | }; |
57 | typedef std::vector<Button> ButtonVector; | 54 | typedef QValueList<Button> ButtonVector; |
58 | 55 | ||
59 | struct SkinButtonInfo | 56 | struct SkinButtonInfo |
60 | { | 57 | { |
61 | Command command; | 58 | Command command; |
62 | const char *fileName; | 59 | const char *fileName; |
63 | ButtonType type; | 60 | ButtonType type; |
64 | }; | 61 | }; |
65 | 62 | ||
66 | struct GUIInfo | 63 | struct GUIInfo |
67 | { | 64 | { |
68 | GUIInfo() : buttonInfo( 0 ), buttonCount( 0 ) {} | 65 | GUIInfo() : buttonInfo( 0 ), buttonCount( 0 ) {} |
69 | GUIInfo( const QString &_fileNameInfix, const SkinButtonInfo *_buttonInfo, const uint _buttonCount ) | 66 | GUIInfo( const QString &_fileNameInfix, const SkinButtonInfo *_buttonInfo, const uint _buttonCount ) |