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

WM8904 w/NxPlayer: Fix some compile errors and warnings with debug enabled

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-20 09:17:36 -06:00
parent 321524d856
commit a23e36a1e0
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
system/nxplayer/nxplayer.c
View File

@ -152,13 +152,6 @@ static const int g_known_ext_count = sizeof(g_known_ext) /
static int nxplayer_opendevice(FAR struct nxplayer_s *pPlayer, int format, static int nxplayer_opendevice(FAR struct nxplayer_s *pPlayer, int format,
int subfmt) int subfmt)
{ {
struct dirent* pDevice;
DIR* dirp;
char path[64];
struct audio_caps_s caps;
uint8_t supported = TRUE;
uint8_t x;
/* If we have a preferred device, then open it */ /* If we have a preferred device, then open it */
#ifdef CONFIG_NXPLAYER_INCLUDE_PREFERRED_DEVICE #ifdef CONFIG_NXPLAYER_INCLUDE_PREFERRED_DEVICE
@ -168,8 +161,8 @@ static int nxplayer_opendevice(FAR struct nxplayer_s *pPlayer, int format,
* format is specified by the device * format is specified by the device
*/ */
if (((pPlayer->prefformat & (1 << (format - 1)) == 0) || if ((pPlayer->prefformat & (1 << (format - 1))) == 0 ||
((pPlayer->preftype & AUDIO_TYPE_OUTPUT) == 0))) (pPlayer->preftype & AUDIO_TYPE_OUTPUT) == 0)
{ {
/* Format not supported by the device */ /* Format not supported by the device */
@ -195,6 +188,13 @@ static int nxplayer_opendevice(FAR struct nxplayer_s *pPlayer, int format,
#ifdef CONFIG_NXPLAYER_INCLUDE_DEVICE_SEARCH #ifdef CONFIG_NXPLAYER_INCLUDE_DEVICE_SEARCH
{ {
struct audio_caps_s caps;
FAR struct dirent *pDevice;
FAR DIR *dirp;
char path[64];
uint8_t supported = TRUE;
uint8_t x;
/* Search for a device in the audio device directory */ /* Search for a device in the audio device directory */
#ifdef CONFIG_AUDIO_CUSTOM_DEV_PATH #ifdef CONFIG_AUDIO_CUSTOM_DEV_PATH
@ -257,6 +257,7 @@ static int nxplayer_opendevice(FAR struct nxplayer_s *pPlayer, int format,
(unsigned long) &caps) == caps.ac_len) (unsigned long) &caps) == caps.ac_len)
{ {
/* Check the next set of 4 controls to find the subformat */ /* Check the next set of 4 controls to find the subformat */
for (x = 0; x < sizeof(caps.ac_controls); x++) for (x = 0; x < sizeof(caps.ac_controls); x++)
{ {
if (caps.ac_controls[x] == subfmt) if (caps.ac_controls[x] == subfmt)