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-a96eb1a7f7aff5aea41c14b9edcec34564ab27b6.tar.gz rockbox-a96eb1a7f7aff5aea41c14b9edcec34564ab27b6.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) | |||
534 | #ifdef HAVE_LINEOUT_POWEROFF | 534 | #ifdef HAVE_LINEOUT_POWEROFF |
535 | lineout_set(inserted); | 535 | lineout_set(inserted); |
536 | #else | 536 | #else |
537 | #ifdef AUDIOHW_HAVE_LINEOUT | ||
537 | audiohw_set_lineout_volume(0,0); /*hp vol re-set by this function as well*/ | 538 | audiohw_set_lineout_volume(0,0); /*hp vol re-set by this function as well*/ |
539 | #endif | ||
538 | static bool lineout_caused_pause = true; | 540 | static bool lineout_caused_pause = true; |
539 | 541 | ||
540 | if (global_settings.unplug_mode) | 542 | 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) | |||
66 | } | 66 | } |
67 | #endif /* AUDIOHW_HAVE_MONO_VOLUME */ | 67 | #endif /* AUDIOHW_HAVE_MONO_VOLUME */ |
68 | 68 | ||
69 | #ifdef AUDIOHW_HAVE_LINEOUT | ||
70 | void audiohw_set_lineout_volume(int vol_l, int vol_r) | ||
71 | { | ||
72 | (void)vol_l; (void)vol_r; | ||
73 | } | ||
74 | #endif | ||
75 | |||
69 | #if defined(AUDIOHW_HAVE_PRESCALER) | 76 | #if defined(AUDIOHW_HAVE_PRESCALER) |
70 | void audiohw_set_prescaler(int value) | 77 | void audiohw_set_prescaler(int value) |
71 | { | 78 | { |
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 @@ | |||
36 | #include "kernel.h" | 36 | #include "kernel.h" |
37 | #include "backlight.h" | 37 | #include "backlight.h" |
38 | #include "backlight-target.h" | 38 | #include "backlight-target.h" |
39 | #include "xduoolinux_codec.h" | ||
39 | 40 | ||
40 | static bool soft_hold = false; | 41 | static bool soft_hold = false; |
41 | #ifndef BOOTLOADER | 42 | #ifndef BOOTLOADER |