- activate the threaded xine init code! :)

3 files changed, 20 insertions, 2 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 299239b..8896cfe 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -96,3 +96,3 @@ Lib::Lib( InitializationMode initMode, XineVideoWidget* widget )
     else
-        assert( false );
+        start();
 }
@@ -101,4 +101,6 @@ void Lib::run()
 {
+    qDebug( "Lib::run() started" );
     initialize();
     m_initialized = true;
+    qDebug( "Lib::run() finished" );
 }
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index d6fbb53..0ec6fad 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -37,2 +37,3 @@ MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPla
     m_xineControl = 0;
+    xine = new XINE::Lib( XINE::Lib::InitializeInThread );
 
@@ -67,2 +68,7 @@ MediaPlayer::MediaPlayer( PlayListWidget &_playList, MediaPlayerState &_mediaPla
 MediaPlayer::~MediaPlayer() {
+    // this shold never happen, but one never knows...
+    if ( xine ) {
+        xine->ensureInitialized();
+        delete xine;
+    }
     delete m_xineControl;
@@ -373,4 +379,8 @@ void MediaPlayer::recreateAudioAndVideoWidgets() const
 
-    XINE::Lib *xine = new XINE::Lib( XINE::Lib::InitializeImmediately );
+    if ( !xine )
+        xine = new XINE::Lib( XINE::Lib::InitializeImmediately );
+
     m_xineControl = new XineControl( xine, m_videoUI->vidWidget(), mediaPlayerState );
+
+    xine = 0;
 }
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.h b/noncore/multimedia/opieplayer2/mediaplayer.h
index 351c884..cbe4d86 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.h
+++ b/noncore/multimedia/opieplayer2/mediaplayer.h
@@ -50,2 +50,7 @@ class VideoWidget;
 
+namespace XINE
+{
+    class Lib;
+};
+
 class MediaPlayer : public QObject {
@@ -92,2 +97,3 @@ private:
     mutable VideoWidget *m_videoUI;
+    mutable XINE::Lib *xine;