- added a second constructor that takes a XINE::Lib object (and takes

  ownership of it)

2 files changed, 20 insertions, 0 deletions

diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index ee2cd83..efa9934 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -48,6 +48,19 @@ XineControl::XineControl( XineVideoWidget *xineWidget,
 
     libXine = new XINE::Lib( xineWidget );
 
+    init();
+}
+
+XineControl::XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget, 
+                          MediaPlayerState &_mediaPlayerState, 
+                          QObject *parent, const char *name )
+    : QObject( parent, name ), libXine( xine ), mediaPlayerState( _mediaPlayerState ), xineVideoWidget( xineWidget )
+{
+    init();
+}
+
+void XineControl::init()
+{
     connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pause( bool ) ) );
     connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) );
     connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index fdc5d2b..0e985d6 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -45,6 +45,11 @@ public:
     XineControl( XineVideoWidget *xineWidget, 
                  MediaPlayerState &_mediaPlayerState, 
                  QObject *parent = 0, const char *name =0 );
+    // note that this constructor takes over ownership of the passed
+    // XINE::Lib object.
+    XineControl( XINE::Lib *xine, XineVideoWidget *xineWidget, 
+                 MediaPlayerState &_mediaPlayerState, 
+                 QObject *parent = 0, const char *name =0 );
     ~XineControl();
 
     bool hasVideo() const { return hasVideoChannel; }
@@ -101,6 +106,8 @@ public slots:
     void setGamma( int );
 
 private:
+    void init();
+
     XINE::Lib *libXine;
     long m_currentTime;
     long m_position;