From e602d5b7228fd2f794be9f8985883dd43f8e6a0c Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 15 Jul 2014 20:26:37 -0600 Subject: [PATCH] NxWM::CMediaPlayer: Two places where use of play and pause buttons reversed --- nxwm/src/cmediaplayer.cxx | 60 +++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/nxwm/src/cmediaplayer.cxx b/nxwm/src/cmediaplayer.cxx index 759eeead2..195a9ca8d 100644 --- a/nxwm/src/cmediaplayer.cxx +++ b/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 @@ -777,7 +777,21 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state) if (m_prevState == MPLAYER_PLAYING) { - // Play image enabled and ready to resume playing + // Play image hidden and disabled + + m_play->disableDrawing(); + m_play->disable(); + m_play->hide(); + + // 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(); @@ -789,20 +803,6 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state) m_pause->disable(); m_pause->hide(); } - else - { - // Play image hidden and disabled - - m_play->disableDrawing(); - m_play->disable(); - m_play->hide(); - - // Pause image enabled and ready to stop fast forwarding - - m_pause->enable(); - m_pause->show(); - m_pause->enableDrawing(); - } // Fast forward image is enabled and ready for use