Accept FS#7178 - Sansa e200 FM tuner support by Ivan Zupan. Do the needed integration work into recording and the AS3514 audio driver. Do a little AS3514 fiq_record tweak to have it all work nicely from the start.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13573 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 3 insertions, 1 deletions

diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c
index 982bbe16d3..12a72fe0dd 100644
--- a/firmware/drivers/audio/as3514.c
+++ b/firmware/drivers/audio/as3514.c
@@ -402,7 +402,6 @@ void audiohw_set_monitor(int enable)
 
     if (enable) {
         source = SOURCE_LINE_IN1_ANALOG;
-        audiohw_set_master_vol(as3514.vol_l, as3514.vol_r);
 
         /* LI1R_Mute_off */
         line_in1_r |= (1 << 5);
@@ -415,4 +414,7 @@ void audiohw_set_monitor(int enable)
     as3514_write(AUDIOSET1, audioset1);
     as3514_write(LINE_IN1_R, line_in1_r);
     as3514_write(LINE_IN1_L, line_in1_l);
+
+    /* Sync mixer volume */
+    audiohw_set_master_vol(as3514.vol_l, as3514.vol_r);
 }