summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-09 14:22:05 (UTC)
committer simon <simon>2002-12-09 14:22:05 (UTC)
commit8746877e7ed89fc4c227d5d79d63c35c69ceacd6 (patch) (unidiff)
tree3e8b175d266dcf97062278af0592118b70af533d
parent2bcd5795a30de05820edaf253dc34717de498fca (diff)
downloadopie-8746877e7ed89fc4c227d5d79d63c35c69ceacd6.zip
opie-8746877e7ed89fc4c227d5d79d63c35c69ceacd6.tar.gz
opie-8746877e7ed89fc4c227d5d79d63c35c69ceacd6.tar.bz2
- moving some variables to the base class
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/audiowidget.h6
-rw-r--r--noncore/multimedia/opieplayer2/mediawidget.h7
2 files changed, 7 insertions, 6 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h
index 73ce1e5..332fb4b 100644
--- a/noncore/multimedia/opieplayer2/audiowidget.h
+++ b/noncore/multimedia/opieplayer2/audiowidget.h
@@ -88,25 +88,19 @@ protected:
88 void keyReleaseEvent( QKeyEvent *e); 88 void keyReleaseEvent( QKeyEvent *e);
89private slots: 89private slots:
90 void skipFor(); 90 void skipFor();
91 void skipBack(); 91 void skipBack();
92 void stopSkip(); 92 void stopSkip();
93private: 93private:
94 typedef std::vector<QBitmap> MaskVector;
95 typedef std::vector<QPixmap> PixmapVector;
96
97 void setToggleButton( int, bool ); 94 void setToggleButton( int, bool );
98 virtual void paintButton( QPainter &p, int i ); 95 virtual void paintButton( QPainter &p, int i );
99 int skipDirection; 96 int skipDirection;
100 QString skin; 97 QString skin;
101 QPixmap pixBg; 98 QPixmap pixBg;
102 QImage imgUp; 99 QImage imgUp;
103 QImage imgDn; 100 QImage imgDn;
104 MaskVector masks;
105 PixmapVector buttonPixUp;
106 PixmapVector buttonPixDown;
107 101
108 OTicker songInfo; 102 OTicker songInfo;
109 QSlider slider; 103 QSlider slider;
110 QLineEdit time; 104 QLineEdit time;
111 bool isStreaming : 1; 105 bool isStreaming : 1;
112 bool audioSliderBeingMoved : 1; 106 bool audioSliderBeingMoved : 1;
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h
index 9fb3499..2641df6 100644
--- a/noncore/multimedia/opieplayer2/mediawidget.h
+++ b/noncore/multimedia/opieplayer2/mediawidget.h
@@ -51,12 +51,15 @@ public:
51 { 51 {
52 Command command; 52 Command command;
53 const char *fileName; 53 const char *fileName;
54 ButtonType type; 54 ButtonType type;
55 }; 55 };
56 56
57 typedef std::vector<QBitmap> MaskVector;
58 typedef std::vector<QPixmap> PixmapVector;
59
57 MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); 60 MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 );
58 virtual ~MediaWidget(); 61 virtual ~MediaWidget();
59 62
60public slots: 63public slots:
61 virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0; 64 virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0;
62 virtual void setLength( long length ) = 0; 65 virtual void setLength( long length ) = 0;
@@ -84,12 +87,16 @@ protected:
84 PlayListWidget &playList; 87 PlayListWidget &playList;
85 88
86 ButtonVector buttons; 89 ButtonVector buttons;
87 90
88 QImage buttonMask; 91 QImage buttonMask;
89 92
93 MaskVector masks;
94 PixmapVector buttonPixUp;
95 PixmapVector buttonPixDown;
96
90 QPoint upperLeftOfButtonMask; 97 QPoint upperLeftOfButtonMask;
91}; 98};
92 99
93#endif // MEDIAWIDGET_H 100#endif // MEDIAWIDGET_H
94/* vim: et sw=4 ts=4 101/* vim: et sw=4 ts=4
95 */ 102 */