diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-16 19:20:44 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-16 19:20:44 -0600 |
| commit | 8397d6ca465653b01dd5bee7533e0573f5f6ce9a (patch) | |
| tree | 4a3206546e9e9860e7d324f3b6b04d901e858b61 /NxWidgets/nxwm | |
| parent | 3889dd0fd47a5ebaeb8886b31f354c718bfcfdb0 (diff) | |
| download | nuttx-8397d6ca465653b01dd5bee7533e0573f5f6ce9a.tar.gz nuttx-8397d6ca465653b01dd5bee7533e0573f5f6ce9a.tar.bz2 nuttx-8397d6ca465653b01dd5bee7533e0573f5f6ce9a.zip | |
Misc changes related to MediaPlayer. Nothing really significant
Diffstat (limited to 'NxWidgets/nxwm')
| -rw-r--r-- | NxWidgets/nxwm/include/nxwmconfig.hxx | 4 | ||||
| -rw-r--r-- | NxWidgets/nxwm/src/cmediaplayer.cxx | 14 | ||||
| -rw-r--r-- | NxWidgets/nxwm/src/ctouchscreen.cxx | 2 | ||||
| -rw-r--r-- | NxWidgets/nxwm/src/cwindowmessenger.cxx | 1 |
4 files changed, 16 insertions, 5 deletions
diff --git a/NxWidgets/nxwm/include/nxwmconfig.hxx b/NxWidgets/nxwm/include/nxwmconfig.hxx index 40689c0f5..7a4c4ff8d 100644 --- a/NxWidgets/nxwm/include/nxwmconfig.hxx +++ b/NxWidgets/nxwm/include/nxwmconfig.hxx @@ -644,6 +644,10 @@ # define CONFIG_NXWM_MEDIAPLAYER_YSPACING 8 #endif +#ifndef CONFIG_NXWM_MEDIAPLAYER_VOLUMESTEP +# define CONFIG_NXWM_MEDIAPLAYER_VOLUMESTEP 5 +#endif + #ifndef CONFIG_NXWM_MEDIAPLAYER_ICON # define CONFIG_NXWM_MEDIAPLAYER_ICON NxWM::g_mediaplayerBitmap #endif diff --git a/NxWidgets/nxwm/src/cmediaplayer.cxx b/NxWidgets/nxwm/src/cmediaplayer.cxx index b13f76609..757b0b96e 100644 --- a/NxWidgets/nxwm/src/cmediaplayer.cxx +++ b/NxWidgets/nxwm/src/cmediaplayer.cxx @@ -720,6 +720,7 @@ bool CMediaPlayer::createPlayer(void) m_volume->setMinimumValue(0); m_volume->setMaximumValue(100); m_volume->setValue(15); + m_volume->setPageSize(CONFIG_NXWM_MEDIAPLAYER_VOLUMESTEP); // Register to get events from the value changes in the volume slider @@ -1014,12 +1015,19 @@ void CMediaPlayer::setMediaPlayerState(enum EMediaPlayerState state) void CMediaPlayer::setVolumeLevel(void) { - // Current volume level values. This is already pre-scaled in the range 0-100 + // Get the current volume level value. This is already pre-scaled in the + // range 0-100 - m_level = m_volume->getValue(); + int newLevel = m_volume->getValue(); - // Now, provide the new volume setting to the NX Player + // Has the volume level changed? + + if (m_level != newLevel) + { + // Yes.. provide the new volume setting to the NX Player #warning Missing logic + m_level = newLevel; + } } /** diff --git a/NxWidgets/nxwm/src/ctouchscreen.cxx b/NxWidgets/nxwm/src/ctouchscreen.cxx index f05f29ebd..0a1bea71f 100644 --- a/NxWidgets/nxwm/src/ctouchscreen.cxx +++ b/NxWidgets/nxwm/src/ctouchscreen.cxx @@ -447,7 +447,7 @@ void CTouchscreen::handleMouseInput(struct touch_sample_s *sample) // Was the button up or down? uint8_t buttons; - if ((sample->point[0].flags & (TOUCH_DOWN|TOUCH_MOVE)) != 0) + if ((sample->point[0].flags & (TOUCH_DOWN | TOUCH_MOVE)) != 0) { buttons = NX_MOUSE_LEFTBUTTON; } diff --git a/NxWidgets/nxwm/src/cwindowmessenger.cxx b/NxWidgets/nxwm/src/cwindowmessenger.cxx index 86120aacd..2ffc309b3 100644 --- a/NxWidgets/nxwm/src/cwindowmessenger.cxx +++ b/NxWidgets/nxwm/src/cwindowmessenger.cxx @@ -122,7 +122,6 @@ void CWindowMessenger::handleMouseEvent(void) work_state_t *state = new work_state_t; state->windowMessenger = this; - int ret = work_queue(USRWORK, &state->work, &inputWorkCallback, state, 0); if (ret < 0) { |