summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-11 14:25:49 (UTC)
committer simon <simon>2002-12-11 14:25:49 (UTC)
commit7a17954c26add31f28b69989f54e0f28a17c8949 (patch) (unidiff)
tree8603026771be07c996f49a29375fda64c8cd0e67
parent16138f0cdf46994d20ade71b5621b82fb9386933 (diff)
downloadopie-7a17954c26add31f28b69989f54e0f28a17c8949.zip
opie-7a17954c26add31f28b69989f54e0f28a17c8949.tar.gz
opie-7a17954c26add31f28b69989f54e0f28a17c8949.tar.bz2
- roll back the threaded xine initialization, the mediaplayer initialization
state and the PlayButton change set - instead load the audio-/video widget and the xine control on-demand. much faster and much simpler for startup
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp92
-rw-r--r--noncore/multimedia/opieplayer2/lib.h22
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp120
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.h14
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.cpp13
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayerstate.h6
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.cpp22
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.h18
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp10
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.h6
11 files changed, 84 insertions, 241 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 20fd1e2..1e0dc21 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -72,8 +72,6 @@ using namespace XINE;
72 72
73Lib::Lib( XineVideoWidget* widget ) 73Lib::Lib( XineVideoWidget* widget )
74{ 74{
75 ThreadUtil::AutoLock lock( m_initGuard );
76 m_initialized = false;
77 m_video = false; 75 m_video = false;
78 m_wid = widget; 76 m_wid = widget;
79 printf("Lib"); 77 printf("Lib");
@@ -89,19 +87,8 @@ Lib::Lib( XineVideoWidget* widget )
89 f.close(); 87 f.close();
90 } 88 }
91 89
92 start();
93}
94
95void Lib::run()
96{
97 initialize();
98}
99
100void Lib::initialize()
101{
102 m_xine = xine_new( ); 90 m_xine = xine_new( );
103 91
104 QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf";
105 xine_config_load( m_xine, QFile::encodeName( configPath ) ); 92 xine_config_load( m_xine, QFile::encodeName( configPath ) );
106 93
107 xine_init( m_xine ); 94 xine_init( m_xine );
@@ -130,18 +117,9 @@ void Lib::initialize()
130 m_queue = xine_event_new_queue (m_stream); 117 m_queue = xine_event_new_queue (m_stream);
131 118
132 xine_event_create_listener_thread (m_queue, xine_event_handler, this); 119 xine_event_create_listener_thread (m_queue, xine_event_handler, this);
133
134 ThreadUtil::AutoLock lock( m_initGuard );
135 m_initialized = true;
136
137 send( new ThreadUtil::ChannelMessage( InitializationMessageType ), OneWay );
138} 120}
139 121
140Lib::~Lib() { 122Lib::~Lib() {
141 ThreadUtil::AutoLock lock( m_initGuard );
142
143 assert( m_initialized );
144
145// free( m_config ); 123// free( m_config );
146 124
147 xine_close( m_stream ); 125 xine_close( m_stream );
@@ -156,17 +134,6 @@ Lib::~Lib() {
156 //delete m_audioOutput; 134 //delete m_audioOutput;
157} 135}
158 136
159void Lib::assertInitialized() const
160{
161 ThreadUtil::AutoLock lock( m_initGuard );
162
163 if ( m_initialized )
164 return;
165
166 qDebug( "LibXine: xine function called while not being initialized, yet! Fix the caller!" );
167 assert( m_initialized );
168}
169
170void Lib::resize ( const QSize &s ) { 137void Lib::resize ( const QSize &s ) {
171 if ( s. width ( ) && s. height ( ) ) { 138 if ( s. width ( ) && s. height ( ) ) {
172 ::null_set_gui_width( m_videoOutput, s. width() ); 139 ::null_set_gui_width( m_videoOutput, s. width() );
@@ -193,8 +160,6 @@ int Lib::subVersion() {
193} 160}
194 161
195int Lib::play( const QString& fileName, int startPos, int start_time ) { 162int Lib::play( const QString& fileName, int startPos, int start_time ) {
196 assertInitialized();
197
198 QString str = fileName.stripWhiteSpace(); 163 QString str = fileName.stripWhiteSpace();
199 if ( !xine_open( m_stream, QFile::encodeName(str.utf8() ).data() ) ) { 164 if ( !xine_open( m_stream, QFile::encodeName(str.utf8() ).data() ) ) {
200 return 0; 165 return 0;
@@ -203,69 +168,49 @@ int Lib::play( const QString& fileName, int startPos, int start_time ) {
203} 168}
204 169
205void Lib::stop() { 170void Lib::stop() {
206 assertInitialized();
207
208 qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>"); 171 qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>");
209 xine_stop( m_stream ); 172 xine_stop( m_stream );
210} 173}
211 174
212void Lib::pause( bool toggle ) { 175void Lib::pause( bool toggle ) {
213 assertInitialized();
214
215 xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL ); 176 xine_set_param( m_stream, XINE_PARAM_SPEED, toggle ? XINE_SPEED_PAUSE : XINE_SPEED_NORMAL );
216} 177}
217 178
218int Lib::speed() const { 179int Lib::speed() const {
219 assertInitialized();
220
221 return xine_get_param ( m_stream, XINE_PARAM_SPEED ); 180 return xine_get_param ( m_stream, XINE_PARAM_SPEED );
222} 181}
223 182
224void Lib::setSpeed( int speed ) { 183void Lib::setSpeed( int speed ) {
225 assertInitialized();
226
227 xine_set_param ( m_stream, XINE_PARAM_SPEED, speed ); 184 xine_set_param ( m_stream, XINE_PARAM_SPEED, speed );
228} 185}
229 186
230int Lib::status() const { 187int Lib::status() const {
231 assertInitialized();
232
233 return xine_get_status( m_stream ); 188 return xine_get_status( m_stream );
234} 189}
235 190
236int Lib::currentPosition() const { 191int Lib::currentPosition() const {
237 assertInitialized();
238
239 int pos, time, length; 192 int pos, time, length;
240 xine_get_pos_length( m_stream, &pos, &time, &length ); 193 xine_get_pos_length( m_stream, &pos, &time, &length );
241 return pos; 194 return pos;
242} 195}
243 196
244int Lib::currentTime() const { 197int Lib::currentTime() const {
245 assertInitialized();
246
247 int pos, time, length; 198 int pos, time, length;
248 xine_get_pos_length( m_stream, &pos, &time, &length ); 199 xine_get_pos_length( m_stream, &pos, &time, &length );
249 return time/1000; 200 return time/1000;
250} 201}
251 202
252int Lib::length() const { 203int Lib::length() const {
253 assertInitialized();
254
255 int pos, time, length; 204 int pos, time, length;
256 xine_get_pos_length( m_stream, &pos, &time, &length ); 205 xine_get_pos_length( m_stream, &pos, &time, &length );
257 return length/1000; 206 return length/1000;
258} 207}
259 208
260bool Lib::isSeekable() const { 209bool Lib::isSeekable() const {
261 assertInitialized();
262
263 return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE ); 210 return xine_get_stream_info( m_stream, XINE_STREAM_INFO_SEEKABLE );
264} 211}
265 212
266void Lib::seekTo( int time ) { 213void Lib::seekTo( int time ) {
267 assertInitialized();
268
269 //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_( 214 //xine_trick_mode ( m_stream, XINE_TRICK_MODE_SEEK_TO_TIME, time ); NOT IMPLEMENTED YET IN XINE :_(
270 // since its now milliseconds we need *1000 215 // since its now milliseconds we need *1000
271 xine_play( m_stream, 0, time*1000 ); 216 xine_play( m_stream, 0, time*1000 );
@@ -273,45 +218,30 @@ void Lib::seekTo( int time ) {
273 218
274 219
275Frame Lib::currentFrame() const { 220Frame Lib::currentFrame() const {
276 assertInitialized();
277
278 Frame frame; 221 Frame frame;
279 return frame; 222 return frame;
280}; 223};
281 224
282QString Lib::metaInfo( int number) const { 225QString Lib::metaInfo( int number) const {
283 assertInitialized();
284
285 return xine_get_meta_info( m_stream, number ); 226 return xine_get_meta_info( m_stream, number );
286} 227}
287 228
288int Lib::error() const { 229int Lib::error() const {
289 assertInitialized();
290
291 return xine_get_error( m_stream ); 230 return xine_get_error( m_stream );
292}; 231};
293 232
294void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ) 233void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType )
295{ 234{
296 assert( sendType == ThreadUtil::Channel::OneWay ); 235 assert( sendType == ThreadUtil::Channel::OneWay );
297 switch ( msg->type() ) { 236 handleXineEvent( msg->type() );
298 case XineMessageType:
299 handleXineEvent( static_cast<XineMessage *>( msg )->xineEvent );
300 break;
301 case InitializationMessageType:
302 emit initialized();
303 break;
304 }
305 delete msg; 237 delete msg;
306} 238}
307 239
308void Lib::handleXineEvent( const xine_event_t* t ) { 240void Lib::handleXineEvent( const xine_event_t* t ) {
309 send( new XineMessage( t->type ), OneWay ); 241 send( new ThreadUtil::ChannelMessage( t->type ), OneWay );
310} 242}
311 243
312void Lib::handleXineEvent( int type ) { 244void Lib::handleXineEvent( int type ) {
313 assertInitialized();
314
315 if ( type == XINE_EVENT_UI_PLAYBACK_FINISHED ) { 245 if ( type == XINE_EVENT_UI_PLAYBACK_FINISHED ) {
316 emit stopped(); 246 emit stopped();
317 } 247 }
@@ -319,53 +249,37 @@ void Lib::handleXineEvent( int type ) {
319 249
320 250
321void Lib::setShowVideo( bool video ) { 251void Lib::setShowVideo( bool video ) {
322 assertInitialized();
323
324 m_video = video; 252 m_video = video;
325 ::null_set_show_video( m_videoOutput, video ); 253 ::null_set_show_video( m_videoOutput, video );
326} 254}
327 255
328bool Lib::isShowingVideo() const { 256bool Lib::isShowingVideo() const {
329 assertInitialized();
330
331 return ::null_is_showing_video( m_videoOutput ); 257 return ::null_is_showing_video( m_videoOutput );
332} 258}
333 259
334bool Lib::hasVideo() const { 260bool Lib::hasVideo() const {
335 assertInitialized();
336
337 return xine_get_stream_info( m_stream, 18 ); 261 return xine_get_stream_info( m_stream, 18 );
338} 262}
339 263
340void Lib::showVideoFullScreen( bool fullScreen ) { 264void Lib::showVideoFullScreen( bool fullScreen ) {
341 assertInitialized();
342
343 ::null_set_fullscreen( m_videoOutput, fullScreen ); 265 ::null_set_fullscreen( m_videoOutput, fullScreen );
344} 266}
345 267
346bool Lib::isVideoFullScreen() const { 268bool Lib::isVideoFullScreen() const {
347 assertInitialized();
348
349 return ::null_is_fullscreen( m_videoOutput ); 269 return ::null_is_fullscreen( m_videoOutput );
350} 270}
351 271
352void Lib::setScaling( bool scale ) { 272void Lib::setScaling( bool scale ) {
353 assertInitialized();
354
355 ::null_set_scaling( m_videoOutput, scale ); 273 ::null_set_scaling( m_videoOutput, scale );
356} 274}
357 275
358void Lib::setGamma( int value ) { 276void Lib::setGamma( int value ) {
359 assertInitialized();
360
361 //qDebug( QString( "%1").arg(value) ); 277 //qDebug( QString( "%1").arg(value) );
362 /* int gammaValue = ( 100 + value ); */ 278 /* int gammaValue = ( 100 + value ); */
363 ::null_set_videoGamma( m_videoOutput, value ); 279 ::null_set_videoGamma( m_videoOutput, value );
364} 280}
365 281
366bool Lib::isScaling() const { 282bool Lib::isScaling() const {
367 assertInitialized();
368
369 return ::null_is_scaling( m_videoOutput ); 283 return ::null_is_scaling( m_videoOutput );
370} 284}
371 285
@@ -379,8 +293,6 @@ void Lib::xine_display_frame( void* user_data, uint8_t *frame,
379} 293}
380 294
381void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { 295void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) {
382 assertInitialized();
383
384 if ( !m_video ) { 296 if ( !m_video ) {
385 qWarning("not showing video now"); 297 qWarning("not showing video now");
386 return; 298 return;
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 34b85b9..aba2ec9 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -55,7 +55,7 @@ namespace XINE {
55 * stooping, seeking. 55 * stooping, seeking.
56 */ 56 */
57 class Frame; 57 class Frame;
58 class Lib : public ThreadUtil::Channel, private ThreadUtil::Thread 58 class Lib : public ThreadUtil::Channel
59 { 59 {
60 Q_OBJECT 60 Q_OBJECT
61 public: 61 public:
@@ -183,27 +183,7 @@ namespace XINE {
183 protected: 183 protected:
184 virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ); 184 virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType );
185 185
186 virtual void run();
187
188 private: 186 private:
189 void initialize();
190
191 void assertInitialized() const;
192
193 enum { XineMessageType = 1, InitializationMessageType };
194
195 struct XineMessage : public ThreadUtil::ChannelMessage
196 {
197 XineMessage( int _xineEvent ) : ThreadUtil::ChannelMessage( XineMessageType ),
198 xineEvent( _xineEvent )
199 {}
200
201 int xineEvent;
202 };
203
204 mutable ThreadUtil::Mutex m_initGuard;
205 bool m_initialized : 1;
206
207 int m_bytes_per_pixel; 187 int m_bytes_per_pixel;
208 bool m_video:1; 188 bool m_video:1;
209 XineVideoWidget *m_wid; 189 XineVideoWidget *m_wid;
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index c230d6f..bbc60dd 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -31,10 +31,9 @@
31MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ) 31MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name )
32 : QObject( parent, name ), volumeDirection( 0 ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) { 32 : QObject( parent, name ), volumeDirection( 0 ), mediaPlayerState( _mediaPlayerState ), playList( _playList ) {
33 33
34 audioUI = 0; 34 m_audioUI = 0;
35 videoUI = 0; 35 m_videoUI = 0;
36 xineControl = 0; 36 m_xineControl = 0;
37 recreateAudioAndVideoWidgets();
38 37
39 fd=-1;fl=-1; 38 fd=-1;fl=-1;
40 playList.setCaption( tr( "OpiePlayer: Initializating" ) ); 39 playList.setCaption( tr( "OpiePlayer: Initializating" ) );
@@ -60,9 +59,9 @@ MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPla
60} 59}
61 60
62MediaPlayer::~MediaPlayer() { 61MediaPlayer::~MediaPlayer() {
63 delete xineControl; 62 delete m_xineControl;
64 delete audioUI; 63 delete m_audioUI;
65 delete videoUI; 64 delete m_videoUI;
66 delete volControl; 65 delete volControl;
67} 66}
68 67
@@ -103,26 +102,26 @@ void MediaPlayer::setPlaying( bool play ) {
103 102
104 PlayListWidget::Entry playListEntry = playList.currentEntry(); 103 PlayListWidget::Entry playListEntry = playList.currentEntry();
105 fileName = playListEntry.name; 104 fileName = playListEntry.name;
106 xineControl->play( playListEntry.file ); 105 xineControl()->play( playListEntry.file );
107 106
108 long seconds = mediaPlayerState.length(); 107 long seconds = mediaPlayerState.length();
109 time.sprintf("%li:%02i", seconds/60, (int)seconds%60 ); 108 time.sprintf("%li:%02i", seconds/60, (int)seconds%60 );
110 109
111 if( fileName.left(4) == "http" ) { 110 if( fileName.left(4) == "http" ) {
112 fileName = QFileInfo( fileName ).baseName(); 111 fileName = QFileInfo( fileName ).baseName();
113 if ( xineControl->getMetaInfo().isEmpty() ) { 112 if ( xineControl()->getMetaInfo().isEmpty() ) {
114 tickerText = tr( " File: " ) + fileName; 113 tickerText = tr( " File: " ) + fileName;
115 } else { 114 } else {
116 tickerText = xineControl->getMetaInfo(); 115 tickerText = xineControl()->getMetaInfo();
117 } 116 }
118 } else { 117 } else {
119 if ( xineControl->getMetaInfo().isEmpty() ) { 118 if ( xineControl()->getMetaInfo().isEmpty() ) {
120 tickerText = tr( " File: " ) + fileName + tr( ", Length: " ) + time + " "; 119 tickerText = tr( " File: " ) + fileName + tr( ", Length: " ) + time + " ";
121 } else { 120 } else {
122 tickerText = xineControl->getMetaInfo() + " Length: " + time + " "; 121 tickerText = xineControl()->getMetaInfo() + " Length: " + time + " ";
123 } 122 }
124 } 123 }
125 audioUI->setTickerText( tickerText ); 124 audioUI()->setTickerText( tickerText );
126} 125}
127 126
128 127
@@ -189,14 +188,14 @@ void MediaPlayer::stopChangingVolume() {
189 onScreenDisplayVolume = 0; 188 onScreenDisplayVolume = 0;
190 int w=0; 189 int w=0;
191 int h=0; 190 int h=0;
192 if( !xineControl->hasVideo() ) { 191 if( !xineControl()->hasVideo() ) {
193 w = audioUI->width(); 192 w = audioUI()->width();
194 h = audioUI->height(); 193 h = audioUI()->height();
195 audioUI->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE ); 194 audioUI()->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE );
196 } else { 195 } else {
197 w = videoUI->width(); 196 w = videoUI()->width();
198 h = videoUI->height(); 197 h = videoUI()->height();
199 videoUI->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE ); 198 videoUI()->repaint( ( w - 200 ) / 2, h - yoff, 200 + 9, 70, FALSE );
200 } 199 }
201} 200}
202 201
@@ -220,18 +219,18 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
220 } 219 }
221 220
222 int w=0; int h=0; 221 int w=0; int h=0;
223 if( !xineControl->hasVideo() ) { 222 if( !xineControl()->hasVideo() ) {
224 w = audioUI->width(); 223 w = audioUI()->width();
225 h = audioUI->height(); 224 h = audioUI()->height();
226 225
227 if ( drawnOnScreenDisplay ) { 226 if ( drawnOnScreenDisplay ) {
228 if ( onScreenDisplayVolume > v ) { 227 if ( onScreenDisplayVolume > v ) {
229 audioUI->repaint( ( w - 200 ) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE ); 228 audioUI()->repaint( ( w - 200 ) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE );
230 } 229 }
231 } 230 }
232 drawnOnScreenDisplay = TRUE; 231 drawnOnScreenDisplay = TRUE;
233 onScreenDisplayVolume = v; 232 onScreenDisplayVolume = v;
234 QPainter p( audioUI ); 233 QPainter p( audioUI() );
235 p.setPen( QColor( 0x10, 0xD0, 0x10 ) ); 234 p.setPen( QColor( 0x10, 0xD0, 0x10 ) );
236 p.setBrush( QColor( 0x10, 0xD0, 0x10 ) ); 235 p.setBrush( QColor( 0x10, 0xD0, 0x10 ) );
237 236
@@ -249,17 +248,17 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
249 } 248 }
250 } 249 }
251 } else { 250 } else {
252 w = videoUI->width(); 251 w = videoUI()->width();
253 h = videoUI->height(); 252 h = videoUI()->height();
254 253
255 if ( drawnOnScreenDisplay ) { 254 if ( drawnOnScreenDisplay ) {
256 if ( onScreenDisplayVolume > v ) { 255 if ( onScreenDisplayVolume > v ) {
257 videoUI->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE ); 256 videoUI()->repaint( (w - 200) / 2 + v * 20 + 0, h - yoff + 40, ( onScreenDisplayVolume - v ) * 20 + 9, 30, FALSE );
258 } 257 }
259 } 258 }
260 drawnOnScreenDisplay = TRUE; 259 drawnOnScreenDisplay = TRUE;
261 onScreenDisplayVolume = v; 260 onScreenDisplayVolume = v;
262 QPainter p( videoUI ); 261 QPainter p( videoUI() );
263 p.setPen( QColor( 0x10, 0xD0, 0x10 ) ); 262 p.setPen( QColor( 0x10, 0xD0, 0x10 ) );
264 p.setBrush( QColor( 0x10, 0xD0, 0x10 ) ); 263 p.setBrush( QColor( 0x10, 0xD0, 0x10 ) );
265 264
@@ -346,32 +345,51 @@ void MediaPlayer::cleanUp() {// this happens on closing
346// QPEApplication::ungrabKeyboard(); 345// QPEApplication::ungrabKeyboard();
347} 346}
348 347
349void MediaPlayer::recreateAudioAndVideoWidgets() 348void MediaPlayer::recreateAudioAndVideoWidgets() const
350{ 349{
351 delete xineControl; 350 delete m_xineControl;
352 delete audioUI; 351 delete m_audioUI;
353 delete videoUI; 352 delete m_videoUI;
354 audioUI = new AudioWidget( playList, mediaPlayerState, 0, "audioUI" ); 353 m_audioUI = new AudioWidget( playList, mediaPlayerState, 0, "audioUI" );
355 videoUI = new VideoWidget( playList, mediaPlayerState, 0, "videoUI" ); 354 m_videoUI = new VideoWidget( playList, mediaPlayerState, 0, "videoUI" );
356 355
357 connect( audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); 356 connect( m_audioUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
358 connect( audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); 357 connect( m_audioUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) );
359 connect( audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); 358 connect( m_audioUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
360 connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); 359 connect( m_audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
361 360
362 connect( videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); 361 connect( m_videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) );
363 connect( videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); 362 connect( m_videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) );
364 connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); 363 connect( m_videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
365 connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); 364 connect( m_videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
366 365
367 xineControl = new XineControl( videoUI->vidWidget(), mediaPlayerState ); 366 m_xineControl = new XineControl( m_videoUI->vidWidget(), mediaPlayerState );
368 connect( xineControl, SIGNAL( initialized() ), 367}
369 &mediaPlayerState, SLOT( setBackendInitialized() ) ); 368
369AudioWidget *MediaPlayer::audioUI() const
370{
371 if ( !m_audioUI )
372 recreateAudioAndVideoWidgets();
373 return m_audioUI;
374}
375
376VideoWidget *MediaPlayer::videoUI() const
377{
378 if ( !m_videoUI )
379 recreateAudioAndVideoWidgets();
380 return m_videoUI;
381}
382
383XineControl *MediaPlayer::xineControl() const
384{
385 if ( !m_xineControl )
386 recreateAudioAndVideoWidgets();
387 return m_xineControl;
370} 388}
371 389
372void MediaPlayer::reloadSkins() 390void MediaPlayer::reloadSkins()
373{ 391{
374 audioUI->loadSkin(); 392 audioUI()->loadSkin();
375 videoUI->loadSkin(); 393 videoUI()->loadSkin();
376} 394}
377 395
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index 6b316f6..5975731 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -54,7 +54,6 @@ public:
54 ~MediaPlayer(); 54 ~MediaPlayer();
55 55
56public slots: 56public slots:
57 void recreateAudioAndVideoWidgets();
58 void reloadSkins(); 57 void reloadSkins();
59 58
60private slots: 59private slots:
@@ -72,17 +71,24 @@ private slots:
72protected: 71protected:
73 void timerEvent( QTimerEvent *e ); 72 void timerEvent( QTimerEvent *e );
74 void keyReleaseEvent( QKeyEvent *e); 73 void keyReleaseEvent( QKeyEvent *e);
74
75private: 75private:
76 AudioWidget *audioUI() const;
77 VideoWidget *videoUI() const;
78 XineControl *xineControl() const;
76 79
77 bool isBlanked, l, r; 80 bool isBlanked, l, r;
78 int fd, fl; 81 int fd, fl;
79 int volumeDirection; 82 int volumeDirection;
80 XineControl *xineControl;
81 VolumeControl *volControl; 83 VolumeControl *volControl;
82 MediaPlayerState &mediaPlayerState; 84 MediaPlayerState &mediaPlayerState;
83 PlayListWidget &playList; 85 PlayListWidget &playList;
84 AudioWidget *audioUI; 86
85 VideoWidget *videoUI; 87 void recreateAudioAndVideoWidgets() const;
88
89 mutable XineControl *m_xineControl;
90 mutable AudioWidget *m_audioUI;
91 mutable VideoWidget *m_videoUI;
86}; 92};
87 93
88 94
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
index d54d870..40fa1a4 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.cpp
@@ -53,7 +53,6 @@ MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
53 readConfig( cfg ); 53 readConfig( cfg );
54 streaming = false; 54 streaming = false;
55 seekable = true; 55 seekable = true;
56 backendInitialized = false;
57} 56}
58 57
59 58
@@ -86,18 +85,6 @@ void MediaPlayerState::writeConfig( Config& cfg ) const {
86 cfg.writeEntry( "VideoGamma", videoGamma ); 85 cfg.writeEntry( "VideoGamma", videoGamma );
87} 86}
88 87
89bool MediaPlayerState::isInitialized() const
90{
91 return backendInitialized; // for now, more to come (skin stuff)
92}
93
94void MediaPlayerState::setBackendInitialized()
95{
96 assert( backendInitialized == false );
97 backendInitialized = true;
98 emit initialized();
99}
100
101MediaPlayerState::DisplayType MediaPlayerState::displayType() const 88MediaPlayerState::DisplayType MediaPlayerState::displayType() const
102{ 89{
103 return m_displayType; 90 return m_displayType;
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h
index 6fe6d76..7408fdc 100644
--- a/noncore/multimedia/opieplayer2/mediaplayerstate.h
+++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h
@@ -61,7 +61,6 @@ public:
61 bool isPaused() const { return paused; } 61 bool isPaused() const { return paused; }
62 bool isPlaying() const { return playing; } 62 bool isPlaying() const { return playing; }
63 bool isStopped() const { return stopped; } 63 bool isStopped() const { return stopped; }
64 bool isInitialized() const;
65 long position() const { return curPosition; } 64 long position() const { return curPosition; }
66 long length() const { return curLength; } 65 long length() const { return curLength; }
67 DisplayType displayType() const; 66 DisplayType displayType() const;
@@ -98,8 +97,6 @@ public slots:
98 void toggleBlank(); 97 void toggleBlank();
99 void writeConfig( Config& cfg ) const; 98 void writeConfig( Config& cfg ) const;
100 99
101 void setBackendInitialized();
102
103signals: 100signals:
104 void fullscreenToggled( bool ); 101 void fullscreenToggled( bool );
105 void scaledToggled( bool ); 102 void scaledToggled( bool );
@@ -118,8 +115,6 @@ signals:
118 void prev(); 115 void prev();
119 void next(); 116 void next();
120 117
121 void initialized();
122
123private: 118private:
124 bool streaming : 1; 119 bool streaming : 1;
125 bool seekable : 1; 120 bool seekable : 1;
@@ -132,7 +127,6 @@ private:
132 bool paused : 1; 127 bool paused : 1;
133 bool playing : 1; 128 bool playing : 1;
134 bool stopped : 1; 129 bool stopped : 1;
135 bool backendInitialized : 1;
136 long curPosition; 130 long curPosition;
137 long curLength; 131 long curLength;
138 DisplayType m_displayType; 132 DisplayType m_displayType;
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 8e4f56d..c35e03d 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -65,7 +65,7 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par
65 d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), 65 d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ),
66 "opieplayer2/remove_from_playlist", 66 "opieplayer2/remove_from_playlist",
67 this , SLOT(removeSelected() ) ); 67 this , SLOT(removeSelected() ) );
68 d->tbPlay = new PlayButton( mediaPlayerState, bar, tr( "Play" ), "opieplayer2/play", 68 d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer2/play",
69 this , SLOT( btnPlay( bool) ), TRUE ); 69 this , SLOT( btnPlay( bool) ), TRUE );
70 d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle", 70 d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer2/shuffle",
71 &mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE ); 71 &mediaPlayerState, SLOT( setShuffled( bool ) ), TRUE );
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index 23b7a70..5fc0c39 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -203,26 +203,4 @@ void PlayListWidgetGui::setActiveWindow() {
203 mediaPlayerState.setDisplayType( origDisplayType ); // now switch back 203 mediaPlayerState.setDisplayType( origDisplayType ); // now switch back
204} 204}
205 205
206PlayButton::PlayButton( MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name,
207 const QString &icon, QObject *handler, const QString &slot, bool t )
208 : ToolButton( parent, name, icon, handler, slot, t ), mediaPlayerState( _mediaPlayerState ),
209 m_lastEnableStatus( true )
210{
211 connect( &mediaPlayerState, SIGNAL( initialized() ),
212 this, SLOT( checkInitializationStatus() ) );
213}
214
215void PlayButton::setEnabled( bool enable )
216{
217 m_lastEnableStatus = enable;
218
219 enable &= mediaPlayerState.isInitialized();
220
221 ToolButton::setEnabled( enable );
222}
223
224void PlayButton::checkInitializationStatus()
225{
226 setEnabled( m_lastEnableStatus );
227}
228 206
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
index 1aa8ac8..c965b0d 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
@@ -84,24 +84,6 @@ public:
84 } 84 }
85}; 85};
86 86
87class PlayButton : public ToolButton
88{
89 Q_OBJECT
90public:
91 PlayButton( MediaPlayerState &_mediaPlayerState, QWidget *parent, const char *name,
92 const QString& icon, QObject *handler, const QString& slot, bool t = FALSE );
93
94protected:
95 virtual void setEnabled( bool enable );
96
97private slots:
98 void checkInitializationStatus();
99
100private:
101 MediaPlayerState &mediaPlayerState;
102 bool m_lastEnableStatus : 1;
103};
104
105class MenuItem : public QAction { 87class MenuItem : public QAction {
106 88
107public: 89public:
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index e791c3b..ee2cd83 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -55,7 +55,7 @@ XineControl::XineControl( XineVideoWidget *xineWidget,
55 connect( &mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); 55 connect( &mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) );
56 connect( &mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) ); 56 connect( &mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) );
57 connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) ); 57 connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) );
58 connect( libXine, SIGNAL( initialized() ), this, SLOT( xineInitialized() ) ); 58 connect( xineVideoWidget, SIGNAL( videoResized( const QSize & ) ), this, SLOT( videoResized ( const QSize & ) ) );
59 59
60 disabledSuspendScreenSaver = FALSE; 60 disabledSuspendScreenSaver = FALSE;
61} 61}
@@ -126,14 +126,6 @@ void XineControl::setGamma( int value ) {
126 libXine->setGamma( value ); 126 libXine->setGamma( value );
127} 127}
128 128
129void XineControl::xineInitialized()
130{
131 connect( xineVideoWidget, SIGNAL( videoResized( const QSize & ) ), this, SLOT( videoResized ( const QSize & ) ) );
132 libXine->resize( xineVideoWidget->videoSize() );
133
134 emit initialized();
135}
136
137void XineControl::stop( bool isSet ) { 129void XineControl::stop( bool isSet ) {
138 if ( !isSet ) { 130 if ( !isSet ) {
139 libXine->stop(); 131 libXine->stop();
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index 085de3f..fdc5d2b 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -100,10 +100,6 @@ public slots:
100 */ 100 */
101 void setGamma( int ); 101 void setGamma( int );
102 102
103
104private slots:
105 void xineInitialized();
106
107private: 103private:
108 XINE::Lib *libXine; 104 XINE::Lib *libXine;
109 long m_currentTime; 105 long m_currentTime;
@@ -118,8 +114,6 @@ private:
118 114
119signals: 115signals:
120 void positionChanged( long ); 116 void positionChanged( long );
121
122 void initialized();
123}; 117};
124 118
125 119