diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2020-10-03 00:10:31 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2020-10-03 04:12:51 +0000 |
| commit | 90c30bc7ef52cd447eb92157c53ba6ffc266efae (patch) | |
| tree | e82735663bf4a920a18c0df57909aead79d6411c | |
| parent | c7eceea183d5fe80d7346a4331dff1b60c8a500c (diff) | |
| download | rockbox-90c30bc7ef.tar.gz rockbox-90c30bc7ef.zip | |
alsa: Explicitly mute the output when we stop playing, and unmute after playback starts
Allows us to avoid hearing the codec powering on and off.
Change-Id: Idaaff437932009952ed248be97eedf54cb4cf28e
| -rw-r--r-- | firmware/target/hosted/pcm-alsa.c | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/firmware/target/hosted/pcm-alsa.c b/firmware/target/hosted/pcm-alsa.c index d42775e8ef..1395d071aa 100644 --- a/firmware/target/hosted/pcm-alsa.c +++ b/firmware/target/hosted/pcm-alsa.c @@ -443,6 +443,7 @@ static int async_rw(snd_pcm_t *handle) } else { return state; } + return 0; } @@ -470,6 +471,10 @@ 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)); @@ -523,12 +528,14 @@ static void pcm_dma_apply_settings_nolock(void) audiohw_mute(true); snd_pcm_drop(handle); set_hwparams(handle); - audiohw_mute(false); +// audiohw_mute(false); /// Play DMA will unmute us. } } #else static void pcm_dma_apply_settings_nolock(void) { + logf("PCM DMA Settings %d %d", sample_rate, pcm_sampr); + snd_pcm_drop(handle); set_hwparams(handle); #if defined(HAVE_NWZ_LINUX_CODEC) @@ -557,6 +564,9 @@ 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) + audiohw_mute(true); +#endif 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)); return; } +#if defined(HAVE_XDUOO_LINUX_CODEC) || defined(HAVE_FIIO_LINUX_CODEC) || defined(HAVE_ROCKER_CODEC) + audiohw_mute(false); +#endif if (err == 0) return; break; |