1 files changed, 24 insertions, 0 deletions

diff --git a/firmware/drivers/audio/android.c b/firmware/drivers/audio/android.c
index 7a5f34ea48..f26087470b 100644
--- a/firmware/drivers/audio/android.c
+++ b/firmware/drivers/audio/android.c
@@ -22,12 +22,34 @@
 
 #include "config.h"
 #include "audiohw.h"
+#if defined(DX50) || defined(DX90)
+#include "system.h"
+#include "pcm_sw_volume.h"
+#endif
 
+#if defined(DX50) || defined(DX90)
+void audiohw_set_volume(int vol_l, int vol_r)
+{
+    int hw_volume;
+    hw_volume = MAX(vol_l, vol_r);
+
+#ifdef HAVE_SW_VOLUME_CONTROL
+    vol_l-=hw_volume;
+    vol_r-=hw_volume;
+    pcm_set_master_volume(vol_l, vol_r);
+#endif
+
+    extern void pcm_set_mixer_volume(int);
+    pcm_set_mixer_volume(hw_volume);
+
+}
+#else
 void audiohw_set_volume(int volume)
 {
     extern void pcm_set_mixer_volume(int);
     pcm_set_mixer_volume(volume);
 }
+#endif
 
 void audiohw_set_balance(int balance)
 {
@@ -36,6 +58,8 @@ void audiohw_set_balance(int balance)
 
 void audiohw_close(void)
 {
+#if !defined(DX50) && !defined(DX90)
     extern void pcm_shutdown(void);
     pcm_shutdown();
+#endif
 }