author | simon <simon> | 2002-12-09 21:43:32 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-09 21:43:32 (UTC) |
commit | 40ff6884f079a55fcf219b2d032c7be4da385bc1 (patch) (unidiff) | |
tree | fd13c702652ee0f22201eb6145b10e67f9580aeb /noncore | |
parent | a9015ff25ddec67983f78f2a75346f21b7d062c5 (diff) | |
download | opie-40ff6884f079a55fcf219b2d032c7be4da385bc1.zip opie-40ff6884f079a55fcf219b2d032c7be4da385bc1.tar.gz opie-40ff6884f079a55fcf219b2d032c7be4da385bc1.tar.bz2 |
- hah, the improved design pays off :) switching skins at run-time now
only reloads the pixmaps and no more requires a restart or re-creation
of the audio/video widgets and the xine control (which involved slow
xine initialization)
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 83 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/main.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.cpp | 3 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediawidget.h | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 47 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.h | 2 |
9 files changed, 87 insertions, 61 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index fd18dbb..0516089 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -67,103 +67,64 @@ const MediaWidget::SkinButtonInfo skinInfo[] = | |||
67 | { MediaWidget::Loop, "loop", MediaWidget::ToggleButton }, | 67 | { MediaWidget::Loop, "loop", MediaWidget::ToggleButton }, |
68 | { MediaWidget::PlayList, "playlist", MediaWidget::NormalButton }, | 68 | { MediaWidget::PlayList, "playlist", MediaWidget::NormalButton }, |
69 | { MediaWidget::Forward, "forward", MediaWidget::NormalButton }, | 69 | { MediaWidget::Forward, "forward", MediaWidget::NormalButton }, |
70 | { MediaWidget::Back, "back", MediaWidget::NormalButton } | 70 | { MediaWidget::Back, "back", MediaWidget::NormalButton } |
71 | }; | 71 | }; |
72 | 72 | ||
73 | const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] ); | 73 | const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] ); |
74 | 74 | ||
75 | void changeTextColor( QWidget * w) { | 75 | void changeTextColor( QWidget * w) { |
76 | QPalette p = w->palette(); | 76 | QPalette p = w->palette(); |
77 | p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); | 77 | p.setBrush( QColorGroup::Background, QColor( 167, 212, 167 ) ); |
78 | p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); | 78 | p.setBrush( QColorGroup::Base, QColor( 167, 212, 167 ) ); |
79 | w->setPalette( p ); | 79 | w->setPalette( p ); |
80 | } | 80 | } |
81 | 81 | ||
82 | } | 82 | } |
83 | 83 | ||
84 | AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : | 84 | AudioWidget::AudioWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name) : |
85 | 85 | ||
86 | MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ), | 86 | MediaWidget( playList, mediaPlayerState, parent, name ), songInfo( this ), slider( Qt::Horizontal, this ), time( this ), |
87 | audioSliderBeingMoved( false ) | 87 | audioSliderBeingMoved( false ) |
88 | { | 88 | { |
89 | setCaption( tr("OpiePlayer") ); | 89 | setCaption( tr("OpiePlayer") ); |
90 | 90 | ||
91 | Config cfg("OpiePlayer"); | 91 | loadSkin(); |
92 | cfg.setGroup("Options"); | ||
93 | skin = cfg.readEntry("Skin","default"); | ||
94 | //skin = "scaleTest"; | ||
95 | // color of background, frame, degree of transparency | ||
96 | |||
97 | QString skinPath = "opieplayer2/skins/" + skin; | ||
98 | backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | ||
99 | imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); | ||
100 | imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); | ||
101 | |||
102 | setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_", imgUp.size() ); | ||
103 | |||
104 | setBackgroundPixmap( backgroundPixmap ); | ||
105 | |||
106 | songInfo.setFocusPolicy( QWidget::NoFocus ); | ||
107 | // changeTextColor( &songInfo ); | ||
108 | // songInfo.setBackgroundColor( QColor( 167, 212, 167 )); | ||
109 | // songInfo.setFrameStyle( QFrame::NoFrame); | ||
110 | songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken ); | ||
111 | // songInfo.setForegroundColor(Qt::white); | ||
112 | |||
113 | slider.setFixedHeight( 20 ); | ||
114 | slider.setMinValue( 0 ); | ||
115 | slider.setMaxValue( 1 ); | ||
116 | slider.setFocusPolicy( QWidget::NoFocus ); | ||
117 | slider.setBackgroundPixmap( backgroundPixmap ); | ||
118 | |||
119 | // Config cofg("qpe"); | ||
120 | // cofg.setGroup("Appearance"); | ||
121 | // QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) ); | ||
122 | |||
123 | time.setFocusPolicy( QWidget::NoFocus ); | ||
124 | time.setAlignment( Qt::AlignCenter ); | ||
125 | |||
126 | // time.setFrame(FALSE); | ||
127 | // changeTextColor( &time ); | ||
128 | |||
129 | resizeEvent( NULL ); | ||
130 | 92 | ||
131 | connect( &mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); | 93 | connect( &mediaPlayerState, SIGNAL( loopingToggled(bool) ), this, SLOT( setLooping(bool) ) ); |
132 | connect( &mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) ); | 94 | connect( &mediaPlayerState, SIGNAL( isSeekableToggled( bool ) ), this, SLOT( setSeekable( bool ) ) ); |
133 | 95 | ||
134 | connect( this, SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) ); | 96 | connect( this, SIGNAL( forwardClicked() ), this, SLOT( skipFor() ) ); |
135 | connect( this, SIGNAL( backClicked() ), this, SLOT( skipBack() ) ); | 97 | connect( this, SIGNAL( backClicked() ), this, SLOT( skipBack() ) ); |
136 | connect( this, SIGNAL( forwardReleased() ), this, SLOT( stopSkip() ) ); | 98 | connect( this, SIGNAL( forwardReleased() ), this, SLOT( stopSkip() ) ); |
137 | connect( this, SIGNAL( backReleased() ), this, SLOT( stopSkip() ) ); | 99 | connect( this, SIGNAL( backReleased() ), this, SLOT( stopSkip() ) ); |
138 | 100 | ||
139 | // Intialise state | 101 | // Intialise state |
140 | setLength( mediaPlayerState.length() ); | 102 | setLength( mediaPlayerState.length() ); |
141 | setPosition( mediaPlayerState.position() ); | 103 | setPosition( mediaPlayerState.position() ); |
142 | setLooping( mediaPlayerState.isFullscreen() ); | 104 | setLooping( mediaPlayerState.isFullscreen() ); |
143 | // setPaused( mediaPlayerState->paused() ); | 105 | // setPaused( mediaPlayerState->paused() ); |
144 | setPlaying( mediaPlayerState.isPlaying() ); | 106 | setPlaying( mediaPlayerState.isPlaying() ); |
145 | |||
146 | } | 107 | } |
147 | 108 | ||
148 | AudioWidget::~AudioWidget() { | 109 | AudioWidget::~AudioWidget() { |
149 | 110 | ||
150 | // mediaPlayerState->setPlaying(false); | 111 | // mediaPlayerState->setPlaying(false); |
151 | } | 112 | } |
152 | 113 | ||
153 | namespace { | 114 | namespace { |
154 | 115 | ||
155 | QPixmap combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { | 116 | QPixmap combineImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { |
156 | QPixmap pix( img.width(), img.height() ); | 117 | QPixmap pix( img.width(), img.height() ); |
157 | QPainter p( &pix ); | 118 | QPainter p( &pix ); |
158 | p.drawTiledPixmap( pix.rect(), bg, offset ); | 119 | p.drawTiledPixmap( pix.rect(), bg, offset ); |
159 | p.drawImage( 0, 0, img ); | 120 | p.drawImage( 0, 0, img ); |
160 | return pix; | 121 | return pix; |
161 | } | 122 | } |
162 | 123 | ||
163 | 124 | ||
164 | QPixmap maskPixToMask( QPixmap pix, QBitmap mask ) { | 125 | QPixmap maskPixToMask( QPixmap pix, QBitmap mask ) { |
165 | QPixmap pixmap( pix ); | 126 | QPixmap pixmap( pix ); |
166 | pixmap.setMask( mask ); | 127 | pixmap.setMask( mask ); |
167 | return pixmap; | 128 | return pixmap; |
168 | } | 129 | } |
169 | 130 | ||
@@ -208,48 +169,90 @@ void AudioWidget::sliderReleased() { | |||
208 | } | 169 | } |
209 | 170 | ||
210 | void AudioWidget::setPosition( long i ) { | 171 | void AudioWidget::setPosition( long i ) { |
211 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i); | 172 | // qDebug("<<<<<<<<<<<<<<<<<<<<<<<<set position %d",i); |
212 | updateSlider( i, mediaPlayerState.length() ); | 173 | updateSlider( i, mediaPlayerState.length() ); |
213 | } | 174 | } |
214 | 175 | ||
215 | 176 | ||
216 | void AudioWidget::setLength( long max ) { | 177 | void AudioWidget::setLength( long max ) { |
217 | updateSlider( mediaPlayerState.position(), max ); | 178 | updateSlider( mediaPlayerState.position(), max ); |
218 | } | 179 | } |
219 | 180 | ||
220 | 181 | ||
221 | void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) { | 182 | void AudioWidget::setDisplayType( MediaPlayerState::DisplayType mediaType ) { |
222 | if ( mediaType == MediaPlayerState::Audio ) { | 183 | if ( mediaType == MediaPlayerState::Audio ) { |
223 | // startTimer( 150 ); | 184 | // startTimer( 150 ); |
224 | showMaximized(); | 185 | showMaximized(); |
225 | return; | 186 | return; |
226 | } | 187 | } |
227 | 188 | ||
228 | killTimers(); | 189 | killTimers(); |
229 | hide(); | 190 | hide(); |
230 | } | 191 | } |
231 | 192 | ||
193 | void AudioWidget::loadSkin() | ||
194 | { | ||
195 | Config cfg("OpiePlayer"); | ||
196 | cfg.setGroup("Options"); | ||
197 | skin = cfg.readEntry("Skin","default"); | ||
198 | //skin = "scaleTest"; | ||
199 | // color of background, frame, degree of transparency | ||
200 | |||
201 | QString skinPath = "opieplayer2/skins/" + skin; | ||
202 | backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | ||
203 | imgUp = QImage( Resource::loadImage( QString("%1/skin_up").arg(skinPath) ) ); | ||
204 | imgDn = QImage( Resource::loadImage( QString("%1/skin_down").arg(skinPath) ) ); | ||
205 | |||
206 | setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skin_mask_", imgUp.size() ); | ||
207 | |||
208 | setBackgroundPixmap( backgroundPixmap ); | ||
209 | |||
210 | songInfo.setFocusPolicy( QWidget::NoFocus ); | ||
211 | // changeTextColor( &songInfo ); | ||
212 | // songInfo.setBackgroundColor( QColor( 167, 212, 167 )); | ||
213 | // songInfo.setFrameStyle( QFrame::NoFrame); | ||
214 | songInfo.setFrameStyle( QFrame::WinPanel | QFrame::Sunken ); | ||
215 | // songInfo.setForegroundColor(Qt::white); | ||
216 | |||
217 | slider.setFixedHeight( 20 ); | ||
218 | slider.setMinValue( 0 ); | ||
219 | slider.setMaxValue( 1 ); | ||
220 | slider.setFocusPolicy( QWidget::NoFocus ); | ||
221 | slider.setBackgroundPixmap( backgroundPixmap ); | ||
222 | |||
223 | // Config cofg("qpe"); | ||
224 | // cofg.setGroup("Appearance"); | ||
225 | // QColor backgroundcolor = QColor( cofg.readEntry( "Background", "#E5E1D5" ) ); | ||
226 | |||
227 | time.setFocusPolicy( QWidget::NoFocus ); | ||
228 | time.setAlignment( Qt::AlignCenter ); | ||
229 | |||
230 | // time.setFrame(FALSE); | ||
231 | // changeTextColor( &time ); | ||
232 | |||
233 | resizeEvent( 0 ); | ||
234 | } | ||
232 | 235 | ||
233 | void AudioWidget::setSeekable( bool isSeekable ) { | 236 | void AudioWidget::setSeekable( bool isSeekable ) { |
234 | 237 | ||
235 | if ( !isSeekable ) { | 238 | if ( !isSeekable ) { |
236 | qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); | 239 | qDebug("<<<<<<<<<<<<<<file is STREAMING>>>>>>>>>>>>>>>>>>>"); |
237 | if( !slider.isHidden()) { | 240 | if( !slider.isHidden()) { |
238 | slider.hide(); | 241 | slider.hide(); |
239 | } | 242 | } |
240 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 243 | disconnect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
241 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 244 | disconnect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
242 | disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 245 | disconnect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
243 | disconnect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | 246 | disconnect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); |
244 | } else { | 247 | } else { |
245 | // this stops the slider from being moved, thus | 248 | // this stops the slider from being moved, thus |
246 | // does not stop stream when it reaches the end | 249 | // does not stop stream when it reaches the end |
247 | slider.show(); | 250 | slider.show(); |
248 | qDebug( " CONNECT SET POSTION " ); | 251 | qDebug( " CONNECT SET POSTION " ); |
249 | connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); | 252 | connect( &mediaPlayerState, SIGNAL( positionChanged(long) ),this, SLOT( setPosition(long) ) ); |
250 | connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); | 253 | connect( &mediaPlayerState, SIGNAL( positionUpdated(long) ),this, SLOT( setPosition(long) ) ); |
251 | connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); | 254 | connect( &slider, SIGNAL( sliderPressed() ), this, SLOT( sliderPressed() ) ); |
252 | connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); | 255 | connect( &slider, SIGNAL( sliderReleased() ), this, SLOT( sliderReleased() ) ); |
253 | } | 256 | } |
254 | } | 257 | } |
255 | 258 | ||
diff --git a/noncore/multimedia/opieplayer2/audiowidget.h b/noncore/multimedia/opieplayer2/audiowidget.h index 53982a1..61556c6 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.h +++ b/noncore/multimedia/opieplayer2/audiowidget.h | |||
@@ -47,48 +47,50 @@ | |||
47 | 47 | ||
48 | #include "mediawidget.h" | 48 | #include "mediawidget.h" |
49 | 49 | ||
50 | class QPixmap; | 50 | class QPixmap; |
51 | 51 | ||
52 | class AudioWidget : public MediaWidget { | 52 | class AudioWidget : public MediaWidget { |
53 | Q_OBJECT | 53 | Q_OBJECT |
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 | public slots: | 58 | public slots: |
59 | void updateSlider( long, long ); | 59 | void updateSlider( long, long ); |
60 | void sliderPressed( ); | 60 | void sliderPressed( ); |
61 | void sliderReleased( ); | 61 | void sliderReleased( ); |
62 | void setLooping( bool b) { setToggleButton( Loop, b ); } | 62 | void setLooping( bool b) { setToggleButton( Loop, b ); } |
63 | void setPosition( long ); | 63 | void setPosition( long ); |
64 | void setSeekable( bool ); | 64 | void setSeekable( bool ); |
65 | 65 | ||
66 | public: | 66 | public: |
67 | virtual void setLength( long ); | 67 | virtual void setLength( long ); |
68 | virtual void setPlaying( bool b) { setToggleButton( Play, b ); } | 68 | virtual void setPlaying( bool b) { setToggleButton( Play, b ); } |
69 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); | 69 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); |
70 | 70 | ||
71 | virtual void loadSkin(); | ||
72 | |||
71 | signals: | 73 | signals: |
72 | void sliderMoved(long); | 74 | void sliderMoved(long); |
73 | 75 | ||
74 | protected: | 76 | protected: |
75 | void doBlank(); | 77 | void doBlank(); |
76 | void doUnblank(); | 78 | void doUnblank(); |
77 | void resizeEvent( QResizeEvent *re ); | 79 | void resizeEvent( QResizeEvent *re ); |
78 | void timerEvent( QTimerEvent *event ); | 80 | void timerEvent( QTimerEvent *event ); |
79 | void keyReleaseEvent( QKeyEvent *e); | 81 | void keyReleaseEvent( QKeyEvent *e); |
80 | private slots: | 82 | private slots: |
81 | void skipFor(); | 83 | void skipFor(); |
82 | void skipBack(); | 84 | void skipBack(); |
83 | void stopSkip(); | 85 | void stopSkip(); |
84 | private: | 86 | private: |
85 | int skipDirection; | 87 | int skipDirection; |
86 | QString skin; | 88 | QString skin; |
87 | QImage imgUp; | 89 | QImage imgUp; |
88 | QImage imgDn; | 90 | QImage imgDn; |
89 | 91 | ||
90 | OTicker songInfo; | 92 | OTicker songInfo; |
91 | QSlider slider; | 93 | QSlider slider; |
92 | QLineEdit time; | 94 | QLineEdit time; |
93 | bool isStreaming : 1; | 95 | bool isStreaming : 1; |
94 | bool audioSliderBeingMoved : 1; | 96 | bool audioSliderBeingMoved : 1; |
diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp index ffc7cb6..f87cee8 100644 --- a/noncore/multimedia/opieplayer2/main.cpp +++ b/noncore/multimedia/opieplayer2/main.cpp | |||
@@ -1,22 +1,22 @@ | |||
1 | 1 | ||
2 | #include <qpe/qpeapplication.h> | 2 | #include <qpe/qpeapplication.h> |
3 | #include "mediaplayerstate.h" | 3 | #include "mediaplayerstate.h" |
4 | #include "playlistwidget.h" | 4 | #include "playlistwidget.h" |
5 | #include "mediaplayer.h" | 5 | #include "mediaplayer.h" |
6 | 6 | ||
7 | int main(int argc, char **argv) { | 7 | int main(int argc, char **argv) { |
8 | QPEApplication a(argc,argv); | 8 | QPEApplication a(argc,argv); |
9 | 9 | ||
10 | MediaPlayerState st( 0, "mediaPlayerState" ); | 10 | MediaPlayerState st( 0, "mediaPlayerState" ); |
11 | PlayListWidget pl( st, 0, "playList" ); | 11 | PlayListWidget pl( st, 0, "playList" ); |
12 | pl.showMaximized(); | 12 | pl.showMaximized(); |
13 | MediaPlayer mp( pl, st, 0, "mediaPlayer" ); | 13 | MediaPlayer mp( pl, st, 0, "mediaPlayer" ); |
14 | QObject::connect( &pl, SIGNAL( skinSelected() ), | 14 | QObject::connect( &pl, SIGNAL( skinSelected() ), |
15 | &mp, SLOT( recreateAudioAndVideoWidgets() ) ); | 15 | &mp, SLOT( reloadSkins() ) ); |
16 | 16 | ||
17 | a.showMainDocumentWidget(&pl); | 17 | a.showMainDocumentWidget(&pl); |
18 | 18 | ||
19 | return a.exec(); | 19 | return a.exec(); |
20 | } | 20 | } |
21 | 21 | ||
22 | 22 | ||
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index e1bfc2d..8a3d3e0 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -346,24 +346,30 @@ void MediaPlayer::cleanUp() {// this happens on closing | |||
346 | // QPEApplication::ungrabKeyboard(); | 346 | // QPEApplication::ungrabKeyboard(); |
347 | } | 347 | } |
348 | 348 | ||
349 | void MediaPlayer::recreateAudioAndVideoWidgets() | 349 | void MediaPlayer::recreateAudioAndVideoWidgets() |
350 | { | 350 | { |
351 | delete xineControl; | 351 | delete xineControl; |
352 | delete audioUI; | 352 | delete audioUI; |
353 | delete videoUI; | 353 | delete videoUI; |
354 | audioUI = new AudioWidget( playList, mediaPlayerState, 0, "audioUI" ); | 354 | audioUI = new AudioWidget( playList, mediaPlayerState, 0, "audioUI" ); |
355 | videoUI = new VideoWidget( playList, mediaPlayerState, 0, "videoUI" ); | 355 | videoUI = new VideoWidget( playList, mediaPlayerState, 0, "videoUI" ); |
356 | 356 | ||
357 | connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); | 357 | connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); |
358 | connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); | 358 | connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); |
359 | connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); | 359 | connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); |
360 | connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); | 360 | connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); |
361 | 361 | ||
362 | connect( videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); | 362 | connect( videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); |
363 | connect( videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); | 363 | connect( videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); |
364 | connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); | 364 | connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); |
365 | connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); | 365 | connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); |
366 | 366 | ||
367 | xineControl = new XineControl( videoUI, videoUI->vidWidget(), mediaPlayerState ); | 367 | xineControl = new XineControl( videoUI, videoUI->vidWidget(), mediaPlayerState ); |
368 | } | 368 | } |
369 | 369 | ||
370 | void MediaPlayer::reloadSkins() | ||
371 | { | ||
372 | audioUI->loadSkin(); | ||
373 | videoUI->loadSkin(); | ||
374 | } | ||
375 | |||
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h index dc306c4..6b316f6 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.h +++ b/noncore/multimedia/opieplayer2/mediaplayer.h | |||
@@ -34,48 +34,49 @@ | |||
34 | #ifndef MEDIA_PLAYER_H | 34 | #ifndef MEDIA_PLAYER_H |
35 | #define MEDIA_PLAYER_H | 35 | #define MEDIA_PLAYER_H |
36 | 36 | ||
37 | #include <qmainwindow.h> | 37 | #include <qmainwindow.h> |
38 | #include <qframe.h> | 38 | #include <qframe.h> |
39 | 39 | ||
40 | #include "xinecontrol.h" | 40 | #include "xinecontrol.h" |
41 | 41 | ||
42 | #include "playlistwidget.h" | 42 | #include "playlistwidget.h" |
43 | 43 | ||
44 | class DocLnk; | 44 | class DocLnk; |
45 | class VolumeControl; | 45 | class VolumeControl; |
46 | class MediaPlayerState; | 46 | class MediaPlayerState; |
47 | class AudioWidget; | 47 | class AudioWidget; |
48 | class VideoWidget; | 48 | class VideoWidget; |
49 | 49 | ||
50 | class MediaPlayer : public QObject { | 50 | class MediaPlayer : public QObject { |
51 | Q_OBJECT | 51 | Q_OBJECT |
52 | public: | 52 | public: |
53 | MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ); | 53 | MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ); |
54 | ~MediaPlayer(); | 54 | ~MediaPlayer(); |
55 | 55 | ||
56 | public slots: | 56 | public slots: |
57 | void recreateAudioAndVideoWidgets(); | 57 | void recreateAudioAndVideoWidgets(); |
58 | void reloadSkins(); | ||
58 | 59 | ||
59 | private slots: | 60 | private slots: |
60 | void setPlaying( bool ); | 61 | void setPlaying( bool ); |
61 | void pauseCheck( bool ); | 62 | void pauseCheck( bool ); |
62 | void play(); | 63 | void play(); |
63 | void next(); | 64 | void next(); |
64 | void prev(); | 65 | void prev(); |
65 | void startIncreasingVolume(); | 66 | void startIncreasingVolume(); |
66 | void startDecreasingVolume(); | 67 | void startDecreasingVolume(); |
67 | void stopChangingVolume(); | 68 | void stopChangingVolume(); |
68 | void cleanUp(); | 69 | void cleanUp(); |
69 | void blank( bool ); | 70 | void blank( bool ); |
70 | 71 | ||
71 | protected: | 72 | protected: |
72 | void timerEvent( QTimerEvent *e ); | 73 | void timerEvent( QTimerEvent *e ); |
73 | void keyReleaseEvent( QKeyEvent *e); | 74 | void keyReleaseEvent( QKeyEvent *e); |
74 | private: | 75 | private: |
75 | 76 | ||
76 | bool isBlanked, l, r; | 77 | bool isBlanked, l, r; |
77 | int fd, fl; | 78 | int fd, fl; |
78 | int volumeDirection; | 79 | int volumeDirection; |
79 | XineControl *xineControl; | 80 | XineControl *xineControl; |
80 | VolumeControl *volControl; | 81 | VolumeControl *volControl; |
81 | MediaPlayerState &mediaPlayerState; | 82 | MediaPlayerState &mediaPlayerState; |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.cpp b/noncore/multimedia/opieplayer2/mediawidget.cpp index db16b44..d60dc0d 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.cpp +++ b/noncore/multimedia/opieplayer2/mediawidget.cpp | |||
@@ -24,48 +24,51 @@ | |||
24 | #include "mediawidget.h" | 24 | #include "mediawidget.h" |
25 | #include "playlistwidget.h" | 25 | #include "playlistwidget.h" |
26 | 26 | ||
27 | MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name ) | 27 | MediaWidget::MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name ) |
28 | : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) | 28 | : QWidget( parent, name ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) |
29 | { | 29 | { |
30 | connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ), | 30 | connect( &mediaPlayerState, SIGNAL( displayTypeChanged( MediaPlayerState::DisplayType ) ), |
31 | this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) ); | 31 | this, SLOT( setDisplayType( MediaPlayerState::DisplayType ) ) ); |
32 | connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ), | 32 | connect( &mediaPlayerState, SIGNAL( lengthChanged( long ) ), |
33 | this, SLOT( setLength( long ) ) ); | 33 | this, SLOT( setLength( long ) ) ); |
34 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), | 34 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), |
35 | this, SLOT( setPlaying( bool ) ) ); | 35 | this, SLOT( setPlaying( bool ) ) ); |
36 | } | 36 | } |
37 | 37 | ||
38 | MediaWidget::~MediaWidget() | 38 | MediaWidget::~MediaWidget() |
39 | { | 39 | { |
40 | } | 40 | } |
41 | 41 | ||
42 | void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount, | 42 | void MediaWidget::setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount, |
43 | const QString &imagePrefix, const QSize &buttonAreaSize ) | 43 | const QString &imagePrefix, const QSize &buttonAreaSize ) |
44 | { | 44 | { |
45 | buttonMask = QImage( buttonAreaSize, 8, 255 ); | 45 | buttonMask = QImage( buttonAreaSize, 8, 255 ); |
46 | buttonMask.fill( 0 ); | 46 | buttonMask.fill( 0 ); |
47 | 47 | ||
48 | buttons.clear(); | ||
49 | buttons.reserve( buttonCount ); | ||
50 | |||
48 | for ( uint i = 0; i < buttonCount; ++i ) { | 51 | for ( uint i = 0; i < buttonCount; ++i ) { |
49 | Button button = setupButton( skinInfo[ i ], imagePrefix ); | 52 | Button button = setupButton( skinInfo[ i ], imagePrefix ); |
50 | buttons.push_back( button ); | 53 | buttons.push_back( button ); |
51 | } | 54 | } |
52 | } | 55 | } |
53 | 56 | ||
54 | MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, const QString &imagePrefix ) | 57 | MediaWidget::Button MediaWidget::setupButton( const SkinButtonInfo &buttonInfo, const QString &imagePrefix ) |
55 | { | 58 | { |
56 | Button button; | 59 | Button button; |
57 | button.command = buttonInfo.command; | 60 | button.command = buttonInfo.command; |
58 | button.type = buttonInfo.type; | 61 | button.type = buttonInfo.type; |
59 | 62 | ||
60 | QString fileName = imagePrefix + buttonInfo.fileName + ".png"; | 63 | QString fileName = imagePrefix + buttonInfo.fileName + ".png"; |
61 | 64 | ||
62 | button.mask = setupButtonMask( button.command, fileName ); | 65 | button.mask = setupButtonMask( button.command, fileName ); |
63 | 66 | ||
64 | return button; | 67 | return button; |
65 | } | 68 | } |
66 | 69 | ||
67 | QBitmap MediaWidget::setupButtonMask( const Command &command, const QString &fileName ) | 70 | QBitmap MediaWidget::setupButtonMask( const Command &command, const QString &fileName ) |
68 | { | 71 | { |
69 | QBitmap mask( fileName ); | 72 | QBitmap mask( fileName ); |
70 | if ( mask.isNull() ) | 73 | if ( mask.isNull() ) |
71 | return mask; | 74 | return mask; |
diff --git a/noncore/multimedia/opieplayer2/mediawidget.h b/noncore/multimedia/opieplayer2/mediawidget.h index 148948a..8c781e9 100644 --- a/noncore/multimedia/opieplayer2/mediawidget.h +++ b/noncore/multimedia/opieplayer2/mediawidget.h | |||
@@ -51,48 +51,50 @@ public: | |||
51 | QBitmap mask; | 51 | QBitmap mask; |
52 | QPixmap pixUp; | 52 | QPixmap pixUp; |
53 | QPixmap pixDown; | 53 | QPixmap pixDown; |
54 | }; | 54 | }; |
55 | typedef std::vector<Button> ButtonVector; | 55 | typedef std::vector<Button> ButtonVector; |
56 | 56 | ||
57 | struct SkinButtonInfo | 57 | struct SkinButtonInfo |
58 | { | 58 | { |
59 | Command command; | 59 | Command command; |
60 | const char *fileName; | 60 | const char *fileName; |
61 | ButtonType type; | 61 | ButtonType type; |
62 | }; | 62 | }; |
63 | 63 | ||
64 | typedef std::vector<QBitmap> MaskVector; | 64 | typedef std::vector<QBitmap> MaskVector; |
65 | typedef std::vector<QPixmap> PixmapVector; | 65 | typedef std::vector<QPixmap> PixmapVector; |
66 | 66 | ||
67 | MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); | 67 | MediaWidget( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QWidget *parent = 0, const char *name = 0 ); |
68 | virtual ~MediaWidget(); | 68 | virtual ~MediaWidget(); |
69 | 69 | ||
70 | public slots: | 70 | public slots: |
71 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0; | 71 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ) = 0; |
72 | virtual void setLength( long length ) = 0; | 72 | virtual void setLength( long length ) = 0; |
73 | virtual void setPlaying( bool playing ) = 0; | 73 | virtual void setPlaying( bool playing ) = 0; |
74 | 74 | ||
75 | virtual void loadSkin() = 0; | ||
76 | |||
75 | signals: | 77 | signals: |
76 | void moreReleased(); | 78 | void moreReleased(); |
77 | void lessReleased(); | 79 | void lessReleased(); |
78 | void forwardReleased(); | 80 | void forwardReleased(); |
79 | void backReleased(); | 81 | void backReleased(); |
80 | void forwardClicked(); | 82 | void forwardClicked(); |
81 | void backClicked(); | 83 | void backClicked(); |
82 | void moreClicked(); | 84 | void moreClicked(); |
83 | void lessClicked(); | 85 | void lessClicked(); |
84 | 86 | ||
85 | protected: | 87 | protected: |
86 | void setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount, | 88 | void setupButtons( const SkinButtonInfo *skinInfo, uint buttonCount, |
87 | const QString &imagePrefix, const QSize &buttonAreaSize ); | 89 | const QString &imagePrefix, const QSize &buttonAreaSize ); |
88 | Button setupButton( const SkinButtonInfo &buttonInfo, const QString &imagePrefix ); | 90 | Button setupButton( const SkinButtonInfo &buttonInfo, const QString &imagePrefix ); |
89 | QBitmap setupButtonMask( const Command &command, const QString &fileName ); | 91 | QBitmap setupButtonMask( const Command &command, const QString &fileName ); |
90 | 92 | ||
91 | virtual void closeEvent( QCloseEvent * ); | 93 | virtual void closeEvent( QCloseEvent * ); |
92 | 94 | ||
93 | virtual void paintEvent( QPaintEvent *pe ); | 95 | virtual void paintEvent( QPaintEvent *pe ); |
94 | 96 | ||
95 | Button *buttonAt( const QPoint &position ); | 97 | Button *buttonAt( const QPoint &position ); |
96 | 98 | ||
97 | virtual void mousePressEvent( QMouseEvent *event ); | 99 | virtual void mousePressEvent( QMouseEvent *event ); |
98 | virtual void mouseReleaseEvent( QMouseEvent *event ); | 100 | virtual void mouseReleaseEvent( QMouseEvent *event ); |
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index d1efaad..a03d43e 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -58,74 +58,56 @@ namespace | |||
58 | 58 | ||
59 | const int xo = 2; // movable x offset | 59 | const int xo = 2; // movable x offset |
60 | const int yo = 0; // movable y offset | 60 | const int yo = 0; // movable y offset |
61 | 61 | ||
62 | const MediaWidget::SkinButtonInfo skinInfo[] = | 62 | const MediaWidget::SkinButtonInfo skinInfo[] = |
63 | { | 63 | { |
64 | { MediaWidget::Play, "play", MediaWidget::ToggleButton }, | 64 | { MediaWidget::Play, "play", MediaWidget::ToggleButton }, |
65 | { MediaWidget::Stop, "stop", MediaWidget::NormalButton }, | 65 | { MediaWidget::Stop, "stop", MediaWidget::NormalButton }, |
66 | { MediaWidget::Next, "fwd", MediaWidget::NormalButton }, | 66 | { MediaWidget::Next, "fwd", MediaWidget::NormalButton }, |
67 | { MediaWidget::Previous, "back", MediaWidget::NormalButton }, | 67 | { MediaWidget::Previous, "back", MediaWidget::NormalButton }, |
68 | { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton }, | 68 | { MediaWidget::VolumeUp, "up", MediaWidget::NormalButton }, |
69 | { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton }, | 69 | { MediaWidget::VolumeDown, "down", MediaWidget::NormalButton }, |
70 | { MediaWidget::FullScreen, "full", MediaWidget::ToggleButton } | 70 | { MediaWidget::FullScreen, "full", MediaWidget::ToggleButton } |
71 | }; | 71 | }; |
72 | 72 | ||
73 | const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] ); | 73 | const uint buttonCount = sizeof( skinInfo ) / sizeof( skinInfo[ 0 ] ); |
74 | 74 | ||
75 | } | 75 | } |
76 | 76 | ||
77 | VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) | 77 | VideoWidget::VideoWidget( PlayListWidget &playList, MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) |
78 | : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ), videoSliderBeingMoved( false ) | 78 | : MediaWidget( playList, mediaPlayerState, parent, name ), scaledWidth( 0 ), scaledHeight( 0 ), videoSliderBeingMoved( false ) |
79 | { | 79 | { |
80 | setCaption( tr("OpiePlayer - Video") ); | 80 | setCaption( tr("OpiePlayer - Video") ); |
81 | 81 | ||
82 | |||
83 | videoFrame = new XineVideoWidget ( this, "Video frame" ); | 82 | videoFrame = new XineVideoWidget ( this, "Video frame" ); |
84 | 83 | ||
85 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); | 84 | connect ( videoFrame, SIGNAL( videoResized ( const QSize & )), this, SIGNAL( videoResized ( const QSize & ))); |
86 | connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); | 85 | connect ( videoFrame, SIGNAL( clicked () ), this, SLOT ( backToNormal() ) ); |
87 | 86 | ||
88 | Config cfg("OpiePlayer"); | 87 | slider = 0; |
89 | cfg.setGroup("Options"); | ||
90 | skin = cfg.readEntry("Skin","default"); | ||
91 | 88 | ||
92 | QString skinPath = "opieplayer2/skins/" + skin; | 89 | loadSkin(); |
93 | backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | ||
94 | imgUp = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); | ||
95 | imgDn = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); | ||
96 | |||
97 | setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_", imgUp.size() ); | ||
98 | |||
99 | setBackgroundPixmap( backgroundPixmap ); | ||
100 | |||
101 | slider = new QSlider( Qt::Horizontal, this ); | ||
102 | slider->setMinValue( 0 ); | ||
103 | slider->setMaxValue( 1 ); | ||
104 | slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); | ||
105 | //slider->setFocusPolicy( QWidget::NoFocus ); | ||
106 | |||
107 | resizeEvent( NULL ); | ||
108 | 90 | ||
109 | setLength( mediaPlayerState.length() ); | 91 | setLength( mediaPlayerState.length() ); |
110 | setPosition( mediaPlayerState.position() ); | 92 | setPosition( mediaPlayerState.position() ); |
111 | setFullscreen( mediaPlayerState.isFullscreen() ); | 93 | setFullscreen( mediaPlayerState.isFullscreen() ); |
112 | setPlaying( mediaPlayerState.isPlaying() ); | 94 | setPlaying( mediaPlayerState.isPlaying() ); |
113 | } | 95 | } |
114 | 96 | ||
115 | 97 | ||
116 | VideoWidget::~VideoWidget() | 98 | VideoWidget::~VideoWidget() |
117 | { | 99 | { |
118 | } | 100 | } |
119 | 101 | ||
120 | QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { | 102 | QPixmap *combineVImageWithBackground( QImage img, QPixmap bg, QPoint offset ) { |
121 | QPixmap pix( img.width(), img.height() ); | 103 | QPixmap pix( img.width(), img.height() ); |
122 | QPainter p( &pix ); | 104 | QPainter p( &pix ); |
123 | p.drawTiledPixmap( pix.rect(), bg, offset ); | 105 | p.drawTiledPixmap( pix.rect(), bg, offset ); |
124 | p.drawImage( 0, 0, img ); | 106 | p.drawImage( 0, 0, img ); |
125 | return new QPixmap( pix ); | 107 | return new QPixmap( pix ); |
126 | } | 108 | } |
127 | 109 | ||
128 | QPixmap maskVPixToMask( QPixmap pix, QBitmap mask ) { | 110 | QPixmap maskVPixToMask( QPixmap pix, QBitmap mask ) { |
129 | QPixmap pixmap( pix ); | 111 | QPixmap pixmap( pix ); |
130 | pixmap.setMask( mask ); | 112 | pixmap.setMask( mask ); |
131 | return pixmap; | 113 | return pixmap; |
@@ -180,48 +162,73 @@ void VideoWidget::sliderReleased() { | |||
180 | } | 162 | } |
181 | 163 | ||
182 | void VideoWidget::setPosition( long i ) { | 164 | void VideoWidget::setPosition( long i ) { |
183 | updateSlider( i, mediaPlayerState.length() ); | 165 | updateSlider( i, mediaPlayerState.length() ); |
184 | } | 166 | } |
185 | 167 | ||
186 | 168 | ||
187 | void VideoWidget::setLength( long max ) { | 169 | void VideoWidget::setLength( long max ) { |
188 | updateSlider( mediaPlayerState.position(), max ); | 170 | updateSlider( mediaPlayerState.position(), max ); |
189 | } | 171 | } |
190 | 172 | ||
191 | void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType ) | 173 | void VideoWidget::setDisplayType( MediaPlayerState::DisplayType displayType ) |
192 | { | 174 | { |
193 | if ( displayType == MediaPlayerState::Video ) { | 175 | if ( displayType == MediaPlayerState::Video ) { |
194 | makeVisible(); | 176 | makeVisible(); |
195 | return; | 177 | return; |
196 | } | 178 | } |
197 | 179 | ||
198 | // Effectively blank the view next time we show it so it looks nicer | 180 | // Effectively blank the view next time we show it so it looks nicer |
199 | scaledWidth = 0; | 181 | scaledWidth = 0; |
200 | scaledHeight = 0; | 182 | scaledHeight = 0; |
201 | hide(); | 183 | hide(); |
202 | } | 184 | } |
203 | 185 | ||
186 | void VideoWidget::loadSkin() | ||
187 | { | ||
188 | Config cfg("OpiePlayer"); | ||
189 | cfg.setGroup("Options"); | ||
190 | skin = cfg.readEntry("Skin","default"); | ||
191 | |||
192 | QString skinPath = "opieplayer2/skins/" + skin; | ||
193 | backgroundPixmap = QPixmap( Resource::loadPixmap( QString("%1/background").arg(skinPath) ) ); | ||
194 | imgUp = QImage( Resource::loadImage( QString("%1/skinV_up").arg(skinPath) ) ); | ||
195 | imgDn = QImage( Resource::loadImage( QString("%1/skinV_down").arg(skinPath) ) ); | ||
196 | |||
197 | setupButtons( skinInfo, buttonCount, QPEApplication::qpeDir() + "/pics/" + skinPath + "/skinV_mask_", imgUp.size() ); | ||
198 | |||
199 | setBackgroundPixmap( backgroundPixmap ); | ||
200 | |||
201 | delete slider; | ||
202 | slider = new QSlider( Qt::Horizontal, this ); | ||
203 | slider->setMinValue( 0 ); | ||
204 | slider->setMaxValue( 1 ); | ||
205 | slider->setBackgroundPixmap( Resource::loadPixmap( backgroundPix ) ); | ||
206 | //slider->setFocusPolicy( QWidget::NoFocus ); | ||
207 | |||
208 | resizeEvent( 0 ); | ||
209 | } | ||
210 | |||
204 | void VideoWidget::updateSlider( long i, long max ) { | 211 | void VideoWidget::updateSlider( long i, long max ) { |
205 | // Will flicker too much if we don't do this | 212 | // Will flicker too much if we don't do this |
206 | if ( max == 0 ) { | 213 | if ( max == 0 ) { |
207 | return; | 214 | return; |
208 | } | 215 | } |
209 | int width = slider->width(); | 216 | int width = slider->width(); |
210 | int val = int((double)i * width / max); | 217 | int val = int((double)i * width / max); |
211 | if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) { | 218 | if ( !mediaPlayerState.isFullscreen() && !videoSliderBeingMoved ) { |
212 | if ( slider->value() != val ) { | 219 | if ( slider->value() != val ) { |
213 | slider->setValue( val ); | 220 | slider->setValue( val ); |
214 | } | 221 | } |
215 | if ( slider->maxValue() != width ) { | 222 | if ( slider->maxValue() != width ) { |
216 | slider->setMaxValue( width ); | 223 | slider->setMaxValue( width ); |
217 | } | 224 | } |
218 | } | 225 | } |
219 | } | 226 | } |
220 | 227 | ||
221 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { | 228 | void VideoWidget::mouseReleaseEvent( QMouseEvent *event ) { |
222 | if ( mediaPlayerState.isFullscreen() ) { | 229 | if ( mediaPlayerState.isFullscreen() ) { |
223 | mediaPlayerState.setFullscreen( FALSE ); | 230 | mediaPlayerState.setFullscreen( FALSE ); |
224 | makeVisible(); | 231 | makeVisible(); |
225 | } | 232 | } |
226 | MediaWidget::mouseReleaseEvent( event ); | 233 | MediaWidget::mouseReleaseEvent( event ); |
227 | } | 234 | } |
diff --git a/noncore/multimedia/opieplayer2/videowidget.h b/noncore/multimedia/opieplayer2/videowidget.h index 21a4e9e..87be371 100644 --- a/noncore/multimedia/opieplayer2/videowidget.h +++ b/noncore/multimedia/opieplayer2/videowidget.h | |||
@@ -45,48 +45,50 @@ class QPixmap; | |||
45 | class QSlider; | 45 | class QSlider; |
46 | 46 | ||
47 | class VideoWidget : public MediaWidget { | 47 | class VideoWidget : public MediaWidget { |
48 | Q_OBJECT | 48 | Q_OBJECT |
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 | 53 | ||
54 | XineVideoWidget* vidWidget(); | 54 | XineVideoWidget* vidWidget(); |
55 | public slots: | 55 | public slots: |
56 | void updateSlider( long, long ); | 56 | void updateSlider( long, long ); |
57 | void sliderPressed( ); | 57 | void sliderPressed( ); |
58 | void sliderReleased( ); | 58 | void sliderReleased( ); |
59 | void setFullscreen( bool b ); | 59 | void setFullscreen( bool b ); |
60 | virtual void makeVisible(); | 60 | virtual void makeVisible(); |
61 | void backToNormal(); | 61 | void backToNormal(); |
62 | void setPosition( long ); | 62 | void setPosition( long ); |
63 | 63 | ||
64 | public: | 64 | public: |
65 | virtual void setPlaying( bool b); | 65 | virtual void setPlaying( bool b); |
66 | virtual void setLength( long ); | 66 | virtual void setLength( long ); |
67 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); | 67 | virtual void setDisplayType( MediaPlayerState::DisplayType displayType ); |
68 | 68 | ||
69 | virtual void loadSkin(); | ||
70 | |||
69 | signals: | 71 | signals: |
70 | void moreClicked(); | 72 | void moreClicked(); |
71 | void lessClicked(); | 73 | void lessClicked(); |
72 | void sliderMoved( long ); | 74 | void sliderMoved( long ); |
73 | void videoResized ( const QSize &s ); | 75 | void videoResized ( const QSize &s ); |
74 | 76 | ||
75 | protected: | 77 | protected: |
76 | 78 | ||
77 | void resizeEvent( QResizeEvent * ); | 79 | void resizeEvent( QResizeEvent * ); |
78 | void mouseReleaseEvent( QMouseEvent *event ); | 80 | void mouseReleaseEvent( QMouseEvent *event ); |
79 | void keyReleaseEvent( QKeyEvent *e); | 81 | void keyReleaseEvent( QKeyEvent *e); |
80 | 82 | ||
81 | private: | 83 | private: |
82 | // Ticker songInfo; | 84 | // Ticker songInfo; |
83 | QImage imgUp; | 85 | QImage imgUp; |
84 | QImage imgDn; | 86 | QImage imgDn; |
85 | QString skin; | 87 | QString skin; |
86 | 88 | ||
87 | 89 | ||
88 | 90 | ||
89 | QString backgroundPix; | 91 | QString backgroundPix; |
90 | QSlider *slider; | 92 | QSlider *slider; |
91 | QImage *currentFrame; | 93 | QImage *currentFrame; |
92 | int scaledWidth; | 94 | int scaledWidth; |