len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2026-07-10 13:29:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

pcm: Make pcm_is_ready a per-sink property instead of a global.

Browse source 
All that matters is that the _current_ sink is ready, not all possible
sinks.  When switching sinks we will need to ensure tehy are initialized
before switching over.

Change-Id: I341f7e9dcb4e2add4d0b292b68b69eb08dec0194
This commit is contained in:
Solomon Peachy 2026-03-25 08:48:55 -04:00
parent ae724ba5f3
commit 759ef2767a
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
firmware/export/pcm_sink.h
View file

@ -47,6 +47,7 @@ struct pcm_sink {
/* runtime states */ /* runtime states */
unsigned long pending_freq; unsigned long pending_freq;
unsigned long configured_freq; unsigned long configured_freq;
unsigned long pcm_is_ready;
}; };
enum pcm_sink_ids { enum pcm_sink_ids {

21
firmware/pcm.c
View file

@ -76,9 +76,6 @@
* *
*/ */
/* 'true' when all stages of pcm initialization have completed */
static bool pcm_is_ready = false;
static struct pcm_sink* sinks[1] = { static struct pcm_sink* sinks[1] = {
[PCM_SINK_BUILTIN] = &builtin_pcm_sink, [PCM_SINK_BUILTIN] = &builtin_pcm_sink,
}; };
@ -142,7 +139,7 @@ void pcm_play_stop_int(void)
static void pcm_wait_for_init(void) static void pcm_wait_for_init(void)
{ {
while (!pcm_is_ready) while (!sinks[cur_sink]->pcm_is_ready)
sleep(0); sleep(0);
} }
@ -251,9 +248,11 @@ void pcm_init(void)
logf("pcm_init"); logf("pcm_init");
for(size_t i = 0; i < ARRAYLEN(sinks); i += 1) { for(size_t i = 0; i < ARRAYLEN(sinks); i += 1) {
sinks[i]->pending_freq = sinks[i]->caps.default_freq; struct pcm_sink* sink = sinks[i];
sinks[i]->configured_freq = -1UL; sink->pending_freq = sink->caps.default_freq;
sinks[i]->ops.init(); sink->configured_freq = -1UL;
sink->pcm_is_ready = false;
sink->ops.init();
} }
} }
@ -263,15 +262,15 @@ void pcm_postinit(void)
logf("pcm_postinit"); logf("pcm_postinit");
for(size_t i = 0; i < ARRAYLEN(sinks); i += 1) { for(size_t i = 0; i < ARRAYLEN(sinks); i += 1) {
sinks[i]->ops.postinit(); struct pcm_sink* sink = sinks[i];
sink->ops.postinit();
sink->pcm_is_ready = true;
} }
pcm_is_ready = true;
} }
bool pcm_is_initialized(void) bool pcm_is_initialized(void)
{ {
return pcm_is_ready; return sinks[cur_sink]->pcm_is_ready;
} }
enum pcm_sink_ids pcm_current_sink(void) enum pcm_sink_ids pcm_current_sink(void)