author | simon <simon> | 2002-12-08 22:31:49 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-08 22:31:49 (UTC) |
commit | 3023dd47eefe179c245a186dd0870c2b4a76a4ae (patch) (unidiff) | |
tree | 97dd05fd90a776e8fd72a630b3fb6e58b9b08f1b /noncore | |
parent | 3b5f97272ded8a40da3853476371b4edc41d1a34 (diff) | |
download | opie-3023dd47eefe179c245a186dd0870c2b4a76a4ae.zip opie-3023dd47eefe179c245a186dd0870c2b4a76a4ae.tar.gz opie-3023dd47eefe179c245a186dd0870c2b4a76a4ae.tar.bz2 |
- made XineControl independent from VideoWidget
-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 | |||
@@ -363,6 +363,6 @@ void MediaPlayer::recreateAudioAndVideoWidgets() | |||
363 | connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); | 363 | connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); |
364 | connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); | 364 | connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); |
365 | 365 | ||
366 | xineControl = new XineControl( videoUI, mediaPlayerState ); | 366 | xineControl = new XineControl( videoUI, videoUI->vidWidget(), mediaPlayerState ); |
367 | } | 367 | } |
368 | 368 | ||
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 @@ | |||
38 | #include <qpe/qpeapplication.h> | 38 | #include <qpe/qpeapplication.h> |
39 | #include "xinecontrol.h" | 39 | #include "xinecontrol.h" |
40 | #include "mediaplayerstate.h" | 40 | #include "mediaplayerstate.h" |
41 | #include "videowidget.h" | ||
42 | 41 | ||
43 | XineControl::XineControl( VideoWidget *videoWidget, MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ) | 42 | XineControl::XineControl( QWidget *videoContainerWidget, XineVideoWidget *xineWidget, |
44 | : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ), videoUI( videoWidget ) { | 43 | MediaPlayerState &_mediaPlayerState, |
44 | QObject *parent, const char *name ) | ||
45 | : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ) | ||
46 | { | ||
45 | 47 | ||
46 | libXine = new XINE::Lib( videoUI->vidWidget() ); | 48 | libXine = new XINE::Lib( xineWidget ); |
47 | 49 | ||
48 | connect ( videoUI, SIGNAL( videoResized( const QSize & )), this, SLOT( videoResized ( const QSize & ) ) ); | 50 | connect ( videoContainerWidget, SIGNAL( videoResized( const QSize & )), this, SLOT( videoResized ( const QSize & ) ) ); |
49 | connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) ); | 51 | connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) ); |
50 | connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) ); | 52 | connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) ); |
51 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); | 53 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( 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 | |||
@@ -39,12 +39,12 @@ | |||
39 | 39 | ||
40 | #include "mediaplayerstate.h" | 40 | #include "mediaplayerstate.h" |
41 | 41 | ||
42 | class VideoWidget; | ||
43 | |||
44 | class XineControl : public QObject { | 42 | class XineControl : public QObject { |
45 | Q_OBJECT | 43 | Q_OBJECT |
46 | public: | 44 | public: |
47 | XineControl( VideoWidget *videoWidget, MediaPlayerState &_mediaPlayerState, QObject *parent = 0, const char *name =0 ); | 45 | XineControl( QWidget *videoContainerWidget, XineVideoWidget *xineWidget, |
46 | MediaPlayerState &_mediaPlayerState, | ||
47 | QObject *parent = 0, const char *name =0 ); | ||
48 | ~XineControl(); | 48 | ~XineControl(); |
49 | 49 | ||
50 | bool hasVideo() const { return hasVideoChannel; } | 50 | bool hasVideo() const { return hasVideoChannel; } |
@@ -114,9 +114,6 @@ private: | |||
114 | 114 | ||
115 | signals: | 115 | signals: |
116 | void positionChanged( long ); | 116 | void positionChanged( long ); |
117 | |||
118 | private: | ||
119 | VideoWidget *videoUI; | ||
120 | }; | 117 | }; |
121 | 118 | ||
122 | 119 | ||