len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-11-10 05:32:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

alsa: Explicitly mute the output when we stop playing, and unmute after playback starts

Browse source 
Allows us to avoid hearing the codec powering on and off.

Change-Id: Idaaff437932009952ed248be97eedf54cb4cf28e
This commit is contained in:
Solomon Peachy 2020-10-03 00:10:31 -04:00
parent c7eceea183
commit 90c30bc7ef
1 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
firmware/target/hosted/pcm-alsa.c
View file

@ -443,6 +443,7 @@ static int async_rw(snd_pcm_t *handle)
} else { } else {
return state; return state;
} }
return 0; return 0;
} }
@ -470,6 +471,10 @@ void pcm_play_dma_init(void)
if ((err = snd_pcm_nonblock(handle, 1))) if ((err = snd_pcm_nonblock(handle, 1)))
panicf("Could not set non-block mode: %s\n", snd_strerror(err)); 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) if ((err = set_hwparams(handle)) < 0)
{ {
panicf("Setting of hwparams failed: %s\n", snd_strerror(err)); panicf("Setting of hwparams failed: %s\n", snd_strerror(err));
@ -523,12 +528,14 @@ static void pcm_dma_apply_settings_nolock(void)
audiohw_mute(true); audiohw_mute(true);
snd_pcm_drop(handle); snd_pcm_drop(handle);
set_hwparams(handle); set_hwparams(handle);
audiohw_mute(false); // audiohw_mute(false); /// Play DMA will unmute us.
} }
} }
#else #else
static void pcm_dma_apply_settings_nolock(void) static void pcm_dma_apply_settings_nolock(void)
{ {
logf("PCM DMA Settings %d %d", sample_rate, pcm_sampr);
snd_pcm_drop(handle); snd_pcm_drop(handle);
set_hwparams(handle); set_hwparams(handle);
#if defined(HAVE_NWZ_LINUX_CODEC) #if defined(HAVE_NWZ_LINUX_CODEC)
@ -557,6 +564,9 @@ void pcm_play_dma_stop(void)
snd_pcm_drain(handle); snd_pcm_drain(handle);
snd_pcm_nonblock(handle, 1); snd_pcm_nonblock(handle, 1);
sample_rate = 0; sample_rate = 0;
#if defined(HAVE_XDUOO_LINUX_CODEC) || defined(HAVE_FIIO_LINUX_CODEC) || defined(HAVE_ROCKER_CODEC)
audiohw_mute(true);
#endif
logf("PCM DMA stopped"); logf("PCM DMA stopped");
} }
@ -600,6 +610,9 @@ void pcm_play_dma_start(const void *addr, size_t size)
logf("Start error: %s\n", snd_strerror(err)); logf("Start error: %s\n", snd_strerror(err));
return; return;
} }
#if defined(HAVE_XDUOO_LINUX_CODEC) || defined(HAVE_FIIO_LINUX_CODEC) || defined(HAVE_ROCKER_CODEC)
audiohw_mute(false);
#endif
if (err == 0) if (err == 0)
return; return;
break; break;