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

NxWM::CMediaPlayer: Fix issues with state changes performed on the PreRelese event handler

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-15 19:47:56 -06:00
parent 9ee647caba
commit d36a3bcf6b
2 changed files with 79 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nxwm/include/cmediaplayer.hxx
View File

@ -93,6 +93,13 @@ namespace NxWM
MPLAYER_FREWIND, /**< Rewinding a media file */
};
enum EPendingRelease
{
PENDING_NONE = 0, /**< Nothing is pending */
PENDING_PLAY_RELEASE, /**< Expect play image to be released */
PENDING_PAUSE_RELEASE /**< Expect pause image to be released */
};
/**
* The structure defines a pending operation.
*/
@ -109,6 +116,7 @@ namespace NxWM
enum EMediaPlayerState m_state; /**< Media player current state */
enum EMediaPlayerState m_prevState; /**< Media player previous state */
enum EPendingRelease m_pending; /**< Pending image release event */
/**
* Cached constructor parameters.
@ -181,6 +189,21 @@ namespace NxWM
void handleActionEvent(const NXWidgets::CWidgetEventArgs &e);
/**
* Handle a widget release event. Only the play and pause image release
* are of interest.
*/
void handleReleaseEvent(const NXWidgets::CWidgetEventArgs &e);
/**
* Handle a widget release event when the widget WAS dragged outside of
* its original bounding box. Only the play and pause image release
* are of interest.
*/
void handleReleaseOutsideEvent(const NXWidgets::CWidgetEventArgs &e);
public:
/**
* CMediaPlayer constructor

64
nxwm/src/cmediaplayer.cxx
View File

@ -3,6 +3,7 @@
*
* Copyright (C) 2013 Ken Pettit. All rights reserved.
* Author: Ken Pettit <pettitkd@gmail.com>
* Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@ -82,17 +83,19 @@ CMediaPlayer::CMediaPlayer(CTaskbar *taskbar, CApplicationWindow *window)
{
// Save the constructor data
m_taskbar = taskbar;
m_window = window;
m_taskbar = taskbar;
m_window = window;
// Nullify widgets that will be instantiated when the window is started
m_text = (NXWidgets::CLabel *)0;
m_font = (NXWidgets::CNxFont *)0;
m_text = (NXWidgets::CLabel *)0;
m_font = (NXWidgets::CNxFont *)0;
// Initial state is stopped
m_state = MPLAYER_STOPPED;
m_state = MPLAYER_STOPPED;
m_prevState = MPLAYER_STOPPED;
m_pending = PENDING_NONE;
// Add our personalized window label
@ -832,7 +835,11 @@ void CMediaPlayer::handleActionEvent(const NXWidgets::CWidgetEventArgs &e)
if (m_play->isClicked() && m_state != MPLAYER_PLAYING)
{
setMediaPlayerState(MPLAYER_PLAYING);
// Just arm the state change now, but don't do anything until the
// release occurs. Trying to do the state change before the NxWidgets
// release processing completes causes issues.
m_pending = PENDING_PLAY_RELEASE;
}
// These only make sense in non-STOPPED states
@ -843,9 +850,11 @@ void CMediaPlayer::handleActionEvent(const NXWidgets::CWidgetEventArgs &e)
if (m_pause->isClicked() && m_state != MPLAYER_PAUSED)
{
// Yes... then now we are playing
// Just arm the state change now, but don't do anything until the
// release occurs. Trying to do the state change before the NxWidgets
// release processing completes causes issues.
setMediaPlayerState(MPLAYER_PAUSED);
m_pending = PENDING_PAUSE_RELEASE;
}
// Check if the rewind image was clicked
@ -903,6 +912,45 @@ printf("Volume clicked\n"); // REMOVE ME
}
}
/**
* Handle a widget release event. Only the play and pause image release
* are of interest.
*/
void CMediaPlayer::handleReleaseEvent(const NXWidgets::CWidgetEventArgs &e)
{
// Check if the Play image was released
if (m_pending == PENDING_PLAY_RELEASE && !m_play->isClicked())
{
// Now perform the delayed state change
setMediaPlayerState(MPLAYER_PLAYING);
m_pending = PENDING_NONE;
}
// Check if the Pause image was released
else if (m_pending == PENDING_PAUSE_RELEASE && !m_pause->isClicked())
{
// Now perform the delayed state change
setMediaPlayerState(MPLAYER_PAUSED);
m_pending = PENDING_NONE;
}
}
/**
* Handle a widget release event when the widget WAS dragged outside of
* its original bounding box. Only the play and pause image release
* are of interest.
*/
void CMediaPlayer::handleReleaseOutsideEvent(const NXWidgets::CWidgetEventArgs &e)
{
handleReleaseEvent(e);
}
/**
* CMediaPlayerFactory Constructor
*