-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 12 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 12 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 2 |
4 files changed, 28 insertions, 2 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 78079dd..4db444a 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -110,8 +110,18 @@ AudioWidget::~AudioWidget() { | |||
110 | 110 | ||
111 | // mediaPlayerState->setPlaying(false); | 111 | // mediaPlayerState->setPlaying(false); |
112 | } | 112 | } |
113 | 113 | ||
114 | const MediaWidget::SkinButtonInfo *AudioWidget::skinInfo() | ||
115 | { | ||
116 | return ::skinInfo; | ||
117 | } | ||
118 | |||
119 | const uint AudioWidget::buttonCount() | ||
120 | { | ||
121 | return ::buttonCount; | ||
122 | } | ||
123 | |||
114 | void AudioWidget::resizeEvent( QResizeEvent *e ) { | 124 | void AudioWidget::resizeEvent( QResizeEvent *e ) { |
115 | int h = height(); | 125 | int h = height(); |
116 | int w = width(); | 126 | int w = width(); |
117 | 127 | ||
@@ -163,9 +173,9 @@ void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) { | |||
163 | } | 173 | } |
164 | 174 | ||
165 | void AudioWidget::loadSkin() | 175 | void AudioWidget::loadSkin() |
166 | { | 176 | { |
167 | loadDefaultSkin( skinInfo, buttonCount ); | 177 | loadDefaultSkin( ::skinInfo, ::buttonCount ); |
168 | 178 | ||
169 | setBackgroundPixmap( backgroundPixmap ); | 179 | setBackgroundPixmap( backgroundPixmap ); |
170 | 180 | ||
171 | songInfo.setFocusPolicy( QWidget::NoFocus ); | 181 | songInfo.setFocusPolicy( QWidget::NoFocus ); |
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 670fb45..75d4857 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -54,8 +54,12 @@ class AudioWidget : public MediaWidget { | |||
54 | public: | 54 | public: |
55 | AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); | 55 | AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); |
56 | ~AudioWidget(); | 56 | ~AudioWidget(); |
57 | void setTickerText( const QString &text ) { songInfo.setText( text ); } | 57 | void setTickerText( const QString &text ) { songInfo.setText( text ); } |
58 | |||
59 | static const MediaWidget::SkinButtonInfo *skinInfo(); | ||
60 | static const uint buttonCount(); | ||
61 | |||
58 | public slots: | 62 | public slots: |
59 | void updateSlider( long, long ); | 63 | void updateSlider( long, long ); |
60 | void sliderPressed( ); | 64 | void sliderPressed( ); |
61 | void sliderReleased( ); | 65 | void sliderReleased( ); |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index a8ff540..058730f 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -98,8 +98,18 @@ VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlaye | |||
98 | VideoWidget::~VideoWidget() | 98 | VideoWidget::~VideoWidget() |
99 | { | 99 | { |
100 | } | 100 | } |
101 | 101 | ||
102 | const MediaWidget::SkinButtonInfo *VideoWidget::skinInfo() | ||
103 | { | ||
104 | return ::skinInfo; | ||
105 | } | ||
106 | |||
107 | const uint VideoWidget::buttonCount() | ||
108 | { | ||
109 | return ::buttonCount; | ||
110 | } | ||
111 | |||
102 | void VideoWidget::resizeEvent( QResizeEvent *e ) { | 112 | void VideoWidget::resizeEvent( QResizeEvent *e ) { |
103 | int h = height(); | 113 | int h = height(); |
104 | int w = width(); | 114 | int w = width(); |
105 | //int Vh = 160; | 115 | //int Vh = 160; |
@@ -156,9 +166,9 @@ void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType ) | |||
156 | } | 166 | } |
157 | 167 | ||
158 | void VideoWidget::loadSkin() | 168 | void VideoWidget::loadSkin() |
159 | { | 169 | { |
160 | loadDefaultSkin( skinInfo, buttonCount, "V" ); | 170 | loadDefaultSkin( ::skinInfo, ::buttonCount, "V" ); |
161 | 171 | ||
162 | setBackgroundPixmap( backgroundPixmap ); | 172 | setBackgroundPixmap( backgroundPixmap ); |
163 | 173 | ||
164 | delete slider; | 174 | delete slider; |
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index f434945..80e9356 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -49,8 +49,10 @@ class VideoWidget : public MediaWidget { | |||
49 | public: | 49 | public: |
50 | VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); | 50 | VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent=0, const char* name=0 ); |
51 | ~VideoWidget(); | 51 | ~VideoWidget(); |
52 | 52 | ||
53 | static const MediaWidget::SkinButtonInfo *skinInfo(); | ||
54 | static const uint buttonCount(); | ||
53 | 55 | ||
54 | XineVideoWidget* vidWidget(); | 56 | XineVideoWidget* vidWidget(); |
55 | public slots: | 57 | public slots: |
56 | void updateSlider( long, long ); | 58 | void updateSlider( long, long ); |