summaryrefslogtreecommitdiffstats
path: root/apps/settings.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2013-05-23 13:58:51 -0400
committerMichael Sevakis <jethead71@rockbox.org>2013-07-06 04:22:04 +0200
commitd37bf24d9011addbfbd40942a4e9bbf26de7df00 (patch)
treedafb7eaeb494081668a4841d490fce2bfbb2438d /apps/settings.c
parent00faabef5e902008172e08d3bcd77683cbafef51 (diff)
downloadrockbox-d37bf24d9011addbfbd40942a4e9bbf26de7df00.tar.gz
rockbox-d37bf24d9011addbfbd40942a4e9bbf26de7df00.tar.bz2
rockbox-d37bf24d9011addbfbd40942a4e9bbf26de7df00.zip
Enable setting of global output samplerate on certain targets.
Replaces the NATIVE_FREQUENCY constant with a configurable frequency. The user may select 48000Hz if the hardware supports it. The default is still 44100Hz and the minimum is 44100Hz. The setting is located in the playback settings, under "Frequency". "Frequency" was duplicated in english.lang for now to avoid having to fix every .lang file for the moment and throwing everything out of sync because of the new play_frequency feature in features.txt. The next cleanup should combine it with the one included for recording and generalize the ID label. If the hardware doesn't support 48000Hz, no setting will be available. On particular hardware where very high rates are practical and desireable, the upper bound can be extended by patching. The PCM mixer can be configured to play at the full hardware frequency range. The DSP core can configure to the hardware minimum up to the maximum playback setting (some buffers must be reserved according to the maximum rate). If only 44100Hz is supported or possible on a given target for playback, using the DSP and mixer at other samperates is possible if the hardware offers them. Change-Id: I6023cf0c0baa8bc6292b6919b4dd3618a6a25622 Reviewed-on: http://gerrit.rockbox.org/479 Reviewed-by: Michael Sevakis <jethead71@rockbox.org> Tested-by: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'apps/settings.c')
-rw-r--r--apps/settings.c38
1 files changed, 38 insertions, 0 deletions
diff --git a/apps/settings.c b/apps/settings.c
index adc53cd14b..cf51b0793c 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -85,6 +85,11 @@ struct system_status global_status;
#ifdef HAVE_RECORDING
#include "enc_config.h"
#endif
+#include "pcm_sampr.h"
+#ifdef HAVE_PLAY_FREQ
+#include "pcm_mixer.h"
+#include "dsp_core.h"
+#endif
#endif /* CONFIG_CODEC == SWCODEC */
#define NVRAM_BLOCK_SIZE 44
@@ -720,6 +725,36 @@ void settings_apply_pm_range(void)
}
#endif /* HAVE_LCD_BITMAP */
+#ifdef HAVE_PLAY_FREQ
+void settings_apply_play_freq(int value, bool playback)
+{
+ static const unsigned long play_sampr[] = { SAMPR_44, SAMPR_48 };
+ static int prev_setting = 0;
+
+ if ((unsigned)value >= ARRAYLEN(play_sampr))
+ value = 0;
+
+ bool changed = value != prev_setting;
+ prev_setting = value;
+
+ long offset = 0;
+ bool playing = changed && !playback &&
+ audio_status() == AUDIO_STATUS_PLAY;
+
+ if (playing)
+ offset = audio_current_track()->offset;
+
+ if (changed && !playback)
+ audio_hard_stop();
+
+ /* Other sub-areas of playback pick it up from the mixer */
+ mixer_set_frequency(play_sampr[value]);
+
+ if (playing)
+ audio_play(offset);
+}
+#endif /* HAVE_PLAY_FREQ */
+
void sound_settings_apply(void)
{
#ifdef AUDIOHW_HAVE_BASS
@@ -976,6 +1011,9 @@ void settings_apply(bool read_disk)
set_codepage(global_settings.default_codepage);
CHART("<set_codepage");
+#ifdef HAVE_PLAY_FREQ
+ settings_apply_play_freq(global_settings.play_frequency, false);
+#endif
#if CONFIG_CODEC == SWCODEC
#ifdef HAVE_CROSSFADE
audio_set_crossfade(global_settings.crossfade);