summaryrefslogtreecommitdiff
path: root/firmware/target/hosted
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-04-11 18:57:06 -0400
committerMichael Sevakis <jethead71@rockbox.org>2013-04-11 19:00:23 -0400
commit2dd1f37a109792b262a4000c050f7a48a145f1c4 (patch)
treec76ac85fd65972956ffe994158cc5ae9b43c99ca /firmware/target/hosted
parentf5a5b946867677de76c405ee72e2ea47e36e4c83 (diff)
downloadrockbox-2dd1f37a109792b262a4000c050f7a48a145f1c4.tar.gz
rockbox-2dd1f37a109792b262a4000c050f7a48a145f1c4.zip
Fix f5a5b94 errors. Employ SW volume for select targets on SIM.
Onda VX747 sim was missing a limits #define; #include limits.h in pcm_sw_volume.h. Simply use the software volume control for the SIM volume control rather than the SDL volume control when the target would have it natively. Change-Id: I8e924a2ff1b410f602452d2ea9b691efb82c931e
Diffstat (limited to 'firmware/target/hosted')
-rw-r--r--firmware/target/hosted/sdl/pcm-sdl.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/firmware/target/hosted/sdl/pcm-sdl.c b/firmware/target/hosted/sdl/pcm-sdl.c
index bd56189f02..812211288e 100644
--- a/firmware/target/hosted/sdl/pcm-sdl.c
+++ b/firmware/target/hosted/sdl/pcm-sdl.c
@@ -51,7 +51,11 @@
51extern bool debug_audio; 51extern bool debug_audio;
52#endif 52#endif
53 53
54#ifdef HAVE_SW_VOLUME_CONTROL
55static int sim_volume = SDL_MIX_MAXVOLUME;
56#else
54static int sim_volume = 0; 57static int sim_volume = 0;
58#endif
55 59
56#if CONFIG_CODEC == SWCODEC 60#if CONFIG_CODEC == SWCODEC
57static int cvt_status = -1; 61static int cvt_status = -1;
@@ -414,9 +418,11 @@ void pcm_play_dma_postinit(void)
414{ 418{
415} 419}
416 420
421#ifndef HAVE_SW_VOLUME_CONTROL
417void pcm_set_mixer_volume(int volume) 422void pcm_set_mixer_volume(int volume)
418{ 423{
419 sim_volume = volume; 424 sim_volume = volume;
420} 425}
426#endif /* HAVE_SW_VOLUME_CONTROL */
421 427
422#endif /* CONFIG_CODEC == SWCODEC */ 428#endif /* CONFIG_CODEC == SWCODEC */