mirror of
https://github.com/Rockbox/rockbox.git
synced 2025-12-06 21:25:03 -05:00
audio: Fix up most of the red from a79bdaf462
The rest involves some wrangling. Change-Id: I5459c255677cbacf8cc8b0c28492d27c58971cb1
This commit is contained in:
parent
a79bdaf462
commit
fd6d6c48b4
3 changed files with 11 additions and 8 deletions
|
|
@ -165,7 +165,7 @@ target/hosted/agptek/rocker_codec.c
|
||||||
target/hosted/surfans/button-f28.c
|
target/hosted/surfans/button-f28.c
|
||||||
target/hosted/surfans/debug-f28.c
|
target/hosted/surfans/debug-f28.c
|
||||||
target/hosted/surfans/powermgmt-f28.c
|
target/hosted/surfans/powermgmt-f28.c
|
||||||
target/hosted/surfanslinux_codec.c
|
target/hosted/surfans/surfanslinux_codec.c
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (defined(XDUOO_X3II) || defined(XDUOO_X20)) && !defined(SIMULATOR)
|
#if (defined(XDUOO_X3II) || defined(XDUOO_X20)) && !defined(SIMULATOR)
|
||||||
|
|
@ -180,7 +180,7 @@ target/hosted/usb-hiby.c
|
||||||
target/hosted/button-devinput.c
|
target/hosted/button-devinput.c
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR)
|
#if defined(FIIO_M3K_LINUX) && !defined(SIMULATOR)
|
||||||
target/hosted/fiio/buttonlight-fiio.c
|
target/hosted/fiio/buttonlight-fiio.c
|
||||||
target/hosted/fiio/button-fiio.c
|
target/hosted/fiio/button-fiio.c
|
||||||
target/hosted/fiio/debug-fiio.c
|
target/hosted/fiio/debug-fiio.c
|
||||||
|
|
@ -558,17 +558,17 @@ drivers/audio/es9018.c
|
||||||
drivers/audio/es9218.c
|
drivers/audio/es9218.c
|
||||||
#endif /* defined(HAVE_*) */
|
#endif /* defined(HAVE_*) */
|
||||||
#else /* PLATFORM_HOSTED */
|
#else /* PLATFORM_HOSTED */
|
||||||
#if defined(HAVE_AS3514)
|
#if defined(HAVE_SDL_AUDIO) || defined(SIMULATOR)
|
||||||
drivers/audio/as3514.c
|
|
||||||
#elif defined(HAVE_WM8978)
|
|
||||||
drivers/audio/wm8978.c
|
|
||||||
#elif defined(HAVE_SDL_AUDIO)
|
|
||||||
drivers/audio/sdl.c
|
drivers/audio/sdl.c
|
||||||
#if (CONFIG_PLATFORM & PLATFORM_MAEMO5)
|
#if (CONFIG_PLATFORM & PLATFORM_MAEMO5)
|
||||||
target/hosted/maemo/pcm-gstreamer.c
|
target/hosted/maemo/pcm-gstreamer.c
|
||||||
#else
|
#else
|
||||||
target/hosted/sdl/pcm-sdl.c
|
target/hosted/sdl/pcm-sdl.c
|
||||||
#endif /* (CONFIG_PLATFORM & PLATFORM_MAEMO) */
|
#endif /* (CONFIG_PLATFORM & PLATFORM_MAEMO) */
|
||||||
|
#elif defined(SAMSUNG_YPR0) && defined(HAVE_AS3514)
|
||||||
|
drivers/audio/as3514.c
|
||||||
|
#elif defined(SAMSUNG_YPR1) && defined(HAVE_WM8978)
|
||||||
|
drivers/audio/wm8978.c
|
||||||
#elif defined(CTRU)
|
#elif defined(CTRU)
|
||||||
drivers/audio/ctru.c
|
drivers/audio/ctru.c
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,8 @@
|
||||||
#ifndef __ANDROID_CODEC_H
|
#ifndef __ANDROID_CODEC_H
|
||||||
#define __ANDROID_CODEC_H
|
#define __ANDROID_CODEC_H
|
||||||
|
|
||||||
|
#define AUDIOHW_HAVE_MONO_VOLUME
|
||||||
|
|
||||||
/* Bass and treble tone controls */
|
/* Bass and treble tone controls */
|
||||||
#ifdef AUDIOHW_HAVE_BASS
|
#ifdef AUDIOHW_HAVE_BASS
|
||||||
AUDIOHW_SETTING(BASS, "dB", 0, 1, -24, 24, 0)
|
AUDIOHW_SETTING(BASS, "dB", 0, 1, -24, 24, 0)
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#define AUDIOHW_CAPS (FILTER_ROLL_OFF_CAP)
|
#define AUDIOHW_CAPS (FILTER_ROLL_OFF_CAP)
|
||||||
AUDIOHW_SETTING(VOLUME, "dB", 1, 5, -102*10, 0, -30*10)
|
AUDIOHW_SETTING(VOLUME, "dB", 1, 5, -102*10, 0, -30*10)
|
||||||
#endif
|
|
||||||
|
|
||||||
//#define AUDIOHW_MUTE_ON_STOP
|
//#define AUDIOHW_MUTE_ON_STOP
|
||||||
#define AUDIOHW_MUTE_ON_SRATE_CHANGE
|
#define AUDIOHW_MUTE_ON_SRATE_CHANGE
|
||||||
|
|
@ -15,3 +14,5 @@ AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 4, 0)
|
||||||
void audiohw_mute(int mute);
|
void audiohw_mute(int mute);
|
||||||
void surfans_set_output(int ps);
|
void surfans_set_output(int ps);
|
||||||
int surfans_get_outputs(void);
|
int surfans_get_outputs(void);
|
||||||
|
|
||||||
|
#endif /* __SURFANSLINUX__CODEC__ */
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue