aplay: avoid any further PCM writing if in abort

Terminating stream with CTRL-C will set in_aborting flag which is used to leave any
write/read loop on the ALSA device.
After ending the read/write loop aplay tries to drain the stream which is not required and can also lead to malfunctions:
-If user interrupts a blocked/non responsive PCM (e.g. usb uac2 gadget which does not consume data
due to stream stopped by host) it will successfully terminate the write loop but will hang again in drain call.
This would require to hit CTRL-C again to unblock which should be avoided.
Aplay currently anyhow allows signal handler to get invoked only once.

Signed-off-by: Andreas Pape <apape@de.adit-jv.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/aplay/aplay.c b/aplay/aplay.c
index 9ebaae4102add69b844a0f19e625a2836b5a1f68..0b7884e80c9b195c0008be6e88406dbfd2ebd682 100644 (file)
--- a/aplay/aplay.c
+++ b/aplay/aplay.c
@@ -2570,7 +2570,9 @@ static void voc_play(int fd, int ofs, char *name)
                }
        }                       /* while(1) */
       __end:
-        voc_pcm_flush();
+       if (!in_aborting) {
+               voc_pcm_flush();
+       }
         free(buf);
 }
 /* that was a big one, perhaps somebody split it :-) */
@@ -2885,9 +2887,11 @@ static void playback_go(int fd, size_t loaded, off64_t count, int rtype, char *n
                written += r;
                l = 0;
        }
-       snd_pcm_nonblock(handle, 0);
-       snd_pcm_drain(handle);
-       snd_pcm_nonblock(handle, nonblock);
+       if (!in_aborting) {
+               snd_pcm_nonblock(handle, 0);
+               snd_pcm_drain(handle);
+               snd_pcm_nonblock(handle, nonblock);
+       }
 }
 
 static int read_header(int *loaded, int header_size)
@@ -3363,9 +3367,11 @@ static void playbackv_go(int* fds, unsigned int channels, size_t loaded, off64_t
                r = r * bits_per_frame / 8;
                count -= r;
        }
-       snd_pcm_nonblock(handle, 0);
-       snd_pcm_drain(handle);
-       snd_pcm_nonblock(handle, nonblock);
+       if (!in_aborting) {
+               snd_pcm_nonblock(handle, 0);
+               snd_pcm_drain(handle);
+               snd_pcm_nonblock(handle, nonblock);
+       }
 }
 
 static void capturev_go(int* fds, unsigned int channels, off64_t count, int rtype, char **names)