Takashi Iwai
84789a8f60
- Backport upstream fixes / enhancements: mostly small fixes spotted by coccinelle and oethers, the fixes for proper rewind support, a new DSD format support, hwdep definitions sync, and addition of PAZ00 UCM configs. 0022-pcm-fix-snd_pcm_mmap_hw_avail-near-the-boundary.patch 0023-pcm-fix-return-value-of-snd_pcm_share_slave_avail.patch 0024-pcm-add-new-32-bit-DSD-sample-format.patch 0025-dmix-actually-rewind-when-running-or-being-drained.patch 0026-pcm-express-the-rewind-size-limitation-logic-better.patch 0027-pcm-handle-negative-values-from-snd_pcm_mmap_hw_avai.patch 0028-pcm-rate-use-the-snd_pcm_mmap_hw_avail-function.patch 0029-pcm-null-use-the-snd_pcm_mmap_avail-function.patch 0030-rate-handle-negative-values-from-snd_pcm_mmap_playba.patch 0031-dsnoop-rewindable-and-forwardable-logic-was-swapped.patch 0033-pcm-file-don-t-recurse-in-the-rewindable-and-forward.patch 0034-pcm-route-Fix-the-bad-condition-always-false.patch 0035-pcm-rate-hw_avail-must-not-be-negative-before-starti.patch 0036-hwdep-add-missing-declaration-for-snd_hwdep_poll_des.patch 0037-mixer-fixed-double-free.patch 0038-pcm_file-fixed-missing-free.patch 0039-sbase-fixed-missing-free.patch 0040-rawmidi-close-handle-h.patch 0041-pcm_share-fixing-missing-mutex-unlock.patch 0042-simple_abst-null-check-for-lib.patch 0043-socket-missing-socket-close.patch 0044-pcm_hooks-null-check-for-h.patch 0045-conf-return-negative-value-in-case-of-error.patch 0046-control-return-negative-value-in-case-of-error.patch 0047-pcm-return-negative-value-in-case-of-error.patch 0048-mixer-Fix-missing-hctl-handle-free-in-snd_mixer_atta.patch OBS-URL: https://build.opensuse.org/request/show/257835 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=170
37 lines
1.2 KiB
Diff
37 lines
1.2 KiB
Diff
From 9a56a673a6cd7343a9345921e2b1cbbb43fb725f Mon Sep 17 00:00:00 2001
|
|
From: "Alexander E. Patrakov" <patrakov@gmail.com>
|
|
Date: Sun, 14 Sep 2014 00:30:13 +0600
|
|
Subject: [PATCH] dmix: actually rewind when running or being drained
|
|
|
|
Signed-off-by: Alexander E. Patrakov <patrakov@gmail.com>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/pcm/pcm_dmix.c | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
|
|
index 7c535093ea0f..73cbe3f8d0b2 100644
|
|
--- a/src/pcm/pcm_dmix.c
|
|
+++ b/src/pcm/pcm_dmix.c
|
|
@@ -669,11 +669,15 @@ static snd_pcm_sframes_t snd_pcm_dmix_rewind(snd_pcm_t *pcm, snd_pcm_uframes_t f
|
|
snd_pcm_direct_t *dmix = pcm->private_data;
|
|
snd_pcm_uframes_t slave_appl_ptr, slave_size;
|
|
snd_pcm_uframes_t appl_ptr, size, transfer, result;
|
|
+ int err;
|
|
const snd_pcm_channel_area_t *src_areas, *dst_areas;
|
|
|
|
if (dmix->state == SND_PCM_STATE_RUNNING ||
|
|
- dmix->state == SND_PCM_STATE_DRAINING)
|
|
- return snd_pcm_dmix_hwsync(pcm);
|
|
+ dmix->state == SND_PCM_STATE_DRAINING) {
|
|
+ err = snd_pcm_dmix_hwsync(pcm);
|
|
+ if (err < 0)
|
|
+ return err;
|
|
+ }
|
|
|
|
if (dmix->last_appl_ptr < dmix->appl_ptr)
|
|
size = dmix->appl_ptr - dmix->last_appl_ptr;
|
|
--
|
|
2.1.2
|
|
|