diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-15 20:26:37 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-15 20:26:37 -0600 |
| commit | cc6ba5990a380e1bbec4ab26aff3a3e9f65f2470 (patch) | |
| tree | 82e8d1e7e02e0a54b5fde43d98b405ba05cf6b13 /NxWidgets | |
| parent | ee185e1a84b9c7b9595407f845e1bd387a5a5dc0 (diff) | |
| download | nuttx-cc6ba5990a380e1bbec4ab26aff3a3e9f65f2470.tar.gz nuttx-cc6ba5990a380e1bbec4ab26aff3a3e9f65f2470.tar.bz2 nuttx-cc6ba5990a380e1bbec4ab26aff3a3e9f65f2470.zip | |
NxWM::CMediaPlayer: Two places where use of play and pause buttons reversed
Diffstat (limited to 'NxWidgets')
| -rw-r--r-- | NxWidgets/nxwm/src/cmediaplayer.cxx | 60 |
1 files changed, 30 insertions, 30 deletions
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 @@ -728,20 +728,6 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state) 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 m_play->disableDrawing(); @@ -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,32 +777,32 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state) 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 m_play->disableDrawing(); 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 |