3 files changed, 23 insertions, 15 deletions

diff --git a/firmware/drivers/audio/erosqlinux_codec.c b/firmware/drivers/audio/erosqlinux_codec.c
index 9336083d58..d56e32c6ff 100644
--- a/firmware/drivers/audio/erosqlinux_codec.c
+++ b/firmware/drivers/audio/erosqlinux_codec.c
@@ -42,7 +42,7 @@ static int inited = 0;
 
 static long int vol_l_hw = 255;
 static long int vol_r_hw = 255;
-static long int last_ps = 0;
+static long int last_ps = -1;
 
 static void hw_open(void)
 {
@@ -62,6 +62,11 @@ void audiohw_mute(int mute)
 {
     logf("mute %d", mute);
 
+    if (muted == mute)
+       return;
+
+    muted = mute;
+
     if(mute)
     {
         long int ps0 = 0;
@@ -69,10 +74,8 @@ void audiohw_mute(int mute)
     }
     else
     {
-        last_ps = 0;
         erosq_get_outputs();
     }
-    muted = mute;
 }
 
 int erosq_get_outputs(void) {
@@ -115,14 +118,14 @@ void audiohw_preinit(void)
     logf("hw preinit");
     alsa_controls_init();
     hw_open();
-    audiohw_mute(true);  /* Start muted to avoid the POP */
+//    audiohw_mute(true);  /* Start muted to avoid the POP */
+    audiohw_mute(false);
     inited = 1;
 }
 
 void audiohw_postinit(void)
 {
     logf("hw postinit");
-    erosq_get_outputs(); // Unmutes
 }
 
 void audiohw_close(void)
diff --git a/firmware/drivers/audio/rocker_codec.c b/firmware/drivers/audio/rocker_codec.c
index e5573df843..e34cb87e9b 100644
--- a/firmware/drivers/audio/rocker_codec.c
+++ b/firmware/drivers/audio/rocker_codec.c
@@ -32,6 +32,8 @@ static int fd_hw;
 static long int vol_l_hw = 255;
 static long int vol_r_hw = 255;
 
+static int muted = -1;
+
 static void hw_open(void)
 {
     fd_hw = open("/dev/snd/controlC0", O_RDWR);
@@ -46,6 +48,11 @@ static void hw_close(void)
 
 void audiohw_mute(int mute)
 {
+    if (muted == mute)
+       return;
+
+    muted = mute;
+
     if(mute)
     {
         long int ps0 = 0;
@@ -67,10 +74,7 @@ void audiohw_preinit(void)
 
 void audiohw_postinit(void)
 {
-    long int hp = 2;
-
-    /* Output port switch set to Headphones */
-    //alsa_controls_set_ints("Output Port Switch", 1, &hp); // Unmute happens on PCM start
+    logf("hw postinit");
 }
 
 void audiohw_close(void)
diff --git a/firmware/drivers/audio/xduoolinux_codec.c b/firmware/drivers/audio/xduoolinux_codec.c
index 59ef562d0a..f9642812d3 100644
--- a/firmware/drivers/audio/xduoolinux_codec.c
+++ b/firmware/drivers/audio/xduoolinux_codec.c
@@ -41,7 +41,7 @@ static int inited = 0;
 
 static long int vol_l_hw = 255;
 static long int vol_r_hw = 255;
-static long int last_ps = 0;
+static long int last_ps = -1;
 
 static void hw_open(void)
 {
@@ -61,6 +61,11 @@ void audiohw_mute(int mute)
 {
     logf("mute %d", mute);
 
+    if (muted == mute)
+       return;
+
+    muted = mute;
+
     if(mute)
     {
         long int ps0 = 0;
@@ -68,10 +73,8 @@ void audiohw_mute(int mute)
     }
     else
     {
-        last_ps = 0;
         xduoo_get_outputs();
     }
-    muted = mute;
 }
 
 int xduoo_get_outputs(void){
@@ -124,14 +127,12 @@ void audiohw_preinit(void)
     hw_open();
     audiohw_mute(true);  /* Start muted to avoid the POP */
     inited = 1;
+//    const char * const codec_pmdown = "/sys/devices/platform/ingenic-x3ii.0/x3ii-ak4490-i2s/pmdown_time";  // in ms, defaults 5000
 }
 
 void audiohw_postinit(void)
 {
-//    const char * const codec_pmdown = "/sys/devices/platform/ingenic-x3ii.0/x3ii-ak4490-i2s/pmdown_time";  // in ms, defaults 5000
-
     logf("hw postinit");
-    // xduoo_get_outputs(); // Unmute happens upon playback.
 }
 
 void audiohw_close(void)