author | simon <simon> | 2002-12-08 21:22:34 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-08 21:22:34 (UTC) |
commit | 10cf937a493866cfa0df9569f67c8cad25c62a5b (patch) (unidiff) | |
tree | 95719a27fb96ecb6c115f7816265a0377787db64 /noncore/multimedia | |
parent | a78a8d830d81adc8c6e9b2131329d72aa0c18b55 (diff) | |
download | opie-10cf937a493866cfa0df9569f67c8cad25c62a5b.zip opie-10cf937a493866cfa0df9569f67c8cad25c62a5b.tar.gz opie-10cf937a493866cfa0df9569f67c8cad25c62a5b.tar.bz2 |
- unused variables removed
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 22 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 14 |
3 files changed, 1 insertions, 39 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 4172da0..7fb3781 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -53,46 +53,24 @@ | |||
53 | namespace | 53 | namespace |
54 | { | 54 | { |
55 | 55 | ||
56 | const int xo = -2; // movable x offset | 56 | const int xo = -2; // movable x offset |
57 | const int yo = 22; // movable y offset | 57 | const int yo = 22; // movable y offset |
58 | 58 | ||
59 | struct MediaButton { | ||
60 | bool isToggle, isHeld, isDown; | ||
61 | }; | ||
62 | |||
63 | //Layout information for the audioButtons (and if it is a toggle button or not) | ||
64 | /* | ||
65 | MediaWidget::Button audioButtons[] = { | ||
66 | { TRUE, FALSE, FALSE }, // play | ||
67 | { FALSE, FALSE, FALSE }, // stop | ||
68 | { FALSE, FALSE, FALSE }, // next | ||
69 | { FALSE, FALSE, FALSE }, // previous | ||
70 | { FALSE, FALSE, FALSE }, // volume up | ||
71 | { FALSE, FALSE, FALSE }, // volume down | ||
72 | { TRUE, FALSE, FALSE }, // repeat/loop | ||
73 | { FALSE, FALSE, FALSE }, // playlist | ||
74 | { FALSE, FALSE, FALSE }, // forward | ||
75 | { FALSE, FALSE, FALSE } // back | ||
76 | }; | ||
77 | */ | ||
78 | |||
79 | const char * const skin_mask_file_names[10] = { | 59 | const char * const skin_mask_file_names[10] = { |
80 | "play", "stop", "next", "prev", "up", | 60 | "play", "stop", "next", "prev", "up", |
81 | "down", "loop", "playlist", "forward", "back" | 61 | "down", "loop", "playlist", "forward", "back" |
82 | }; | 62 | }; |
83 | 63 | ||
84 | void changeTextColor( QWidget * w) { | 64 | void changeTextColor( QWidget * w) { |
85 | QPalette p = w->palette(); | 65 | QPalette p = w->palette(); |
86 | p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); | 66 | p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); |
87 | p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); | 67 | p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); |
88 | w->setPalette( p ); | 68 | w->setPalette( p ); |
89 | } | 69 | } |
90 | 70 | ||
91 | //const int numButtons = (sizeof(audioButtons)/sizeof(MediaWidget::Button)); | ||
92 | |||
93 | } | 71 | } |
94 | 72 | ||
95 | AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : | 73 | AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : |
96 | 74 | ||
97 | MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { | 75 | MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { |
98 | 76 | ||
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 9cb75ae..8b0d48c 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -32,15 +32,13 @@ class MediaWidget : public QWidget | |||
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | public: | 33 | public: |
34 | enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back }; | 34 | enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back }; |
35 | 35 | ||
36 | struct Button | 36 | struct Button |
37 | { | 37 | { |
38 | //Button() : isToggle( false ), isHeld( false ), isDown( false ) {} | 38 | Button() : isToggle( false ), isHeld( false ), isDown( false ) {} |
39 | // Button( bool toggle, bool held, bool down ) | ||
40 | // : isToggle( toggle ), isHeld( held ), isDown( down ) {} | ||
41 | 39 | ||
42 | bool isToggle : 1; | 40 | bool isToggle : 1; |
43 | bool isHeld : 1; | 41 | bool isHeld : 1; |
44 | bool isDown : 1; | 42 | bool isDown : 1; |
45 | }; | 43 | }; |
46 | typedef std::vector<Button> ButtonVector; | 44 | typedef std::vector<Button> ButtonVector; |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index efd756c..6e2e03e 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -56,30 +56,16 @@ | |||
56 | namespace | 56 | namespace |
57 | { | 57 | { |
58 | 58 | ||
59 | const int xo = 2; // movable x offset | 59 | const int xo = 2; // movable x offset |
60 | const int yo = 0; // movable y offset | 60 | const int yo = 0; // movable y offset |
61 | 61 | ||
62 | /* | ||
63 | MediaWidget::Button videoButtons[] = { | ||
64 | { FALSE, FALSE, FALSE }, // stop | ||
65 | { TRUE, FALSE, FALSE }, // play | ||
66 | { FALSE, FALSE, FALSE }, // previous | ||
67 | { FALSE, FALSE, FALSE }, // next | ||
68 | { FALSE, FALSE, FALSE }, // volUp | ||
69 | { FALSE, FALSE, FALSE }, // volDown | ||
70 | { TRUE, FALSE, FALSE } // fullscreen | ||
71 | }; | ||
72 | */ | ||
73 | |||
74 | const char * const skinV_mask_file_names[7] = { | 62 | const char * const skinV_mask_file_names[7] = { |
75 | "stop","play","back","fwd","up","down","full" | 63 | "stop","play","back","fwd","up","down","full" |
76 | }; | 64 | }; |
77 | 65 | ||
78 | //const int numVButtons = (sizeof(videoButtons)/sizeof(MediaWidget::Button)); | ||
79 | |||
80 | } | 66 | } |
81 | 67 | ||
82 | VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) | 68 | VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) |
83 | : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) | 69 | : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) |
84 | { | 70 | { |
85 | setCaption( tr("OpiePlayer - Video") ); | 71 | setCaption( tr("OpiePlayer - Video") ); |