diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2003-03-25 02:13:54 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2003-03-25 02:13:54 +0000 |
commit | d0c193d1596973f193be8064947d42d95ee066bb (patch) | |
tree | 9bdaffdc2bfebebaacefc01b48ed2597538150d6 | |
parent | aa78324fde4a7d8df64506322aaaaa20c7d43efc (diff) | |
download | rockbox-d0c193d1596973f193be8064947d42d95ee066bb.tar.gz rockbox-d0c193d1596973f193be8064947d42d95ee066bb.zip |
Finally, S/PDIF monitoring works
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3499 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/recorder/recording.c | 5 | ||||
-rw-r--r-- | firmware/mpeg.c | 8 |
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) | |||
160 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); | 160 | mpeg_sound_set(SOUND_VOLUME, global_settings.volume); |
161 | 161 | ||
162 | status_set_playmode(STATUS_STOP); | 162 | status_set_playmode(STATUS_STOP); |
163 | 163 | ||
164 | peak_meter_playback(false); | 164 | /* Yes, we use the D/A for monitoring */ |
165 | peak_meter_playback(true); | ||
165 | 166 | ||
166 | peak_meter_enabled = true; | 167 | peak_meter_enabled = true; |
167 | 168 | ||
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) | |||
2101 | /* Copy left channel to right (mono mode) */ | 2101 | /* Copy left channel to right (mono mode) */ |
2102 | mas_codec_writereg(8, 0x8000); | 2102 | mas_codec_writereg(8, 0x8000); |
2103 | 2103 | ||
2104 | /* ADC scale 100%, DSP scale 0% */ | 2104 | /* ADC scale 0%, DSP scale 100% |
2105 | mas_codec_writereg(6, 0x4000); | 2105 | We use the DSP output for monitoring, because it works with all |
2106 | mas_codec_writereg(7, 0x0000); | 2106 | sources including S/PDIF */ |
2107 | mas_codec_writereg(6, 0x0000); | ||
2108 | mas_codec_writereg(7, 0x4000); | ||
2107 | 2109 | ||
2108 | /* No mute */ | 2110 | /* No mute */ |
2109 | val = 0; | 2111 | val = 0; |