diff options
-rw-r--r-- | apps/recorder/recording.c | 2 | ||||
-rw-r--r-- | firmware/sound.c | 22 |
2 files changed, 22 insertions, 2 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index d7bea6f898..5738a34949 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -1529,10 +1529,12 @@ bool recording_screen(bool no_source) | |||
1529 | { | 1529 | { |
1530 | switch (global_settings.rec_source) | 1530 | switch (global_settings.rec_source) |
1531 | { | 1531 | { |
1532 | #if defined(HAVE_LINE_REC) || defined(HAVE_FMRADIO_REC) | ||
1532 | HAVE_LINE_REC_(case AUDIO_SRC_LINEIN:) | 1533 | HAVE_LINE_REC_(case AUDIO_SRC_LINEIN:) |
1533 | HAVE_FMRADIO_REC_(case AUDIO_SRC_FMRADIO:) | 1534 | HAVE_FMRADIO_REC_(case AUDIO_SRC_FMRADIO:) |
1534 | line[i] = 5; | 1535 | line[i] = 5; |
1535 | break; | 1536 | break; |
1537 | #endif | ||
1536 | case AUDIO_SRC_MIC: | 1538 | case AUDIO_SRC_MIC: |
1537 | line[i] = 4; | 1539 | line[i] = 4; |
1538 | break; | 1540 | break; |
diff --git a/firmware/sound.c b/firmware/sound.c index 0ccf1df260..30b9b6a2d2 100644 --- a/firmware/sound.c +++ b/firmware/sound.c | |||
@@ -743,7 +743,7 @@ void sound_set(int setting, int value) | |||
743 | sound_set_val(value); | 743 | sound_set_val(value); |
744 | } | 744 | } |
745 | 745 | ||
746 | #ifndef HAVE_AS3514 | 746 | #if !defined(HAVE_AS3514) || defined(SIMULATOR) |
747 | int sound_val2phys(int setting, int value) | 747 | int sound_val2phys(int setting, int value) |
748 | { | 748 | { |
749 | #if CONFIG_CODEC == MAS3587F | 749 | #if CONFIG_CODEC == MAS3587F |
@@ -800,12 +800,30 @@ int sound_val2phys(int setting, int value) | |||
800 | break; | 800 | break; |
801 | } | 801 | } |
802 | return result; | 802 | return result; |
803 | #elif defined(HAVE_AS3514) | ||
804 | /* This is here for the sim only and the audio driver has its own */ | ||
805 | int result; | ||
806 | |||
807 | switch(setting) | ||
808 | { | ||
809 | case SOUND_LEFT_GAIN: | ||
810 | case SOUND_RIGHT_GAIN: | ||
811 | case SOUND_MIC_GAIN: | ||
812 | result = (value - 23) * 15; | ||
813 | break; | ||
814 | |||
815 | default: | ||
816 | result = value; | ||
817 | break; | ||
818 | } | ||
819 | |||
820 | return result; | ||
803 | #else | 821 | #else |
804 | (void)setting; | 822 | (void)setting; |
805 | return value; | 823 | return value; |
806 | #endif | 824 | #endif |
807 | } | 825 | } |
808 | #endif /* HAVE_AS3514 */ | 826 | #endif /* !defined(HAVE_AS3514) || defined(SIMULATOR) */ |
809 | 827 | ||
810 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) | 828 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
811 | #ifndef SIMULATOR | 829 | #ifndef SIMULATOR |