2 files changed, 13 insertions, 12 deletions

diff --git a/firmware/export/pcm_playback.h b/firmware/export/pcm_playback.h
index 3972e45768..5b61beb34d 100644
--- a/firmware/export/pcm_playback.h
+++ b/firmware/export/pcm_playback.h
@@ -29,6 +29,7 @@ void pcm_calculate_peaks(int *left, int *right);
 long pcm_get_bytes_waiting(void);
 
 void pcm_play_stop(void);
+void pcm_mute(bool mute);
 void pcm_play_pause(bool play);
 bool pcm_is_paused(void);
 bool pcm_is_playing(void);
diff --git a/firmware/pcm_playback.c b/firmware/pcm_playback.c
index 6a190e4d23..ccac7843ad 100644
--- a/firmware/pcm_playback.c
+++ b/firmware/pcm_playback.c
@@ -75,11 +75,6 @@ static void dma_start(const void *addr, long size)
     EBU1CONFIG = IIS_RESET | EBU_DEFPARM;
 #endif
 
-    /** Prevent a very tiny pop from happening by muting audio
-     * until dma has been initialized. */
-    uda1380_mute(true);
-    sleep(HZ/16);
-    
     /* Set up DMA transfer  */
     SAR0 = ((unsigned long)addr); /* Source address */
     DAR0 = (unsigned long)&PDOR3; /* Destination address */
@@ -92,9 +87,6 @@ static void dma_start(const void *addr, long size)
     EBU1CONFIG = EBU_DEFPARM;
 #endif
     DCR0 = DMA_INT | DMA_EEXT | DMA_CS | DMA_SINC | DMA_START;
-
-    /* Now unmute the audio. */
-    uda1380_mute(false);
 }
 
 /* Stops the DMA transfer and interrupt */
@@ -220,14 +212,17 @@ long pcm_get_bytes_waiting(void)
     return next_size + (BCR0 & 0xffffff);
 }
 
+void pcm_mute(bool mute)
+{
+    uda1380_mute(mute);
+    if (mute)
+        sleep(HZ/16);
+}
+
 void pcm_play_stop(void)
 {
     if (pcm_playing) {
-        /* Same muting trick here to prevent a tiny pop. */
-        uda1380_mute(true);
-        sleep(HZ/16);
         dma_stop();
-        uda1380_mute(false);
     }
 }
 
@@ -465,6 +460,11 @@ void pcm_play_stop(void)
     }
 }
 
+void pcm_mute(bool mute)
+{
+    (void)mute;
+}
+
 void pcm_play_pause(bool play)
 {
     if(pcm_paused && play && next_size)