sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

NxWM::CMediaPlayer: Two places where use of play and pause buttons reversed

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-15 20:26:37 -06:00
parent a41e9d7e63
commit e602d5b722
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
nxwm/src/cmediaplayer.cxx
View File

@ -621,7 +621,7 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state)
switch (state) switch (state)
{ {
case MPLAYER_STOPPED: // Initial state. Also the state after playing completes case MPLAYER_STOPPED: // Initial state. Also the state after playing completes
m_state = MPLAYER_STOPPED; m_state = MPLAYER_STOPPED;
m_prevState = MPLAYER_PLAYING; m_prevState = MPLAYER_PLAYING;
// Text box is enabled and ready for text entry // Text box is enabled and ready for text entry
@ -727,20 +727,6 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state)
m_text->disable(); m_text->disable();
if (m_prevState == MPLAYER_PLAYING) 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 // Play image hidden and disabled
@ -754,6 +740,20 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state)
m_pause->show(); m_pause->show();
m_pause->enableDrawing(); 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 // 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) 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->enable();
m_play->show(); m_play->show();
@ -789,20 +803,6 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state)
m_pause->disable(); m_pause->disable();
m_pause->hide(); 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 // Fast forward image is enabled and ready for use