-rw-r--r-- | noncore/multimedia/opieplayer2/audiowidget.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayerstate.h | 6 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/videowidget.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/noncore/multimedia/opieplayer2/audiowidget.cpp b/noncore/multimedia/opieplayer2/audiowidget.cpp index 6ccf206..a52319b 100644 --- a/noncore/multimedia/opieplayer2/audiowidget.cpp +++ b/noncore/multimedia/opieplayer2/audiowidget.cpp | |||
@@ -426,20 +426,20 @@ void AudioWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
426 | if ( audioButtons[i].isHeld ) { | 426 | if ( audioButtons[i].isHeld ) { |
427 | audioButtons[i].isHeld = FALSE; | 427 | audioButtons[i].isHeld = FALSE; |
428 | if ( !audioButtons[i].isToggle ) { | 428 | if ( !audioButtons[i].isToggle ) { |
429 | setToggleButton( i, FALSE ); | 429 | setToggleButton( i, FALSE ); |
430 | } | 430 | } |
431 | qDebug("mouseEvent %d", i); | 431 | qDebug("mouseEvent %d", i); |
432 | switch (i) { | 432 | switch (i) { |
433 | case AudioPlay: | 433 | case AudioPlay: |
434 | if( mediaPlayerState->isPaused ) { | 434 | if( mediaPlayerState->paused() ) { |
435 | mediaPlayerState->setPaused( FALSE ); | 435 | mediaPlayerState->setPaused( FALSE ); |
436 | return; | 436 | return; |
437 | } else if( !mediaPlayerState->isPaused ) { | 437 | } else if( !mediaPlayerState->paused() ) { |
438 | mediaPlayerState->setPaused( TRUE ); | 438 | mediaPlayerState->setPaused( TRUE ); |
439 | return; | 439 | return; |
440 | } | 440 | } |
441 | case AudioStop: mediaPlayerState->setPlaying(FALSE); return; | 441 | case AudioStop: mediaPlayerState->setPlaying(FALSE); return; |
442 | case AudioNext: if( playList->whichList() ==0 ) mediaPlayerState->setNext(); return; | 442 | case AudioNext: if( playList->whichList() ==0 ) mediaPlayerState->setNext(); return; |
443 | case AudioPrevious: if( playList->whichList() ==0 ) mediaPlayerState->setPrev(); return; | 443 | case AudioPrevious: if( playList->whichList() ==0 ) mediaPlayerState->setPrev(); return; |
444 | case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; | 444 | case AudioLoop: mediaPlayerState->setLooping(audioButtons[i].isDown); return; |
445 | case AudioVolumeUp: emit moreReleased(); return; | 445 | case AudioVolumeUp: emit moreReleased(); return; |
diff --git a/noncore/multimedia/opieplayer2/mediaplayerstate.h b/noncore/multimedia/opieplayer2/mediaplayerstate.h index 8c4e09e..154e3b0 100644 --- a/noncore/multimedia/opieplayer2/mediaplayerstate.h +++ b/noncore/multimedia/opieplayer2/mediaplayerstate.h | |||
@@ -45,19 +45,16 @@ class Config; | |||
45 | 45 | ||
46 | 46 | ||
47 | class MediaPlayerState : public QObject { | 47 | class MediaPlayerState : public QObject { |
48 | Q_OBJECT | 48 | Q_OBJECT |
49 | public: | 49 | public: |
50 | MediaPlayerState( QObject *parent, const char *name ); | 50 | MediaPlayerState( QObject *parent, const char *name ); |
51 | ~MediaPlayerState(); | 51 | ~MediaPlayerState(); |
52 | 52 | ||
53 | bool isPaused; | ||
54 | bool isPlaying; | ||
55 | bool isStoped; | ||
56 | bool streaming(); | 53 | bool streaming(); |
57 | bool seekable(); | 54 | bool seekable(); |
58 | bool fullscreen(); | 55 | bool fullscreen(); |
59 | bool scaled(); | 56 | bool scaled(); |
60 | bool looping(); | 57 | bool looping(); |
61 | bool shuffled(); | 58 | bool shuffled(); |
62 | bool playlist(); | 59 | bool playlist(); |
63 | bool paused(); | 60 | bool paused(); |
@@ -125,16 +122,19 @@ private: | |||
125 | bool isStreaming; | 122 | bool isStreaming; |
126 | bool isSeekable; | 123 | bool isSeekable; |
127 | bool isFullscreen; | 124 | bool isFullscreen; |
128 | bool isScaled; | 125 | bool isScaled; |
129 | bool isBlanked; | 126 | bool isBlanked; |
130 | bool isLooping; | 127 | bool isLooping; |
131 | bool isShuffled; | 128 | bool isShuffled; |
132 | bool usePlaylist; | 129 | bool usePlaylist; |
130 | bool isPaused; | ||
131 | bool isPlaying; | ||
132 | bool isStoped; | ||
133 | long curPosition; | 133 | long curPosition; |
134 | long curLength; | 134 | long curLength; |
135 | char curView; | 135 | char curView; |
136 | int videoGamma; | 136 | int videoGamma; |
137 | void readConfig( Config& cfg ); | 137 | void readConfig( Config& cfg ); |
138 | 138 | ||
139 | }; | 139 | }; |
140 | 140 | ||
diff --git a/noncore/multimedia/opieplayer2/videowidget.cpp b/noncore/multimedia/opieplayer2/videowidget.cpp index c643273..3a757f0 100644 --- a/noncore/multimedia/opieplayer2/videowidget.cpp +++ b/noncore/multimedia/opieplayer2/videowidget.cpp | |||
@@ -322,21 +322,21 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event ) { | |||
322 | videoButtons[i].isHeld = FALSE; | 322 | videoButtons[i].isHeld = FALSE; |
323 | if ( !videoButtons[i].isToggle ) { | 323 | if ( !videoButtons[i].isToggle ) { |
324 | setToggleButton( i, FALSE ); | 324 | setToggleButton( i, FALSE ); |
325 | } | 325 | } |
326 | 326 | ||
327 | switch(i) { | 327 | switch(i) { |
328 | 328 | ||
329 | case VideoPlay: { | 329 | case VideoPlay: { |
330 | if( mediaPlayerState->isPaused ) { | 330 | if( mediaPlayerState->paused() ) { |
331 | setToggleButton( i, FALSE ); | 331 | setToggleButton( i, FALSE ); |
332 | mediaPlayerState->setPaused( FALSE ); | 332 | mediaPlayerState->setPaused( FALSE ); |
333 | return; | 333 | return; |
334 | } else if( !mediaPlayerState->isPaused ) { | 334 | } else if( !mediaPlayerState->paused() ) { |
335 | setToggleButton( i, TRUE ); | 335 | setToggleButton( i, TRUE ); |
336 | mediaPlayerState->setPaused( TRUE ); | 336 | mediaPlayerState->setPaused( TRUE ); |
337 | return; | 337 | return; |
338 | } else { | 338 | } else { |
339 | return; | 339 | return; |
340 | } | 340 | } |
341 | } | 341 | } |
342 | 342 | ||
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp index c46994a..f6289d7 100644 --- a/noncore/multimedia/opieplayer2/xinecontrol.cpp +++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp | |||
@@ -175,17 +175,17 @@ void XineControl::length() { | |||
175 | * Reports the position the xine backend is at right now | 175 | * Reports the position the xine backend is at right now |
176 | * @return long the postion in seconds | 176 | * @return long the postion in seconds |
177 | */ | 177 | */ |
178 | long XineControl::position() { | 178 | long XineControl::position() { |
179 | m_position = ( currentTime() ); | 179 | m_position = ( currentTime() ); |
180 | mediaPlayerState->updatePosition( m_position ); | 180 | mediaPlayerState->updatePosition( m_position ); |
181 | long emitPos = (long)m_position; | 181 | long emitPos = (long)m_position; |
182 | emit positionChanged( emitPos ); | 182 | emit positionChanged( emitPos ); |
183 | if( mediaPlayerState->isPlaying ) { | 183 | if( mediaPlayerState->playing() ) { |
184 | // needs to be stopped the media is stopped | 184 | // needs to be stopped the media is stopped |
185 | QTimer::singleShot( 1000, this, SLOT( position() ) ); | 185 | QTimer::singleShot( 1000, this, SLOT( position() ) ); |
186 | } | 186 | } |
187 | // qDebug("POSITION : %d", m_position); | 187 | // qDebug("POSITION : %d", m_position); |
188 | return m_position; | 188 | return m_position; |
189 | } | 189 | } |
190 | 190 | ||
191 | /** | 191 | /** |