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

system/nxplayer/nxplayer.c: Fix build error when only enable CONFIG_AUDIO_EXCLUDE_VOLUME is enabled.

Browse Source
This commit is contained in:
ZhongAn 2019-01-27 07:31:40 -06:00 committed by Gregory Nutt
parent 557cd8e454
commit 97acb41b90
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
system/nxplayer/nxplayer.c
View File

@ -969,11 +969,10 @@ static void *nxplayer_playthread(pthread_addr_t pvarg)
#ifndef CONFIG_AUDIO_EXCLUDE_VOLUME
(void)nxplayer_setvolume(pPlayer, pPlayer->volume);
#endif
#ifndef CONFIG_AUDIO_EXCLUDE_BALANCE
nxplayer_setbalance(pPlayer, pPlayer->balance);
#endif
#endif
#ifndef CONFIG_AUDIO_EXCLUDE_TONE
nxplayer_setbass(pPlayer, pPlayer->bass);
@ -1411,6 +1410,7 @@ int nxplayer_settreble(FAR struct nxplayer_s *pPlayer, uint8_t level)
*
****************************************************************************/
#ifndef CONFIG_AUDIO_EXCLUDE_VOLUME
#ifndef CONFIG_AUDIO_EXCLUDE_BALANCE
int nxplayer_setbalance(FAR struct nxplayer_s *pPlayer, uint16_t balance)
{
@ -1450,6 +1450,7 @@ int nxplayer_setbalance(FAR struct nxplayer_s *pPlayer, uint16_t balance)
return -ENOENT;
}
#endif
#endif
/****************************************************************************
* Name: nxplayer_pause
@ -2155,12 +2156,11 @@ FAR struct nxplayer_s *nxplayer_create(void)
pPlayer->treble = 50;
#endif
#ifndef CONFIG_AUDIO_EXCLUDE_VOLUME
pPlayer->volume = 400;
#ifndef CONFIG_AUDIO_EXCLUDE_BALANCE
pPlayer->balance = 500;
#endif
#ifndef CONFIG_AUDIO_EXCLUDE_VOLUME
pPlayer->volume = 400;
#endif
#ifdef CONFIG_AUDIO_MULTI_SESSION