summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-06-30 20:08:08 -0400
committerMichael Sevakis <jethead71@rockbox.org>2013-06-30 20:14:06 -0400
commitbb87590e05f6e5c3839bcebe84fb221396905294 (patch)
tree74307cd50c203140c4f3aa0a08b3d3cfe84f206c
parent9b990bdab1eda4d242346a0614b9410993ab275a (diff)
downloadrockbox-bb87590e05f6e5c3839bcebe84fb221396905294.tar.gz
rockbox-bb87590e05f6e5c3839bcebe84fb221396905294.zip
Temporarily disable keyclick in recording screen.
Those who have keyclick enabled and are really eagar to record upon boot can get the samplerate messed up because who gets to set the sample rate last (recording or mixer) is not currently deterministic. Change-Id: Icc43ed789cf23f928ca49657cb146445b0c558cb
-rw-r--r--apps/recorder/recording.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index e246825443..11a03fd9f4 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -1074,6 +1074,10 @@ bool recording_screen(bool no_source)
1074#endif 1074#endif
1075 1075
1076#if CONFIG_CODEC == SWCODEC 1076#if CONFIG_CODEC == SWCODEC
1077 /* hardware samplerate gets messed up so prevent mixer playing */
1078 int keyclick = global_settings.keyclick;
1079 global_settings.keyclick = 0;
1080
1077 /* recording_menu gets messed up: so prevent manus talking */ 1081 /* recording_menu gets messed up: so prevent manus talking */
1078 talk_disable(true); 1082 talk_disable(true);
1079 /* audio_init_recording stops anything playing when it takes the audio 1083 /* audio_init_recording stops anything playing when it takes the audio
@@ -1956,6 +1960,9 @@ rec_abort:
1956 1960
1957 /* restore talking */ 1961 /* restore talking */
1958 talk_disable(false); 1962 talk_disable(false);
1963
1964 /* restore keyclick */
1965 global_settings.keyclick = keyclick;
1959#else /* !SWCODEC */ 1966#else /* !SWCODEC */
1960 audio_init_playback(); 1967 audio_init_playback();
1961#endif /* CONFIG_CODEC == SWCODEC */ 1968#endif /* CONFIG_CODEC == SWCODEC */