Skip to contentSkip to conversation

aplay: Fix to handle pause when system is suspended/Resumed

PATCH Applied [email protected] 2 participants 2 messages Nov 28, 2016

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 aplay: Fix to handle pause when system is suspended/Resumed

From: Jeeja KP <[email protected]>

If PCM is paused and then we do system supend-resume, the stream throws error(EBADF) when stream is paused released.

Check the pcm state before pause/release and if stream is suspended, call snd_pcm_resume to resume the stream.

---
 aplay/aplay.c | 7 +++++++
 1 file changed, 7 insertions(+)
aplay/aplay.c +7 -0
index 2da7dda..ee480f2 100644
@@ -166,6 +166,8 @@ static void end_wave(int fd);
 static void begin_au(int fd, size_t count);
 static void end_au(int fd);
 
+static void suspend(void);
+
 static const struct fmt_capture {
 	void (*start) (int fd, size_t count);
 	void (*end) (int fd);
@@ -1487,6 +1489,9 @@ static void do_pause(void)
 		fprintf(stderr, _("\rPAUSE command ignored (no hw support)\n"));
 		return;
 	}
+	if (snd_pcm_state(handle) == SND_PCM_STATE_SUSPENDED)
+		suspend();
+
 	err = snd_pcm_pause(handle, 1);
 	if (err < 0) {
 		error(_("pause push error: %s"), snd_strerror(err));
@@ -1496,6 +1501,8 @@ static void do_pause(void)
 		while (read(fileno(stdin), &b, 1) != 1);
 		if (b == ' ' || b == '\r') {
 			while (read(fileno(stdin), &b, 1) == 1);
+			if (snd_pcm_state(handle) == SND_PCM_STATE_SUSPENDED)
+				suspend();
 			err = snd_pcm_pause(handle, 0);
 			if (err < 0)
 				error(_("pause release error: %s"), snd_strerror(err));
Signature · 1 line
2.5.0
Applied
#1 lore raw
Quoted 11 lines · On Mon, 28 Nov 2016 17:32:00 +0100, [email protected] wrote:

From: Jeeja KP <[email protected]>

If PCM is paused and then we do system supend-resume, the stream throws error(EBADF) when stream is paused released.

Check the pcm state before pause/release and if stream is suspended, call snd_pcm_resume to resume the stream.

Applied, thanks.

Takashi

Quoted 39 lines
---
 aplay/aplay.c | 7 +++++++
 1 file changed, 7 insertions(+)
aplay/aplay.c +7 -0
index 2da7dda..ee480f2 100644
@@ -166,6 +166,8 @@ static void end_wave(int fd);
 static void begin_au(int fd, size_t count);
 static void end_au(int fd);
 
+static void suspend(void);
+
 static const struct fmt_capture {
 	void (*start) (int fd, size_t count);
 	void (*end) (int fd);
@@ -1487,6 +1489,9 @@ static void do_pause(void)
 		fprintf(stderr, _("\rPAUSE command ignored (no hw support)\n"));
 		return;
 	}
+	if (snd_pcm_state(handle) == SND_PCM_STATE_SUSPENDED)
+		suspend();
+
 	err = snd_pcm_pause(handle, 1);
 	if (err < 0) {
 		error(_("pause push error: %s"), snd_strerror(err));
@@ -1496,6 +1501,8 @@ static void do_pause(void)
 		while (read(fileno(stdin), &b, 1) != 1);
 		if (b == ' ' || b == '\r') {
 			while (read(fileno(stdin), &b, 1) == 1);
+			if (snd_pcm_state(handle) == SND_PCM_STATE_SUSPENDED)
+				suspend();
 			err = snd_pcm_pause(handle, 0);
 			if (err < 0)
 				error(_("pause release error: %s"), snd_strerror(err));
Signature · 1 line
2.5.0