summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-08 20:44:22 (UTC)
committer simon <simon>2002-12-08 20:44:22 (UTC)
commit8824690b4900ebfac866b90cf3e715b62a2acc89 (patch) (side-by-side diff)
tree943b937168bc723402b4f94471dfdcc8db10f5ae
parent7c3bd0be34ef70a2297e6f27c592da62f3010da5 (diff)
downloadopie-8824690b4900ebfac866b90cf3e715b62a2acc89.zip
opie-8824690b4900ebfac866b90cf3e715b62a2acc89.tar.gz
opie-8824690b4900ebfac866b90cf3e715b62a2acc89.tar.bz2
- merged duplicated MediaButton definition into common MediaWidget::Button
structure
Diffstat (more/less context) (ignore 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
@@ -63,3 +63,3 @@ 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
@@ -88,3 +88,3 @@ void changeTextColor( QWidget * w) {
-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
@@ -33,2 +33,11 @@ public:
+ 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 );
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
@@ -61,8 +61,3 @@ const int yo = 0; // movable y offset
-
-struct MediaButton {
- bool isToggle, isHeld, isDown;
-};
-
-MediaButton videoButtons[] = {
+MediaWidget::Button videoButtons[] = {
{ FALSE, FALSE, FALSE }, // stop
@@ -80,3 +75,3 @@ const char * const skinV_mask_file_names[7] = {
-const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton));
+const int numVButtons = (sizeof(videoButtons)/sizeof(MediaWidget::Button));