2 files changed, 8 insertions, 5 deletions

diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index 96cea40648..3696349a6f 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -160,8 +160,9 @@ bool recording_screen(void)
     mpeg_sound_set(SOUND_VOLUME, global_settings.volume);
     
     status_set_playmode(STATUS_STOP);
-    
-    peak_meter_playback(false);
+
+    /* Yes, we use the D/A for monitoring */
+    peak_meter_playback(true);
     
     peak_meter_enabled = true;
 
diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index d191a30149..bd90e9f1d6 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -2101,9 +2101,11 @@ static void init_recording(void)
     /* Copy left channel to right (mono mode) */
     mas_codec_writereg(8, 0x8000);
     
-    /* ADC scale 100%, DSP scale 0% */
-    mas_codec_writereg(6, 0x4000);
-    mas_codec_writereg(7, 0x0000);
+    /* ADC scale 0%, DSP scale 100%
+       We use the DSP output for monitoring, because it works with all
+       sources including S/PDIF */
+    mas_codec_writereg(6, 0x0000);
+    mas_codec_writereg(7, 0x4000);
 
     /* No mute */
     val = 0;