summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp16
-rw-r--r--noncore/multimedia/opieplayer2/lib.h2
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp2
4 files changed, 19 insertions, 5 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 84194b7..299239b 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -127,12 +127,9 @@ void Lib::initialize()
127 m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput ); 127 m_stream = xine_stream_new (m_xine, m_audioOutput, m_videoOutput );
128 128
129 if (m_wid != 0 ) { 129 if (m_wid != 0 ) {
130 printf( "!0\n" ); 130 printf( "!0\n" );
131 resize ( m_wid-> size ( ) ); 131 setWidget( m_wid );
132 ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() );
133
134// m_wid->repaint();
135 } 132 }
136 133
137 m_queue = xine_event_new_queue (m_stream); 134 m_queue = xine_event_new_queue (m_stream);
138 135
@@ -293,8 +290,16 @@ void Lib::ensureInitialized()
293 wait(); 290 wait();
294 qDebug( "initialization thread finished!" ); 291 qDebug( "initialization thread finished!" );
295} 292}
296 293
294void Lib::setWidget( XineVideoWidget *widget )
295{
296 m_wid = widget;
297 resize ( m_wid-> size ( ) );
298 ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() );
299 m_wid->repaint();
300}
301
297void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType ) 302void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType )
298{ 303{
299 assert( sendType == ThreadUtil::Channel::OneWay ); 304 assert( sendType == ThreadUtil::Channel::OneWay );
300 handleXineEvent( msg->type() ); 305 handleXineEvent( msg->type() );
@@ -380,6 +385,9 @@ void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) {
380 if ( !m_video ) { 385 if ( !m_video ) {
381 qWarning("not showing video now"); 386 qWarning("not showing video now");
382 return; 387 return;
383 } 388 }
389
390 assert( m_wid );
391
384 m_wid-> setVideoFrame ( frame, width, height, bytes ); 392 m_wid-> setVideoFrame ( frame, width, height, bytes );
385} 393}
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index 6b67f67..181735c 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -178,8 +178,10 @@ namespace XINE {
178 int error() const; 178 int error() const;
179 179
180 void ensureInitialized(); 180 void ensureInitialized();
181 181
182 void setWidget( XineVideoWidget *widget );
183
182 signals: 184 signals:
183 185
184 void stopped(); 186 void stopped();
185 187
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 963e783..d6fbb53 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -14,8 +14,9 @@
14#include "playlistwidget.h" 14#include "playlistwidget.h"
15#include "audiowidget.h" 15#include "audiowidget.h"
16#include "videowidget.h" 16#include "videowidget.h"
17#include "volumecontrol.h" 17#include "volumecontrol.h"
18#include "lib.h"
18 19
19#include "mediaplayerstate.h" 20#include "mediaplayerstate.h"
20 21
21// for setBacklight() 22// for setBacklight()
@@ -369,9 +370,10 @@ void MediaPlayer::recreateAudioAndVideoWidgets() const
369 connect( m_videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); 370 connect( m_videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) );
370 connect( m_videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); 371 connect( m_videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
371 connect( m_videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); 372 connect( m_videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
372 373
373 m_xineControl = new XineControl( m_videoUI->vidWidget(), mediaPlayerState ); 374 XINE::Lib *xine = new XINE::Lib( XINE::Lib::InitializeImmediately );
375 m_xineControl = new XineControl( xine, m_videoUI->vidWidget(), mediaPlayerState );
374} 376}
375 377
376AudioWidget *MediaPlayer::audioUI() const 378AudioWidget *MediaPlayer::audioUI() const
377{ 379{
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 7c54499..1c489e3 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -56,8 +56,10 @@ XineControl::XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget,
56 : QObject( parent, name ), libXine( xine ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget ) 56 : QObject( parent, name ), libXine( xine ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget )
57{ 57{
58 xine->ensureInitialized(); 58 xine->ensureInitialized();
59 59
60 xine->setWidget( xineWidget );
61
60 init(); 62 init();
61} 63}
62 64
63void XineControl::init() 65void XineControl::init()