Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-01 07:45:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Audio: Fix some compilation issues introduced with some of the recent changes

Browse Source
This commit is contained in:
Gregory Nutt
2014-07-25 11:27:29 -06:00
parent ee113747f8
commit 014dd77237
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/audio/audio_null.c
+3
View File
@@ -583,6 +583,9 @@ static int null_stop(FAR struct audio_lowerhalf_s *dev)
FAR void *value; FAR void *value;
/* Send a message to stop all audio streaming */ /* Send a message to stop all audio streaming */
/* REVISIT: There should be a check to see if the worker thread is still
* running.
*/
term_msg.msgId = AUDIO_MSG_STOP; term_msg.msgId = AUDIO_MSG_STOP;
term_msg.u.data = 0; term_msg.u.data = 0;
drivers/audio/vs1053.c
+5 -5
View File
@@ -647,9 +647,9 @@ static int vs1053_getcaps(FAR struct audio_lowerhalf_s *lower, int type,
/* Report the Sample rates we support */ /* Report the Sample rates we support */
pCaps->ac_controls.b[0] = AUDIO_SAMP_RATE_8K | AUDIO_SAMP_RATE_11K | pCaps->ac_controls.b[0] = AUDIO_SAMP_RATE_8K | AUDIO_SAMP_RATE_11K |
AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K |
AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K |
AUDIO_SAMP_RATE_48K; AUDIO_SAMP_RATE_48K;
break; break;
case AUDIO_FMT_MP3: case AUDIO_FMT_MP3:
@@ -779,7 +779,7 @@ static int vs1053_configure(FAR struct audio_lowerhalf_s *lower,
case AUDIO_FU_VOLUME: case AUDIO_FU_VOLUME:
/* Set the volume */ /* Set the volume */
dev->volume = pCaps->ac_controls.hw[0]); dev->volume = pCaps->ac_controls.hw[0];
vs1053_setvolume(dev); vs1053_setvolume(dev);
break; break;
@@ -789,7 +789,7 @@ static int vs1053_configure(FAR struct audio_lowerhalf_s *lower,
case AUDIO_FU_BALANCE: case AUDIO_FU_BALANCE:
/* Set the volume */ /* Set the volume */
dev->balance = pCaps->ac_controls.hw[0]); dev->balance = pCaps->ac_controls.hw[0];
vs1053_setvolume(dev); vs1053_setvolume(dev);
break; break;
drivers/audio/wm8904.c
+4 -5
View File
@@ -563,8 +563,7 @@ static int wm8904_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
/* Fill in the caller's structure based on requested info */ /* Fill in the caller's structure based on requested info */
caps->ac_format[0] = 0; caps->ac_format.hw = 0;
caps->ac_format[1] = 0;
caps->ac_controls.w = 0; caps->ac_controls.w = 0;
switch (caps->ac_type) switch (caps->ac_type)
@@ -619,9 +618,9 @@ static int wm8904_getcaps(FAR struct audio_lowerhalf_s *dev, int type,
/* Report the Sample rates we support */ /* Report the Sample rates we support */
caps->ac_controls.b[0] = AUDIO_SAMP_RATE_8K | AUDIO_SAMP_RATE_11K | caps->ac_controls.b[0] = AUDIO_SAMP_RATE_8K | AUDIO_SAMP_RATE_11K |
AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K | AUDIO_SAMP_RATE_16K | AUDIO_SAMP_RATE_22K |
AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K | AUDIO_SAMP_RATE_32K | AUDIO_SAMP_RATE_44K |
AUDIO_SAMP_RATE_48K; AUDIO_SAMP_RATE_48K;
break; break;
case AUDIO_FMT_MP3: case AUDIO_FMT_MP3: