3 files changed, 26 insertions, 5 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 1e0dc21..6431de7 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -67,13 +67,13 @@ extern "C" {
     void null_set_videoGamma( const  xine_vo_driver_t* self , int value );
     void null_display_handler( const xine_vo_driver_t* self, display_xine_frame_t t, void* user_data );
 }
 
 using namespace XINE;
 
-Lib::Lib( XineVideoWidget* widget ) 
+Lib::Lib( InitializationMode initMode, XineVideoWidget* widget ) 
 {
     m_video = false;
     m_wid = widget;
     printf("Lib");
     QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf";
     // get the configuration
@@ -84,14 +84,28 @@ Lib::Lib( XineVideoWidget* widget )
         f.open(IO_WriteOnly);
         QTextStream ts( &f );
         ts << "misc.memcpy_method:glibc\n";
         f.close();
     }
 
+    if ( initMode == InitializeImmediately )
+        initialize();
+    else
+        assert( false );
+}
+
+void Lib::run()
+{
+    assert( false );
+}
+
+void Lib::initialize()
+{
     m_xine =  xine_new( );
 
+    QString configPath = QDir::homeDirPath() + "/Settings/opiexine.cf";
     xine_config_load( m_xine, QFile::encodeName( configPath ) );
 
     xine_init( m_xine );
 
     // allocate oss for sound
     // and fb for framebuffer
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h
index aba2ec9..6363918 100644
--- a/noncore/multimedia/opieplayer2/lib.h
+++ b/noncore/multimedia/opieplayer2/lib.h
@@ -52,24 +52,27 @@ namespace XINE {
      * of libxine for easy every day use
      * This will become a full C++ Wrapper
      * It supports playing, pausing, info,
      * stooping, seeking.
      */
     class Frame;
-    class Lib : public ThreadUtil::Channel
+    class Lib : public ThreadUtil::Channel, private ThreadUtil::Thread
     {
         Q_OBJECT
     public:
-        Lib(XineVideoWidget* = 0);
+        enum InitializationMode { InitializeImmediately, InitializeInThread };
+
+        Lib( InitializationMode initMode, XineVideoWidget* = 0);
+
         ~Lib();
         static int majorVersion();
         static int minorVersion();
         static int subVersion();
 
 
-                void resize ( const QSize &s );
+        void resize ( const QSize &s );
 
         int play( const QString& fileName,
                   int startPos = 0,
                   int start_time = 0 );
         void stop();
         void pause( bool toggle );
@@ -180,13 +183,17 @@ namespace XINE {
 
         void initialized();
 
     protected:
         virtual void receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType );
 
+        virtual void run();
+
     private:
+        void initialize();
+
         int m_bytes_per_pixel;
         bool m_video:1;
         XineVideoWidget *m_wid;
         xine_t *m_xine;
         xine_stream_t *m_stream;
         xine_cfg_entry_t *m_config;
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index efa9934..1aa3daa 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -43,13 +43,13 @@
 XineControl::XineControl( XineVideoWidget *xineWidget, 
                           MediaPlayerState &_mediaPlayerState, 
                           QObject *parent, const char *name )
     : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget )
 {
 
-    libXine = new XINE::Lib( xineWidget );
+    libXine = new XINE::Lib( XINE::Lib::InitializeImmediately, xineWidget );
 
     init();
 }
 
 XineControl::XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget, 
                           MediaPlayerState &_mediaPlayerState,