From 2dd1f37a109792b262a4000c050f7a48a145f1c4 Mon Sep 17 00:00:00 2001 From: Michael Sevakis Date: Thu, 11 Apr 2013 18:57:06 -0400 Subject: 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 --- firmware/target/hosted/sdl/pcm-sdl.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'firmware/target') 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 @@ extern bool debug_audio; #endif +#ifdef HAVE_SW_VOLUME_CONTROL +static int sim_volume = SDL_MIX_MAXVOLUME; +#else static int sim_volume = 0; +#endif #if CONFIG_CODEC == SWCODEC static int cvt_status = -1; @@ -414,9 +418,11 @@ void pcm_play_dma_postinit(void) { } +#ifndef HAVE_SW_VOLUME_CONTROL void pcm_set_mixer_volume(int volume) { sim_volume = volume; } +#endif /* HAVE_SW_VOLUME_CONTROL */ #endif /* CONFIG_CODEC == SWCODEC */ -- cgit v1.2.3