diff options
author | Solomon Peachy <pizza@shaftnet.org> | 2021-04-08 21:56:23 -0400 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2021-04-08 21:58:08 -0400 |
commit | e17337c9aab231875234e0485f7175a5a613fb4c (patch) | |
tree | 683c267017b8c9da900e0365b4daaaff888d9ad3 | |
parent | ad55da5f87261d3e855998b02cc811581abe861c (diff) | |
download | rockbox-e17337c9aab231875234e0485f7175a5a613fb4c.tar.gz rockbox-e17337c9aab231875234e0485f7175a5a613fb4c.zip |
ErosQ: fix panic on startup caused by ad55da5f
It turns out #include "settings.h" pulls in rbpaths.h which ends up
remapping open() to the path-mangling rockbox open().
By defining RB_FILESYSTEM_OS we prevent the remap. My mistake for not
testing this before committing!
Change-Id: I2978eb7b413693c4cb887b7ac7b2457780db7d25
-rw-r--r-- | firmware/drivers/audio/erosqlinux_codec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/firmware/drivers/audio/erosqlinux_codec.c b/firmware/drivers/audio/erosqlinux_codec.c index 2812960cb4..b1c5aa0c4f 100644 --- a/firmware/drivers/audio/erosqlinux_codec.c +++ b/firmware/drivers/audio/erosqlinux_codec.c | |||
@@ -20,6 +20,8 @@ | |||
20 | * KIND, either express or implied. | 20 | * KIND, either express or implied. |
21 | * | 21 | * |
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | #define RB_FILESYSTEM_OS // VERY important this is before settings.h | ||
24 | // because that pulls in rbpaths.h which breaks open() | ||
23 | 25 | ||
24 | //#define LOGF_ENABLE | 26 | //#define LOGF_ENABLE |
25 | 27 | ||
@@ -204,8 +206,7 @@ void audiohw_set_lineout_volume(int vol_l, int vol_r) | |||
204 | (void)vol_r; | 206 | (void)vol_r; |
205 | 207 | ||
206 | if (lineout_inserted()) { | 208 | if (lineout_inserted()) { |
207 | l = -180; | 209 | l = r = global_settings.volume_limit; |
208 | r = -180; | ||
209 | } else { | 210 | } else { |
210 | l = vol_l_hw; | 211 | l = vol_l_hw; |
211 | r = vol_r_hw; | 212 | r = vol_r_hw; |