- made XineControl independent from VideoWidget

3 files changed, 11 insertions, 12 deletions

diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 06b1a04..ed7e37f 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -364,5 +364,5 @@ void MediaPlayer::recreateAudioAndVideoWidgets()
     connect( videoUI,  SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
 
-    xineControl = new XineControl( videoUI, mediaPlayerState );
+    xineControl = new XineControl( videoUI, videoUI->vidWidget(), mediaPlayerState );
 }
 
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index b4ae783..6f1cd9c 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -39,12 +39,14 @@
 #include "xinecontrol.h"
 #include "mediaplayerstate.h"
-#include "videowidget.h"
 
-XineControl::XineControl( VideoWidget *videoWidget, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name )
-    : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ), videoUI( videoWidget ) {
+XineControl::XineControl( QWidget *videoContainerWidget, XineVideoWidget *xineWidget, 
+                          MediaPlayerState &_mediaPlayerState, 
+                          QObject *parent, const char *name )
+    : QObject( parent, name ), mediaPlayerState( _mediaPlayerState )
+{
 
-    libXine = new XINE::Lib( videoUI->vidWidget() );
+    libXine = new XINE::Lib( xineWidget );
 
-    connect ( videoUI, SIGNAL( videoResized( const QSize & )), this, SLOT( videoResized ( const QSize & ) ) );
+    connect ( videoContainerWidget, SIGNAL( videoResized( const QSize & )), this, SLOT( videoResized ( const QSize & ) ) );
     connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ),  this, SLOT( pause( bool ) ) );
     connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) );
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index 24e966b..69a594f 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -40,10 +40,10 @@
 #include "mediaplayerstate.h"
 
-class VideoWidget;
-
 class XineControl : public QObject  {
     Q_OBJECT
 public:
-    XineControl( VideoWidget *videoWidget, MediaPlayerState &_mediaPlayerState, QObject *parent = 0, const char *name =0 );
+    XineControl( QWidget *videoContainerWidget, XineVideoWidget *xineWidget, 
+                 MediaPlayerState &_mediaPlayerState, 
+                 QObject *parent = 0, const char *name =0 );
     ~XineControl();
 
@@ -115,7 +115,4 @@ private:
 signals:
     void positionChanged( long );
-
-private:
-    VideoWidget *videoUI;
 };