summaryrefslogtreecommitdiffstats
path: root/apps/plugins/sdl/src
diff options
context:
space:
mode:
authorFranklin Wei <git@fwei.tk>2018-01-11 19:44:36 -0500
committerFranklin Wei <git@fwei.tk>2018-01-11 19:45:31 -0500
commitccd612345cb8bb6f28fe1258f2d98e90de63967d (patch)
treedd892ad21c0418055bfc9a916dabee1e9ebb741c /apps/plugins/sdl/src
parent0d794c0c06570decf030fae7e42993bc53c5ab57 (diff)
downloadrockbox-ccd612345cb8bb6f28fe1258f2d98e90de63967d.tar.gz
rockbox-ccd612345cb8bb6f28fe1258f2d98e90de63967d.tar.bz2
rockbox-ccd612345cb8bb6f28fe1258f2d98e90de63967d.zip
sdl: fix freeze on startup on PP targets
Using the coprocessor was a good idea in theory, but didn't actually work. This moves all SDL threads to the main core, which isn't ideal, but at least works. Additionally, this also adds some good-practice stuff such as setting the default sample rate on exit. Change-Id: If1636b33d439000ec7c4e50f46e8d002708d3121
Diffstat (limited to 'apps/plugins/sdl/src')
-rw-r--r--apps/plugins/sdl/src/audio/rockbox/SDL_rockboxaudio.c1
-rw-r--r--apps/plugins/sdl/src/thread/rockbox/SDL_systhread.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/apps/plugins/sdl/src/audio/rockbox/SDL_rockboxaudio.c b/apps/plugins/sdl/src/audio/rockbox/SDL_rockboxaudio.c
index 2df820bee5..05b6c55853 100644
--- a/apps/plugins/sdl/src/audio/rockbox/SDL_rockboxaudio.c
+++ b/apps/plugins/sdl/src/audio/rockbox/SDL_rockboxaudio.c
@@ -222,6 +222,7 @@ static void ROCKBOXAUD_CloseAudio(_THIS)
SDL_FreeAudioMem(this->hidden->rb_buf[i]);
}
rb->pcm_play_stop();
+ rb->pcm_set_frequency(HW_SAMPR_DEFAULT);
}
static int ROCKBOXAUD_OpenAudio(_THIS, SDL_AudioSpec *spec)
diff --git a/apps/plugins/sdl/src/thread/rockbox/SDL_systhread.c b/apps/plugins/sdl/src/thread/rockbox/SDL_systhread.c
index 214cbe4597..f9dc877815 100644
--- a/apps/plugins/sdl/src/thread/rockbox/SDL_systhread.c
+++ b/apps/plugins/sdl/src/thread/rockbox/SDL_systhread.c
@@ -58,7 +58,7 @@ int SDL_SYS_CreateThread(SDL_Thread *thread, void *args)
thread->handle = rb->create_thread(rbsdl_runthread, stacks[threadnum], DEFAULT_STACK_SIZE,
0, names[threadnum] /* collisions allowed? */
IF_PRIO(, PRIORITY_USER_INTERFACE)
- IF_COP(, COP));
+ IF_COP(, CPU));
threadnum++;