summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NxWidgets/ChangeLog.txt4
-rwxr-xr-xnuttx/ChangeLog5
2 files changed, 9 insertions, 0 deletions
diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt
index 27e298902..dcdd8b8ec 100644
--- a/NxWidgets/ChangeLog.txt
+++ b/NxWidgets/ChangeLog.txt
@@ -503,3 +503,7 @@
* NxWidgets::CNxTimer: Make CNxTimer stop itself before destruction.
Otherwise a call to an invalid work queue entry may occur. From Petteri
Aimonen (2014-7-22).
+* NxWidgets/Kconfig: Add configuration options to filter CMediaPlayer files
+ based on extension (2014-7-23)
+* NxWM::CMediaPlayer: Add logic to read files from the media mountpoint,
+ filter them by extension, and display the file names in the listbox (2014-7-23).
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index f173744bc..14ddf4a42 100755
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -7791,3 +7791,8 @@
* audio/pcm_decode.c, include/nuttx/audio/audio.h, and drivers/audio/audio_null.c
and wm8904.c: Add ioctls so that PCM decoder can configure the driver
bitrate, num channels, and sample width (2014-7-23).
+ * drivers/audio/Kconfig: Fix a typo in the audio Kconfig file,
+ UDIO->AUDIO (2014-7-23).
+ * configs/sama5d4-ek/nxwm/defconfig: The NxPlayer and audio system are
+ now enabled in the default configuration (although they have not yet
+ been fully integrated into the NxWM media player) (2014-7-23).