diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-27 12:25:15 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-27 12:25:15 -0600 |
| commit | dc388b2bd44718d09d2f9e817c50702ad6ffdd55 (patch) | |
| tree | d06b7ee48a9c3fb512fe8e7d8f00a7b28dd903a6 /NxWidgets/nxwm/include | |
| parent | 707f46add8f3687009950c5337230a86173c094e (diff) | |
| download | nuttx-dc388b2bd44718d09d2f9e817c50702ad6ffdd55.tar.gz nuttx-dc388b2bd44718d09d2f9e817c50702ad6ffdd55.tar.bz2 nuttx-dc388b2bd44718d09d2f9e817c50702ad6ffdd55.zip | |
NxWM::CMediaPlayer: successive presses on fast forward or rewind button now increase the subsampling, wrapping back to 2X when the maximum of 16x is reached.
Diffstat (limited to 'NxWidgets/nxwm/include')
| -rw-r--r-- | NxWidgets/nxwm/include/cmediaplayer.hxx | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/NxWidgets/nxwm/include/cmediaplayer.hxx b/NxWidgets/nxwm/include/cmediaplayer.hxx index ea1133f98..fc71c0b25 100644 --- a/NxWidgets/nxwm/include/cmediaplayer.hxx +++ b/NxWidgets/nxwm/include/cmediaplayer.hxx @@ -2,7 +2,9 @@ * NxWidgets/nxwm/include/cmediaplayer.hxx * * Copyright (C) 2013 Ken Pettit. All rights reserved. + * Copyright (C) 2014 Gregory Nutt. 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 @@ -93,8 +95,8 @@ namespace NxWM * STAGED | STAGED | STOPPED | PLAYING | X | X | X | * PLAYING | X | X | X | PAUSED |FFORWARD2 | REWIND2 | * PAUSED | STAGED | STOPPED | PLAYING | X |FFORWARD1 | REWIND1 | - * FFORWARD1| X | X | PAUSED | X | PAUSED | REWIND1 | - * REWIND1 | X | X | PAUSED | X |FFORWARD1 | PAUSED | + * FFORWARD1| X | X | PAUSED | X |FFORWARD1 | REWIND1 | + * REWIND1 | X | X | PAUSED | X |FFORWARD1 | REWIND1 | * FFORWARD2| X | X | X | PLAYING | PLAYING | REWIND1 | * REWIND2 | X | X | X | PLAYING |FFORWARD1 | PLAYING | * ---------+----------+----------+----------+----------+----------+----------+ @@ -152,11 +154,14 @@ namespace NxWM enum EMediaPlayerState m_prevState; /**< Media player previous state */ enum EPendingRelease m_pending; /**< Pending image release event */ NXWidgets::CNxString m_filePath; /**< The full path to the selected file */ - unsigned int m_fileIndex; /**< Last selected text box selection */ + int m_fileIndex; /**< Last selected text box selection */ bool m_fileReady; /**< True: Ready to play */ #ifndef CONFIG_AUDIO_EXCLUDE_VOLUME uint8_t m_level; /**< Current volume level, range 0-100 */ #endif +#ifndef CONFIG_AUDIO_EXCLUDE_FFORWARD + uint8_t m_subSample; /**< Current FFFORWARD subsampling */ +#endif /** * Media player geometry. |