summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-02 19:46:48 (UTC)
committer simon <simon>2002-12-02 19:46:48 (UTC)
commite77f4914311d8a623c084d01a287798440abf01f (patch) (unidiff)
tree673375b737c4b1435929cdc804641b08d20e62c8
parent1706751f05c1d4312beb1ca939a156b090c7b5f6 (diff)
downloadopie-e77f4914311d8a623c084d01a287798440abf01f.zip
opie-e77f4914311d8a623c084d01a287798440abf01f.tar.gz
opie-e77f4914311d8a623c084d01a287798440abf01f.tar.bz2
- inherit from MediaWidget
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h9
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/videowidget.h6
4 files changed, 12 insertions, 13 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp
index 1600320..0b7d470 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.cpp
+++ b/noncore/multimedia/opieplayer2/audiowidget.cpp
@@ -92,5 +92,5 @@ static const int numButtons = (sizeof(audioButtons)/sizeof(MediaButton));
92 92
93AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) : 93AudioWidget::AudioWidget(QWidget* parent, const char* name) :
94 94
95 QWidget( parent, name, f ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) { 95 MediaWidget( parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ) {
96 96
@@ -162,3 +162,2 @@ AudioWidget::AudioWidget(QWidget* parent, const char* name, WFlags f) :
162 connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); 162 connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) );
163 connect( mediaPlayerState, SIGNAL( displayTypeChanged(MediaPlayerState::DisplayType) ), this, SLOT( setDisplayType(MediaPlayerState::DisplayType) ) );
164 connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); 163 connect( mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) );
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 91fcbc5..74c5b0e 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -36,3 +36,2 @@
36 36
37#include <qwidget.h>
38#include <qpainter.h> 37#include <qpainter.h>
@@ -48,3 +47,3 @@
48 47
49#include "mediaplayerstate.h" 48#include "mediawidget.h"
50 49
@@ -68,6 +67,6 @@ enum AudioButtons {
68 67
69class AudioWidget : public QWidget { 68class AudioWidget : public MediaWidget {
70 Q_OBJECT 69 Q_OBJECT
71public: 70public:
72 AudioWidget( QWidget* parent=0, const char* name=0, WFlags f=0 ); 71 AudioWidget( QWidget* parent=0, const char* name=0 );
73 ~AudioWidget(); 72 ~AudioWidget();
@@ -83,2 +82,4 @@ public slots:
83 void setSeekable( bool ); 82 void setSeekable( bool );
83
84public:
84 void setDisplayType( MediaPlayerState::DisplayType displayType ); 85 void setDisplayType( MediaPlayerState::DisplayType displayType );
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp
index 9ce2b57..8a0016e 100644
--- a/noncore/multimedia/opieplayer2/videowidget.cpp
+++ b/noncore/multimedia/opieplayer2/videowidget.cpp
@@ -85,4 +85,4 @@ static const int numVButtons = (sizeof(videoButtons)/sizeof(MediaButton));
85 85
86VideoWidget::VideoWidget(QWidget* parent, const char* name, WFlags f) : 86VideoWidget::VideoWidget(QWidget* parent, const char* name) :
87QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) { 87MediaWidget( parent, name ), scaledWidth( 0 ), scaledHeight( 0 ) {
88 88
@@ -141,3 +141,2 @@ QWidget( parent, name, f ), scaledWidth( 0 ), scaledHeight( 0 ) {
141 connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) ); 141 connect( mediaPlayerState, SIGNAL( lengthChanged(long) ), this, SLOT( setLength(long) ) );
142 connect( mediaPlayerState, SIGNAL( displayTypeChanged(MediaPlayerState::DisplayType) ), this, SLOT( setDisplayType(MediaPlayerState::DisplayType) ) );
143 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) ); 142 connect( mediaPlayerState, SIGNAL( playingToggled(bool) ), this, SLOT( setPlaying(bool) ) );
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h
index 89af646..8e9dd7e 100644
--- a/noncore/multimedia/opieplayer2/videowidget.h
+++ b/noncore/multimedia/opieplayer2/videowidget.h
@@ -39,3 +39,3 @@
39 39
40#include "mediaplayerstate.h" 40#include "mediawidget.h"
41 41
@@ -55,6 +55,6 @@ enum VideoButtons {
55 55
56class VideoWidget : public QWidget { 56class VideoWidget : public MediaWidget {
57 Q_OBJECT 57 Q_OBJECT
58public: 58public:
59 VideoWidget( QWidget* parent=0, const char* name=0, WFlags f=0 ); 59 VideoWidget( QWidget* parent=0, const char* name=0 );
60 ~VideoWidget(); 60 ~VideoWidget();