Rockbox open source high quality audio player as a Music Player Daemon
mpris
rockbox
mpd
libadwaita
audio
rust
zig
deno
Fix multidrive/multivolume hosted builds.
Generalize the fix in 2348779ae6 to apply to hosted as well as simulator
builds. Original regression introduced in c0ac043c6d
Change-Id: Ia786533cc318555e3bb842eb21a73a1f76888379
+9
-6
+9
apps/main.c
+9
apps/main.c
···
131
131
#define MAIN_NORETURN_ATTR
132
132
#endif
133
133
134
+
#if (CONFIG_PLATFORM & PLATFORM_HOSTED)
135
+
#ifdef HAVE_MULTIVOLUME
136
+
#include "pathfuncs.h" /* for init_volume_names */
137
+
#endif
138
+
#endif
139
+
134
140
#if (CONFIG_PLATFORM & (PLATFORM_SDL|PLATFORM_MAEMO|PLATFORM_PANDORA))
135
141
#ifdef SIMULATOR
136
142
#include "sim_tasks.h"
···
381
387
powermgmt_init();
382
388
backlight_init();
383
389
unicode_init();
390
+
#ifdef HAVE_MULTIVOLUME
391
+
init_volume_names();
392
+
#endif
384
393
#ifdef SIMULATOR
385
394
sim_tasks_init();
386
395
#endif
-6
uisimulator/common/sim_tasks.c
-6
uisimulator/common/sim_tasks.c
···
30
30
#include "usb.h"
31
31
#include "mv.h"
32
32
#include "ata_idle_notify.h"
33
-
#ifdef HAVE_MULTIVOLUME
34
-
#include "pathfuncs.h" /* for init_volume_names */
35
-
#endif
36
33
37
34
#ifdef WIN32
38
35
#include <windows.h>
···
137
134
138
135
void sim_tasks_init(void)
139
136
{
140
-
#ifdef HAVE_MULTIVOLUME
141
-
init_volume_names();
142
-
#endif
143
137
queue_init(&sim_queue, false);
144
138
145
139
create_thread(sim_thread, sim_thread_stack, sizeof(sim_thread_stack), 0,