alsa-utils: interrupt streaming via signal

aplay/arecord (alsa-utils v1.0.28) cannot interrupt streaming
via CTRL-C. Fixed the issue by reverting buggy patches and
properly handling 'in_aborting' flag in appropriate functions.

(From OE-Core rev: 8e4ab29924c8c5fe2a79e8b0ca41fa45cc8e94a1)

Signed-off-by: Anant Agrawal <Anant_Agrawal@mentor.com>
Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com>
Signed-off-by: Muzaffar Mahmood <muzaffar_mahmood@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 48 insertions, 0 deletions

diff --git a/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch b/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch
new file mode 100644
index 0000000000..5df004aeae
--- /dev/null
+++ b/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch
@@ -0,0 +1,48 @@
+Upstream-Status: Pending
+
+aplay/arecord (alsa-utils v1.0.28) cannot interrupt streaming
+via CTRL-C. Fixed the issue by reverting buggy patches and
+properly handling 'in_aborting' flag in appropriate functions.
+
+Signed-off-by: Anant Agrawal <Anant_Agrawal@mentor.com>
+Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com>
+
+--- a/aplay/aplay.c     2014-05-19 16:25:14.000000000 +0530
++++ b/aplay/aplay.c     2014-05-20 15:17:14.364823007 +0530
+@@ -392,14 +392,22 @@
+                putchar('\n');
+        if (!quiet_mode)
+                fprintf(stderr, _("Aborted by signal %s...\n"), strsignal(sig));
+-       if (handle)
++       if (stream == SND_PCM_STREAM_CAPTURE) {
++               if (fmt_rec_table[file_type].end) {
++                       fmt_rec_table[file_type].end(fd);
++                       fd = -1;
++               }
++               stream = -1;
++       }
++       if (fd > 1) {
++               close(fd);
++               fd = -1;
++       }
++       if (handle && sig != SIGABRT) {
+                snd_pcm_abort(handle);
+-       if (sig == SIGABRT) {
+-               /* do not call snd_pcm_close() and abort immediately */
+                handle = NULL;
+-               prg_exit(EXIT_FAILURE);
+        }
+-       signal(sig, signal_handler);
++       prg_exit(EXIT_FAILURE);
+ }
+ 
+ /* call on SIGUSR1 signal. */
+@@ -2096,7 +2104,7 @@
+        ssize_t result = count, r;
+        size_t size;
+ 
+-       while (count > 0) {
++       while (count > 0 && !in_aborting) {
+                size = count;
+                if (size > chunk_bytes - buffer_pos)
+                        size = chunk_bytes - buffer_pos;