- initialized xine in a background thread. much time is still spend in

  skin loading though.

1 files changed, 20 insertions, 3 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 99d5de6..20fd1e2 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -69,9 +69,11 @@ extern "C" {
 }
 
 using namespace XINE;
 
-Lib::Lib( XineVideoWidget* widget ) {
+Lib::Lib( XineVideoWidget* widget ) 
+{
+    ThreadUtil::AutoLock lock( m_initGuard );
     m_initialized = false;
     m_video = false;
     m_wid = widget;
     printf("Lib");
@@ -86,8 +88,13 @@ Lib::Lib( XineVideoWidget* widget ) {
         ts << "misc.memcpy_method:glibc\n";
         f.close();
     }
 
+    start();
+}
+
+void Lib::run()
+{
     initialize();
 }
 
 void Lib::initialize()
@@ -123,9 +130,12 @@ void Lib::initialize()
     m_queue = xine_event_new_queue (m_stream);
 
     xine_event_create_listener_thread (m_queue, xine_event_handler, this);
 
+    ThreadUtil::AutoLock lock( m_initGuard );
     m_initialized = true;
+
+    send( new ThreadUtil::ChannelMessage( InitializationMessageType ), OneWay );
 }
 
 Lib::~Lib() {
     ThreadUtil::AutoLock lock( m_initGuard );
@@ -283,14 +293,21 @@ int Lib::error() const {
 
 void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType )
 {
     assert( sendType == ThreadUtil::Channel::OneWay );
-    handleXineEvent( msg->type() );
+    switch ( msg->type() ) {
+        case XineMessageType:
+            handleXineEvent( static_cast<XineMessage *>( msg )->xineEvent );
+            break;
+        case InitializationMessageType:
+            emit initialized();
+            break;
+    }
     delete msg;
 }
 
 void Lib::handleXineEvent( const xine_event_t* t ) {
-    send( new ThreadUtil::ChannelMessage( t->type ), OneWay );
+    send( new XineMessage( t->type ), OneWay );
 }
 
 void Lib::handleXineEvent( int type ) {
     assertInitialized();