diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-01 16:08:20 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-01 16:08:20 -0400 |
| commit | a96eb1a7f7aff5aea41c14b9edcec34564ab27b6 (patch) | |
| tree | 959b4bccfa17ac292cb3849cf488f5b69a519fb2 | |
| parent | b030bf5885dc5e018dd38eacbb294f1321f2b400 (diff) | |
| download | rockbox-a96eb1a.tar.gz rockbox-a96eb1a.zip | |
Fix warnings and errors introduced in b030bf5
Change-Id: I23966b6a79c0d2cbab2e01c649c1b991f460d8ad
| -rw-r--r-- | apps/misc.c | 2 | ||||
| -rw-r--r-- | firmware/drivers/audio/sdl.c | 7 | ||||
| -rw-r--r-- | firmware/target/hosted/xduoo/button-xduoo.c | 1 |
3 files changed, 10 insertions, 0 deletions
diff --git a/apps/misc.c b/apps/misc.c index d255eaf766..7d4ca97ff8 100644 --- a/apps/misc.c +++ b/apps/misc.c @@ -534,7 +534,9 @@ static void lo_unplug_change(bool inserted) #ifdef HAVE_LINEOUT_POWEROFF lineout_set(inserted); #else +#ifdef AUDIOHW_HAVE_LINEOUT audiohw_set_lineout_volume(0,0); /*hp vol re-set by this function as well*/ +#endif static bool lineout_caused_pause = true; if (global_settings.unplug_mode) diff --git a/firmware/drivers/audio/sdl.c b/firmware/drivers/audio/sdl.c index fb49a291d1..148dbf00e7 100644 --- a/firmware/drivers/audio/sdl.c +++ b/firmware/drivers/audio/sdl.c @@ -66,6 +66,13 @@ void audiohw_set_volume(int vol_l, int vol_r) } #endif /* AUDIOHW_HAVE_MONO_VOLUME */ +#ifdef AUDIOHW_HAVE_LINEOUT +void audiohw_set_lineout_volume(int vol_l, int vol_r) +{ + (void)vol_l; (void)vol_r; +} +#endif + #if defined(AUDIOHW_HAVE_PRESCALER) void audiohw_set_prescaler(int value) { diff --git a/firmware/target/hosted/xduoo/button-xduoo.c b/firmware/target/hosted/xduoo/button-xduoo.c index 03bb7bbfc9..605cd18736 100644 --- a/firmware/target/hosted/xduoo/button-xduoo.c +++ b/firmware/target/hosted/xduoo/button-xduoo.c @@ -36,6 +36,7 @@ #include "kernel.h" #include "backlight.h" #include "backlight-target.h" +#include "xduoolinux_codec.h" static bool soft_hold = false; #ifndef BOOTLOADER |