summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2/xinecontrol.cpp
authorsimon <simon>2002-12-08 22:31:49 (UTC)
committer simon <simon>2002-12-08 22:31:49 (UTC)
commit3023dd47eefe179c245a186dd0870c2b4a76a4ae (patch) (side-by-side diff)
tree97dd05fd90a776e8fd72a630b3fb6e58b9b08f1b /noncore/multimedia/opieplayer2/xinecontrol.cpp
parent3b5f97272ded8a40da3853476371b4edc41d1a34 (diff)
downloadopie-3023dd47eefe179c245a186dd0870c2b4a76a4ae.zip
opie-3023dd47eefe179c245a186dd0870c2b4a76a4ae.tar.gz
opie-3023dd47eefe179c245a186dd0870c2b4a76a4ae.tar.bz2
- made XineControl independent from VideoWidget
Diffstat (limited to 'noncore/multimedia/opieplayer2/xinecontrol.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp12
1 files changed, 7 insertions, 5 deletions
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
@@ -38,14 +38,16 @@
#include <qpe/qpeapplication.h>
#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 ) ) );
connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );