summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h9
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp9
3 files changed, 13 insertions, 9 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 7bf3a19..879d0b4 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -61,7 +61,7 @@ struct MediaButton {
};
//Layout information for the audioButtons (and if it is a toggle button or not)
-MediaButton audioButtons[] = {
+MediaWidget::Button audioButtons[] = {
{ TRUE, FALSE, FALSE }, // play
{ FALSE, FALSE, FALSE }, // stop
{ FALSE, FALSE, FALSE }, // next
@@ -86,7 +86,7 @@ void changeTextColor( QWidget * w) {
w->setPalette( p );
}
-const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
+const int numButtons = (sizeof(audioButtons)/sizeof(MediaWidget::Button));
}
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 2d92d65..0b9d826 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -31,6 +31,15 @@ class MediaWidget : public QWidget
public:
enum Command { Play = 0, Stop, Next, Previous, VolumeUp, VolumeDown, Loop, PlayList, Forward, Back };
+ struct Button
+ {
+// Button() : isToggle( false ), isHeld( false ), isDown( false ) {}
+
+ bool isToggle : 1;
+ bool isHeld : 1;
+ bool isDown : 1;
+ };
+
MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
virtual ~MediaWidget();
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index a0aed62..7c20c6d 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -59,12 +59,7 @@ namespace
const int xo = 2; // movable x offset
const int yo = 0; // movable y offset
-
-struct MediaButton {
- bool isToggle, isHeld, isDown;
-};
-
-MediaButton videoButtons[] = {
+MediaWidget::Button videoButtons[] = {
{ FALSE, FALSE, FALSE }, // stop
{ TRUE, FALSE, FALSE }, // play
{ FALSE, FALSE, FALSE }, // previous
@@ -78,7 +73,7 @@ const char * const skinV_mask_file_names[7] = {
"stop","play","back","fwd","up","down","full"
};
-const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton));
+const int numVButtons = (sizeof(videoButtons)/sizeof(MediaWidget::Button));
}