-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 12 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.h | 9 |
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 @@ -365,3 +365,3 @@ void MediaPlayer::recreateAudioAndVideoWidgets() - 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 @@ -40,10 +40,12 @@ #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 ) ) ); 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 @@ -41,4 +41,2 @@ -class VideoWidget; - class XineControl : public QObject { @@ -46,3 +44,5 @@ class XineControl : public QObject { 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(); @@ -116,5 +116,2 @@ signals: void positionChanged( long ); - -private: - VideoWidget *videoUI; }; |