Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/main.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 2 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 33 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.h | 5 |
4 files changed, 21 insertions, 21 deletions
diff --git a/noncore/multimedia/opieplayer2/main.cpp b/noncore/multimedia/opieplayer2/main.cpp index fd47ea5..7d11ca0 100644 --- a/noncore/multimedia/opieplayer2/main.cpp +++ b/noncore/multimedia/opieplayer2/main.cpp | |||
@@ -7,5 +7,4 @@ | |||
7 | #include "mediaplayer.h" | 7 | #include "mediaplayer.h" |
8 | 8 | ||
9 | MediaPlayerState *mediaPlayerState; | ||
10 | PlayListWidget *playList; | 9 | PlayListWidget *playList; |
11 | AudioWidget *audioUI; | 10 | AudioWidget *audioUI; |
@@ -16,5 +15,4 @@ int main(int argc, char **argv) { | |||
16 | 15 | ||
17 | MediaPlayerState st( 0, "mediaPlayerState" ); | 16 | MediaPlayerState st( 0, "mediaPlayerState" ); |
18 | mediaPlayerState = &st; | ||
19 | PlayListWidget pl( st, 0, "playList" ); | 17 | PlayListWidget pl( st, 0, "playList" ); |
20 | playList = &pl; | 18 | playList = &pl; |
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp index 424259b..eccb5d9 100644 --- a/noncore/multimedia/opieplayer2/mediaplayer.cpp +++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp | |||
@@ -61,5 +61,5 @@ MediaPlayer::MediaPlayer( MediaPlayerState &_mediaPlayerState, QObject *parent, | |||
61 | 61 | ||
62 | volControl = new VolumeControl; | 62 | volControl = new VolumeControl; |
63 | xineControl = new XineControl(); | 63 | xineControl = new XineControl( mediaPlayerState ); |
64 | Config cfg( "OpiePlayer" ); | 64 | Config cfg( "OpiePlayer" ); |
65 | cfg.setGroup("PlayList"); | 65 | cfg.setGroup("PlayList"); |
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index e7d5a7b..071ef7c 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp | |||
@@ -41,18 +41,17 @@ | |||
41 | #include "videowidget.h" | 41 | #include "videowidget.h" |
42 | 42 | ||
43 | extern MediaPlayerState *mediaPlayerState; | ||
44 | extern VideoWidget *videoUI; | 43 | extern VideoWidget *videoUI; |
45 | XineControl::XineControl( QObject *parent, const char *name ) | 44 | XineControl::XineControl( MediaPlayerState &_mediaPlayerState, QObject *parent, const char *name ) |
46 | : QObject( parent, name ) { | 45 | : QObject( parent, name ), mediaPlayerState( _mediaPlayerState ) { |
47 | 46 | ||
48 | libXine = new XINE::Lib( videoUI->vidWidget() ); | 47 | libXine = new XINE::Lib( videoUI->vidWidget() ); |
49 | 48 | ||
50 | connect ( videoUI, SIGNAL( videoResized( const QSize & )), this, SLOT( videoResized ( const QSize & ) ) ); | 49 | connect ( videoUI, SIGNAL( videoResized( const QSize & )), this, SLOT( videoResized ( const QSize & ) ) ); |
51 | connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) ); | 50 | connect( &mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pause( bool ) ) ); |
52 | connect( this, SIGNAL( positionChanged( long ) ), mediaPlayerState, SLOT( updatePosition( long ) ) ); | 51 | connect( this, SIGNAL( positionChanged( long ) ), &mediaPlayerState, SLOT( updatePosition( long ) ) ); |
53 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); | 52 | connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); |
54 | connect( mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); | 53 | connect( &mediaPlayerState, SIGNAL( fullscreenToggled( bool ) ), this, SLOT( setFullscreen( bool ) ) ); |
55 | connect( mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); | 54 | connect( &mediaPlayerState, SIGNAL( positionChanged( long ) ), this, SLOT( seekTo( long ) ) ); |
56 | connect( mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) ); | 55 | connect( &mediaPlayerState, SIGNAL( videoGammaChanged( int ) ), this, SLOT( setGamma( int ) ) ); |
57 | connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) ); | 56 | connect( libXine, SIGNAL( stopped() ), this, SLOT( nextMedia() ) ); |
58 | 57 | ||
@@ -81,8 +80,8 @@ void XineControl::play( const QString& fileName ) { | |||
81 | QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() ); | 80 | QMessageBox::warning( 0l , tr( "Failure" ), getErrorCode() ); |
82 | // toggle stop so the the play button is reset | 81 | // toggle stop so the the play button is reset |
83 | mediaPlayerState->setPlaying( false ); | 82 | mediaPlayerState.setPlaying( false ); |
84 | return; | 83 | return; |
85 | } | 84 | } |
86 | mediaPlayerState->setPlaying( true ); | 85 | mediaPlayerState.setPlaying( true ); |
87 | 86 | ||
88 | MediaPlayerState::DisplayType displayType; | 87 | MediaPlayerState::DisplayType displayType; |
@@ -100,8 +99,8 @@ void XineControl::play( const QString& fileName ) { | |||
100 | } | 99 | } |
101 | // determine if slider is shown | 100 | // determine if slider is shown |
102 | mediaPlayerState->setIsSeekable( libXine->isSeekable() ); | 101 | mediaPlayerState.setIsSeekable( libXine->isSeekable() ); |
103 | 102 | ||
104 | // which gui (video / audio) | 103 | // which gui (video / audio) |
105 | mediaPlayerState->setDisplayType( displayType ); | 104 | mediaPlayerState.setDisplayType( displayType ); |
106 | 105 | ||
107 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 106 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
@@ -119,5 +118,5 @@ void XineControl::play( const QString& fileName ) { | |||
119 | 118 | ||
120 | void XineControl::nextMedia() { | 119 | void XineControl::nextMedia() { |
121 | mediaPlayerState->setNext(); | 120 | mediaPlayerState.setNext(); |
122 | } | 121 | } |
123 | 122 | ||
@@ -168,5 +167,5 @@ long XineControl::currentTime() { | |||
168 | void XineControl::length() { | 167 | void XineControl::length() { |
169 | m_length = libXine->length(); | 168 | m_length = libXine->length(); |
170 | mediaPlayerState->setLength( m_length ); | 169 | mediaPlayerState.setLength( m_length ); |
171 | } | 170 | } |
172 | 171 | ||
@@ -178,8 +177,8 @@ void XineControl::length() { | |||
178 | long XineControl::position() { | 177 | long XineControl::position() { |
179 | m_position = ( currentTime() ); | 178 | m_position = ( currentTime() ); |
180 | mediaPlayerState->updatePosition( m_position ); | 179 | mediaPlayerState.updatePosition( m_position ); |
181 | long emitPos = (long)m_position; | 180 | long emitPos = (long)m_position; |
182 | emit positionChanged( emitPos ); | 181 | emit positionChanged( emitPos ); |
183 | if( mediaPlayerState->isPlaying() ) { | 182 | if( mediaPlayerState.isPlaying() ) { |
184 | // needs to be stopped the media is stopped | 183 | // needs to be stopped the media is stopped |
185 | QTimer::singleShot( 1000, this, SLOT( position() ) ); | 184 | QTimer::singleShot( 1000, this, SLOT( position() ) ); |
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h index b1300a8..00486f2 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.h +++ b/noncore/multimedia/opieplayer2/xinecontrol.h | |||
@@ -38,8 +38,10 @@ | |||
38 | #include <qobject.h> | 38 | #include <qobject.h> |
39 | 39 | ||
40 | #include "mediaplayerstate.h" | ||
41 | |||
40 | class XineControl : public QObject { | 42 | class XineControl : public QObject { |
41 | Q_OBJECT | 43 | Q_OBJECT |
42 | public: | 44 | public: |
43 | XineControl( QObject *parent = 0, const char *name =0 ); | 45 | XineControl( MediaPlayerState &_mediaPlayerState, QObject *parent = 0, const char *name =0 ); |
44 | ~XineControl(); | 46 | ~XineControl(); |
45 | 47 | ||
@@ -107,4 +109,5 @@ private: | |||
107 | bool hasVideoChannel : 1; | 109 | bool hasVideoChannel : 1; |
108 | bool hasAudioChannel : 1; | 110 | bool hasAudioChannel : 1; |
111 | MediaPlayerState &mediaPlayerState; | ||
109 | 112 | ||
110 | signals: | 113 | signals: |