Changes to integrate with Ken's NxWM::CMediaPlayer

3 files changed, 37 insertions, 24 deletions

diff --git a/apps/NxWidgets/Kconfig b/apps/NxWidgets/Kconfig
index 3a55e2077..c36e20e24 100644
--- a/apps/NxWidgets/Kconfig
+++ b/apps/NxWidgets/Kconfig
@@ -1154,7 +1154,7 @@ config NXWM_MEDIAPLAYER_MEDIAPATH
 		containing all of the media files accessible by the media player.
 
 config NXWM_MEDIAPLAYER_NOFILTER
-	bool "Disable filtering by file name extension
+	bool "Disable filtering by file name extension"
 	default y
 
 config NXWM_MEDIAPLAYER_FILTER
@@ -1180,7 +1180,7 @@ config NXWM_MEDIAPLAYER_FILTER_WAV
 
 config NXWM_MEDIAPLAYER_FILTER_PCM
 	bool "Accept .pcm extension"
-	default y
+	default n
 	select NXWM_MEDIAPLAYER_FILTER
 
 config NXWM_MEDIAPLAYER_FILTER_MP3
diff --git a/apps/include/nxplayer.h b/apps/include/nxplayer.h
index b6d157e7a..76d6d3d15 100644
--- a/apps/include/nxplayer.h
+++ b/apps/include/nxplayer.h
@@ -193,7 +193,8 @@ void nxplayer_reference(FAR struct nxplayer_s *pPlayer);
  *
  **************************************************************************/
 
-int nxplayer_setdevice(FAR struct nxplayer_s *pPlayer, FAR const char *device);
+int nxplayer_setdevice(FAR struct nxplayer_s *pPlayer,
+                       FAR const char *device);
 
 /****************************************************************************
  * Name: nxplayer_playfile
@@ -216,8 +217,8 @@ int nxplayer_setdevice(FAR struct nxplayer_s *pPlayer, FAR const char *device);
  *
  **************************************************************************/
 
-int nxplayer_playfile(FAR struct nxplayer_s *pPlayer, FAR char *filename,
-                      int filefmt, int subfmt);
+int nxplayer_playfile(FAR struct nxplayer_s *pPlayer,
+                      FAR const char *filename, int filefmt, int subfmt);
 
 /****************************************************************************
  * Name: nxplayer_stop
@@ -397,7 +398,8 @@ int nxplayer_setbalance(FAR struct nxplayer_s *pPlayer, uint16_t balance);
  *
  **************************************************************************/
 
-void nxplayer_setmediadir(FAR struct nxplayer_s *pPlayer, FAR char *mediadir);
+void nxplayer_setmediadir(FAR struct nxplayer_s *pPlayer,
+                          FAR const char *mediadir);
 
 /****************************************************************************
  * Name: nxplayer_setequalization
diff --git a/apps/system/nxplayer/nxplayer.c b/apps/system/nxplayer/nxplayer.c
index 74328c595..039907236 100644
--- a/apps/system/nxplayer/nxplayer.c
+++ b/apps/system/nxplayer/nxplayer.c
@@ -386,7 +386,8 @@ int nxplayer_getmidisubformat(FAR FILE *fd)
 
 #ifdef CONFIG_NXPLAYER_FMT_FROM_EXT
 static inline int nxplayer_fmtfromextension(FAR struct nxplayer_s *pPlayer,
-    char* pFilename, int *subfmt)
+                                            FAR const char *pFilename,
+                                            FAR int *subfmt)
 {
   const char  *pExt;
   uint8_t      x;
@@ -414,7 +415,6 @@ static inline int nxplayer_fmtfromextension(FAR struct nxplayer_s *pPlayer,
 
                   if (subfmt && g_known_ext[c].getsubformat)
                     {
-
                       *subfmt = g_known_ext[c].getsubformat(pPlayer->fileFd);
                     }
 
@@ -428,7 +428,9 @@ static inline int nxplayer_fmtfromextension(FAR struct nxplayer_s *pPlayer,
       /* Stop if we find a '/' */
 
       if (pFilename[x] == '/')
-        break;
+        {
+          break;
+        }
 
       x--;
     }
@@ -463,8 +465,8 @@ static int nxplayer_fmtfromheader(FAR struct nxplayer_s *pPlayer)
 
 #if defined(CONFIG_NXPLAYER_MEDIA_SEARCH) && defined(CONFIG_NXPLAYER_INCLUDE_MEDIADIR)
 static int nxplayer_mediasearch(FAR struct nxplayer_s *pPlayer,
-                                FAR char *pFilename, FAR char *path,
-                                int pathmax)
+                                FAR const char *pFilename,
+                                FAR const char *path, int pathmax)
 {
   return -ENOENT;
 }
