summaryrefslogtreecommitdiffstats
path: root/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch')
-rw-r--r--[-rwxr-xr-x]recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch20
1 files changed, 9 insertions, 11 deletions
diff --git a/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch b/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch
index 4d28a77f..896d9426 100755..100644
--- a/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch
+++ b/recipes-multimedia/alsa/alsa-lib/0004-pcm-Don-t-store-the-state-for-SND_PCM_STATE_SUSPENDE.patch
@@ -1,7 +1,7 @@
1From 93607819d90ddf9bbdad8bbbe4af5d917ca572dc Mon Sep 17 00:00:00 2001 1From 09c1a959e7d007e00741606f69444c1f865a4beb Mon Sep 17 00:00:00 2001
2From: Shengjiu Wang <shengjiu.wang@freescale.com> 2From: Shengjiu Wang <shengjiu.wang@freescale.com>
3Date: Tue, 10 May 2016 15:09:26 +0800 3Date: Tue, 10 May 2016 15:09:26 +0800
4Subject: [PATCH 2/2] pcm: Don't store the state for SND_PCM_STATE_SUSPENDED 4Subject: [PATCH] pcm: Don't store the state for SND_PCM_STATE_SUSPENDED
5 5
6The resume function don't update the dmix->state, if store SUSPENDED 6The resume function don't update the dmix->state, if store SUSPENDED
7state in snd_pcm_dmix_state, the write function after resume will 7state in snd_pcm_dmix_state, the write function after resume will
@@ -13,6 +13,7 @@ for dmix,dshare,dsnoop.
13Upstream-Status: Pending 13Upstream-Status: Pending
14 14
15Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com> 15Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
16
16--- 17---
17 src/pcm/pcm_dmix.c | 2 +- 18 src/pcm/pcm_dmix.c | 2 +-
18 src/pcm/pcm_dshare.c | 2 +- 19 src/pcm/pcm_dshare.c | 2 +-
@@ -20,10 +21,10 @@ Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
20 3 files changed, 3 insertions(+), 3 deletions(-) 21 3 files changed, 3 insertions(+), 3 deletions(-)
21 22
22diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c 23diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
23index a6a8f3a..89c07d1 100644 24index 608593f..3d068c7 100644
24--- a/src/pcm/pcm_dmix.c 25--- a/src/pcm/pcm_dmix.c
25+++ b/src/pcm/pcm_dmix.c 26+++ b/src/pcm/pcm_dmix.c
26@@ -466,9 +466,9 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm) 27@@ -460,9 +460,9 @@ static snd_pcm_state_t snd_pcm_dmix_state(snd_pcm_t *pcm)
27 snd_pcm_state_t state; 28 snd_pcm_state_t state;
28 state = snd_pcm_state(dmix->spcm); 29 state = snd_pcm_state(dmix->spcm);
29 switch (state) { 30 switch (state) {
@@ -35,10 +36,10 @@ index a6a8f3a..89c07d1 100644
35 case SND_PCM_STATE_XRUN: 36 case SND_PCM_STATE_XRUN:
36 if ((err = snd_pcm_direct_slave_recover(dmix)) < 0) 37 if ((err = snd_pcm_direct_slave_recover(dmix)) < 0)
37diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c 38diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
38index 7cdfea2..e0b4ea7 100644 39index a918512..18071fb 100644
39--- a/src/pcm/pcm_dshare.c 40--- a/src/pcm/pcm_dshare.c
40+++ b/src/pcm/pcm_dshare.c 41+++ b/src/pcm/pcm_dshare.c
41@@ -261,9 +261,9 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm) 42@@ -258,9 +258,9 @@ static snd_pcm_state_t snd_pcm_dshare_state(snd_pcm_t *pcm)
42 snd_pcm_state_t state; 43 snd_pcm_state_t state;
43 state = snd_pcm_state(dshare->spcm); 44 state = snd_pcm_state(dshare->spcm);
44 switch (state) { 45 switch (state) {
@@ -50,10 +51,10 @@ index 7cdfea2..e0b4ea7 100644
50 case SND_PCM_STATE_XRUN: 51 case SND_PCM_STATE_XRUN:
51 if ((err = snd_pcm_direct_slave_recover(dshare)) < 0) 52 if ((err = snd_pcm_direct_slave_recover(dshare)) < 0)
52diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c 53diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
53index 539b671..03df6ff 100644 54index 2c3b9f4..3b711ab 100644
54--- a/src/pcm/pcm_dsnoop.c 55--- a/src/pcm/pcm_dsnoop.c
55+++ b/src/pcm/pcm_dsnoop.c 56+++ b/src/pcm/pcm_dsnoop.c
56@@ -212,9 +212,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm) 57@@ -209,9 +209,9 @@ static snd_pcm_state_t snd_pcm_dsnoop_state(snd_pcm_t *pcm)
57 snd_pcm_state_t state; 58 snd_pcm_state_t state;
58 state = snd_pcm_state(dsnoop->spcm); 59 state = snd_pcm_state(dsnoop->spcm);
59 switch (state) { 60 switch (state) {
@@ -64,6 +65,3 @@ index 539b671..03df6ff 100644
64 return state; 65 return state;
65 case SND_PCM_STATE_XRUN: 66 case SND_PCM_STATE_XRUN:
66 if ((err = snd_pcm_direct_slave_recover(dsnoop)) < 0) 67 if ((err = snd_pcm_direct_slave_recover(dsnoop)) < 0)
67--
682.7.4
69