len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

setting_list.c playback frequency cleanup

Browse source 
moves the callback to settings_list

audio_set_playback_frequency now accepts an actual frequency
44100 192000 etc rather than an index

Change-Id: Ieb3fc79a7fe3f1ff050465c8cd8061027e4572ff
This commit is contained in:
William Wilgus 2023-09-01 01:15:07 -04:00
parent 873f49b1f0
commit 79b64a3fc7
5 changed files with 72 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

42
apps/playback.c
View file

@ -3981,29 +3981,45 @@ static void audio_change_frequency_callback(unsigned short id, void *data)
}
}
void audio_set_playback_frequency(int setting)
void audio_set_playback_frequency(unsigned int sample_rate_hz)
{
/* sample_rate_hz == 0 is "automatic", and also a sentinel */
#if HAVE_PLAY_FREQ >= 192
static const unsigned long play_sampr[] = { SAMPR_44, SAMPR_48, SAMPR_88, SAMPR_96, SAMPR_176, SAMPR_192 };
static const unsigned int play_sampr[] = {SAMPR_44, SAMPR_48, SAMPR_88, SAMPR_96, SAMPR_176, SAMPR_192, 0 };
#elif HAVE_PLAY_FREQ >= 96
static const unsigned long play_sampr[] = { SAMPR_44, SAMPR_48, SAMPR_88, SAMPR_96 };
static const unsigned int play_sampr[] = {SAMPR_44, SAMPR_48, SAMPR_88, SAMPR_96, 0 };
#elif HAVE_PLAY_FREQ >= 48
static const unsigned long play_sampr[] = { SAMPR_44, SAMPR_48 };
static const unsigned int play_sampr[] = {SAMPR_44, SAMPR_48, 0 };
#else
#error "HAVE_PLAY_FREQ < 48 ??"
#endif
const unsigned int *p_sampr = play_sampr;
unsigned int sampr = 0;
if ((unsigned)setting > ARRAYLEN(play_sampr)) /* [0] is "automatic" */
setting = 0;
while (*p_sampr != 0)
{
if (*p_sampr == sample_rate_hz)
{
sampr = *p_sampr;
break;
}
p_sampr++;
}
unsigned long playback_sampr = mixer_get_frequency();
unsigned long sampr = setting ?
play_sampr[setting - 1] :
((audio_status() == AUDIO_STATUS_PLAY) ?
audio_guess_frequency(audio_current_track()) :
playback_sampr);
if (sampr == 0)
{
if (audio_status() == AUDIO_STATUS_PLAY)
{
sampr = audio_guess_frequency(audio_current_track());
}
else
{
logf("could not set sample rate to %u hz", sample_rate_hz);
return; /* leave as is */
}
}
if (sampr != playback_sampr)
if (sampr != mixer_get_frequency())
{
mixer_set_frequency(sampr);
LOGFQUEUE("audio >| audio Q_AUDIO_REMAKE_AUDIO_BUFFER");