From cc6ba5990a380e1bbec4ab26aff3a3e9f65f2470 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 15 Jul 2014 20:26:37 -0600 Subject: NxWM::CMediaPlayer: Two places where use of play and pause buttons reversed --- NxWidgets/nxwm/src/cmediaplayer.cxx | 60 ++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 30 deletions(-) (limited to 'NxWidgets/nxwm/src') diff --git a/NxWidgets/nxwm/src/cmediaplayer.cxx b/NxWidgets/nxwm/src/cmediaplayer.cxx index 759eeead2..195a9ca8d 100644 --- a/NxWidgets/nxwm/src/cmediaplayer.cxx +++ b/NxWidgets/nxwm/src/cmediaplayer.cxx @@ -621,7 +621,7 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state) switch (state) { case MPLAYER_STOPPED: // Initial state. Also the state after playing completes - m_state = MPLAYER_STOPPED; + m_state = MPLAYER_STOPPED; m_prevState = MPLAYER_PLAYING; // Text box is enabled and ready for text entry @@ -727,20 +727,6 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state) m_text->disable(); if (m_prevState == MPLAYER_PLAYING) - { - // Play image enabled and ready to resume playing - - m_play->enable(); - m_play->show(); - m_play->enableDrawing(); - - // Pause image is hidden and disabled - - m_pause->disableDrawing(); - m_pause->disable(); - m_pause->hide(); - } - else { // Play image hidden and disabled @@ -754,6 +740,20 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state) m_pause->show(); m_pause->enableDrawing(); } + else + { + // Play image enabled and ready to stop fast forwarding + + m_play->enable(); + m_play->show(); + m_play->enableDrawing(); + + // Pause image is hidden and disabled + + m_pause->disableDrawing(); + m_pause->disable(); + m_pause->hide(); + } // Fast forward image is enabled, highlighted and ready for use @@ -776,20 +776,6 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state) m_text->disable(); if (m_prevState == MPLAYER_PLAYING) - { - // Play image enabled and ready to resume playing - - m_play->enable(); - m_play->show(); - m_play->enableDrawing(); - - // Pause image is hidden and disabled - - m_pause->disableDrawing(); - m_pause->disable(); - m_pause->hide(); - } - else { // Play image hidden and disabled @@ -797,12 +783,26 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state) m_play->disable(); m_play->hide(); - // Pause image enabled and ready to stop fast forwarding + // Pause image enabled and ready to stop rewinding m_pause->enable(); m_pause->show(); m_pause->enableDrawing(); } + else + { + // Play image enabled and ready to stop rewinding + + m_play->enable(); + m_play->show(); + m_play->enableDrawing(); + + // Pause image is hidden and disabled + + m_pause->disableDrawing(); + m_pause->disable(); + m_pause->hide(); + } // Fast forward image is enabled and ready for use -- cgit v1.2.3