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

NxWM::CMediaPlayer: State variable was left in a bad state and caused some problems down the road

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-17 10:57:32 -06:00
parent 13e0b8509d
commit 4a34820526
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nxwm/src/cmediaplayer.cxx
View File

@ -1073,7 +1073,7 @@ void CMediaPlayer::checkFileSelection(void)
// Remain in the stopped state if we fail to open the file // Remain in the stopped state if we fail to open the file
m_fileIndex = -1; m_fileIndex = -1;
gdbg("openMediaFile failed\m"); gdbg("openMediaFile failed\n");
} }
else else
{ {
@ -1098,7 +1098,7 @@ void CMediaPlayer::checkFileSelection(void)
// Go to the STOPPED state on a failure to open the media file // Go to the STOPPED state on a failure to open the media file
// The play button will be disable because m_fileIndex == -1. // The play button will be disable because m_fileIndex == -1.
gdbg("openMediaFile failed\m"); gdbg("openMediaFile failed\n");
m_fileIndex = -1; m_fileIndex = -1;
setMediaPlayerState(MPLAYER_STOPPED); setMediaPlayerState(MPLAYER_STOPPED);
} }
@ -1227,6 +1227,10 @@ void CMediaPlayer::handleReleaseEvent(const NXWidgets::CWidgetEventArgs &e)
setMediaPlayerState(m_prevState); setMediaPlayerState(m_prevState);
} }
// No longer any action pending the PLAY image release
m_pending = PENDING_NONE;
} }
// Check if the Pause image was released // Check if the Pause image was released
@ -1251,6 +1255,10 @@ void CMediaPlayer::handleReleaseEvent(const NXWidgets::CWidgetEventArgs &e)
setMediaPlayerState(m_prevState); setMediaPlayerState(m_prevState);
} }
// No longer any action pending the PAUSE image release
m_pending = PENDING_NONE;
} }
} }