@@ -484,8 +486,6 @@ static int nxplayer_enqueuebuffer(FAR struct nxplayer_s *pPlayer,
   struct audio_buf_desc_s bufdesc;
   int ret;
 
-  //auddbg("Entry: %p\n", pBuf);
-
   /* Validate the file is still open */
 
   if (pPlayer->fileFd == NULL)
@@ -564,17 +564,18 @@ static void *nxplayer_playthread(pthread_addr_t pvarg)
   struct nxplayer_s           *pPlayer = (struct nxplayer_s *) pvarg;
   struct audio_msg_s          msg;
   struct audio_buf_desc_s     buf_desc;
-  int                         prio;
   ssize_t                     size;
   uint8_t                     running = true;
   uint8_t                     playing = true;
-  int                         x, ret;
 #ifdef CONFIG_AUDIO_DRIVER_SPECIFIC_BUFFERS
   struct ap_buffer_info_s     buf_info;
   FAR struct ap_buffer_s**    pBuffers;
 #else
   FAR struct ap_buffer_s*     pBuffers[CONFIG_AUDIO_NUM_BUFFERS];
 #endif
+  int                         prio;
+  int                         x;
+  int                         ret;
 
   auddbg("Entry\n");
 
@@ -688,7 +689,7 @@ static void *nxplayer_playthread(pthread_addr_t pvarg)
   /* Set parameters such as volume, bass, etc. */
 
 #ifndef CONFIG_AUDIO_EXCLUDE_VOLUME
-  nxplayer_setvolume(pPlayer, pPlayer->volume);
+  (void)nxplayer_setvolume(pPlayer, pPlayer->volume);
 #endif
 #ifndef CONFIG_AUDIO_EXCLUDE_BALANCE
   nxplayer_setbalance(pPlayer, pPlayer->balance);
@@ -866,6 +867,7 @@ err_out:
 int nxplayer_setvolume(FAR struct nxplayer_s *pPlayer, uint16_t volume)
 {
   struct audio_caps_desc_s  cap_desc;
+  int ret;
 
   /* Thread sync using the semaphore */
 
@@ -889,16 +891,23 @@ int nxplayer_setvolume(FAR struct nxplayer_s *pPlayer, uint16_t volume)
       cap_desc.caps.ac_type           = AUDIO_TYPE_FEATURE;
       cap_desc.caps.ac_format.hw      = AUDIO_FU_VOLUME;
       cap_desc.caps.ac_controls.hw[0] = volume;
-      ioctl(pPlayer->devFd, AUDIOIOC_CONFIGURE, (unsigned long) &cap_desc);
+      ret = ioctl(pPlayer->devFd, AUDIOIOC_CONFIGURE, (unsigned long) &cap_desc);
+      if (ret < 0)
+        {
+          int errcode = errno;
+          DEBUGASSERT(errcode > 0);
+
+          auddbg("ERROR: AUDIOIOC_CONFIGURE ioctl failed: %d\n", errcode);
+          return -errcode;
+        }
     }
 
   /* Store the volume setting */
 
   pPlayer->volume = volume;
-
   sem_post(&pPlayer->sem);
 
-  return -ENOENT;
+  return OK;
 }
 #endif  /* CONFIG_AUDIO_EXCLUDE_VOLUME */
 
@@ -1341,17 +1350,18 @@ int nxplayer_stop(FAR struct nxplayer_s *pPlayer)
  *
  ****************************************************************************/
 
-int nxplayer_playfile(FAR struct nxplayer_s *pPlayer, FAR char *pFilename,
-                      int filefmt, int subfmt)
+int nxplayer_playfile(FAR struct nxplayer_s *pPlayer,
+                      FAR const char *pFilename, int filefmt, int subfmt)
 {
-  int                 ret, tmpsubfmt = AUDIO_FMT_UNDEF;
   struct mq_attr      attr;
   struct sched_param  sparam;
   pthread_attr_t      tattr;
-  void*               value;
+  void               *value;
 #ifdef CONFIG_NXPLAYER_INCLUDE_MEDIADIR
   char                path[128];
 #endif
+  int                 tmpsubfmt = AUDIO_FMT_UNDEF;
+  int                 ret;
 
   DEBUGASSERT(pPlayer != NULL);
   DEBUGASSERT(pFilename != NULL);
@@ -1542,7 +1552,8 @@ err_out_nodev:
  ****************************************************************************/
 
 #ifdef CONFIG_NXPLAYER_INCLUDE_MEDIADIR
-void nxplayer_setmediadir(FAR struct nxplayer_s *pPlayer, char *mediadir)
+void nxplayer_setmediadir(FAR struct nxplayer_s *pPlayer,
+     FAR const char *mediadir)
 {
   strncpy(pPlayer->mediadir, mediadir, sizeof(pPlayer->mediadir));
 }