summaryrefslogtreecommitdiff
path: root/firmware/drivers/audio/android.c
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/drivers/audio/android.c')
-rw-r--r--firmware/drivers/audio/android.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/firmware/drivers/audio/android.c b/firmware/drivers/audio/android.c
index f26087470b..7a5f34ea48 100644
--- a/firmware/drivers/audio/android.c
+++ b/firmware/drivers/audio/android.c
@@ -22,34 +22,12 @@
22 22
23#include "config.h" 23#include "config.h"
24#include "audiohw.h" 24#include "audiohw.h"
25#if defined(DX50) || defined(DX90)
26#include "system.h"
27#include "pcm_sw_volume.h"
28#endif
29 25
30#if defined(DX50) || defined(DX90)
31void audiohw_set_volume(int vol_l, int vol_r)
32{
33 int hw_volume;
34 hw_volume = MAX(vol_l, vol_r);
35
36#ifdef HAVE_SW_VOLUME_CONTROL
37 vol_l-=hw_volume;
38 vol_r-=hw_volume;
39 pcm_set_master_volume(vol_l, vol_r);
40#endif
41
42 extern void pcm_set_mixer_volume(int);
43 pcm_set_mixer_volume(hw_volume);
44
45}
46#else
47void audiohw_set_volume(int volume) 26void audiohw_set_volume(int volume)
48{ 27{
49 extern void pcm_set_mixer_volume(int); 28 extern void pcm_set_mixer_volume(int);
50 pcm_set_mixer_volume(volume); 29 pcm_set_mixer_volume(volume);
51} 30}
52#endif
53 31
54void audiohw_set_balance(int balance) 32void audiohw_set_balance(int balance)
55{ 33{
@@ -58,8 +36,6 @@ void audiohw_set_balance(int balance)
58 36
59void audiohw_close(void) 37void audiohw_close(void)
60{ 38{
61#if !defined(DX50) && !defined(DX90)
62 extern void pcm_shutdown(void); 39 extern void pcm_shutdown(void);
63 pcm_shutdown(); 40 pcm_shutdown();
64#endif
65} 41}