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 @@ * KIND, either express or implied. * ****************************************************************************/ +#define RB_FILESYSTEM_OS // VERY important this is before settings.h + // because that pulls in rbpaths.h which breaks open() //#define LOGF_ENABLE @@ -204,8 +206,7 @@ void audiohw_set_lineout_volume(int vol_l, int vol_r) (void)vol_r; if (lineout_inserted()) { - l = -180; - r = -180; + l = r = global_settings.volume_limit; } else { l = vol_l_hw; r = vol_r_hw; |