]> git.alsa-project.org Git - alsa-utils.git/commitdiff
aplay: Fix to handle pause when system is suspended/Resumed
authorJeeja KP <jeeja.kp@intel.com>
Mon, 28 Nov 2016 16:32:00 +0000 (22:02 +0530)
committerTakashi Iwai <tiwai@suse.de>
Mon, 28 Nov 2016 19:19:21 +0000 (20:19 +0100)
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.

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Jeeja KP <jeeja.kp@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
aplay/aplay.c

index 2da7ddac1c81d24d20988d2719e4e66833277177..ee480f29b760fb65fd6c5670d79899538b6497d6 100644 (file)
@@ -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));