nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

alsa: introduce AUDIOHW_MUTE_ON_PAUSE, and have rocker use it. 

Change-Id: I1edbb8e71a9c73baaeecb01b66cbee6c3f7b5f8f
This commit is contained in:
Solomon Peachy 2020-10-03 09:19:12 -04:00
parent d18157608d
commit d4a620e85a
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/drivers/audio/rocker_codec.c
View File

@ -62,6 +62,7 @@ void audiohw_preinit(void)
{
alsa_controls_init();
hw_open();
audiohw_mute(true); /* Start muted to avoid the POP */
}
void audiohw_postinit(void)
@ -69,7 +70,7 @@ void audiohw_postinit(void)
long int hp = 2;
/* Output port switch set to Headphones */
alsa_controls_set_ints("Output Port Switch", 1, &hp);
alsa_controls_set_ints("Output Port Switch", 1, &hp); /* Unmutes */
}
void audiohw_close(void)

2
firmware/export/rocker_codec.h
View File

@ -5,4 +5,6 @@
AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -127, 0, -30)
#endif
#define AUDIOHW_MUTE_ON_PAUSE
void audiohw_mute(int mute);

18
firmware/target/hosted/pcm-alsa.c
View File

@ -471,10 +471,6 @@ void pcm_play_dma_init(void)
if ((err = snd_pcm_nonblock(handle, 1)))
panicf("Could not set non-block mode: %s\n", snd_strerror(err));
#if defined(HAVE_XDUOO_LINUX_CODEC) || defined(HAVE_FIIO_LINUX_CODEC) || defined(HAVE_ROCKER_CODEC)
audiohw_mute(true);
#endif
if ((err = set_hwparams(handle)) < 0)
{
panicf("Setting of hwparams failed: %s\n", snd_strerror(err));
@ -525,10 +521,12 @@ static void pcm_dma_apply_settings_nolock(void)
logf("PCM DMA Settings %d %d", sample_rate, pcm_sampr);
if (sample_rate != pcm_sampr)
{
#ifdef AUDIOHW_MUTE_ON_PAUSE
audiohw_mute(true);
#endif
snd_pcm_drop(handle);
set_hwparams(handle);
// audiohw_mute(false); /// Play DMA will unmute us.
/* Will be unmuted by pcm resuming */
}
}
#else
@ -555,7 +553,13 @@ void pcm_dma_apply_settings(void)
void pcm_play_dma_pause(bool pause)
{
logf("PCM DMA pause %d", pause);
#ifdef AUDIOHW_MUTE_ON_PAUSE
if (pause) audiohw_mute(true);
#endif
snd_pcm_pause(handle, pause);
#ifdef AUDIOHW_MUTE_ON_PAUSE
if (!pause) audiohw_mute(false);
#endif
}
void pcm_play_dma_stop(void)
@ -564,7 +568,7 @@ void pcm_play_dma_stop(void)
snd_pcm_drain(handle);
snd_pcm_nonblock(handle, 1);
sample_rate = 0;
#if defined(HAVE_XDUOO_LINUX_CODEC) || defined(HAVE_FIIO_LINUX_CODEC) || defined(HAVE_ROCKER_CODEC)
#ifdef AUDIOHW_MUTE_ON_PAUSE
audiohw_mute(true);
#endif
logf("PCM DMA stopped");
@ -610,7 +614,7 @@ void pcm_play_dma_start(const void *addr, size_t size)
logf("Start error: %s\n", snd_strerror(err));
return;
}
#if defined(HAVE_XDUOO_LINUX_CODEC) || defined(HAVE_FIIO_LINUX_CODEC) || defined(HAVE_ROCKER_CODEC)
#ifdef AUDIOHW_MUTE_ON_PAUSE
audiohw_mute(false);
#endif
if (err == 0)