diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 22:41:29 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2015-09-15 22:41:29 +0300 |
commit | 21f9b84b4b729fbd7acbd465e7a3f726e4d20f91 (patch) | |
tree | eb2d091d427ca0813b445509d59cc8e27e8ad25f /yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch | |
parent | 101cef31e2bf54c678501155cd2106251acbd076 (diff) | |
parent | c124f4f2e04dca16a428a76c89677328bc7bf908 (diff) | |
download | openbmc-21f9b84b4b729fbd7acbd465e7a3f726e4d20f91.tar.xz |
Merge commit 'c124f4f2e04dca16a428a76c89677328bc7bf908' as 'yocto-poky'
Diffstat (limited to 'yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch')
-rw-r--r-- | yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch b/yocto-poky/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch new file mode 100644 index 000000000..5df004aea --- /dev/null +++ b/yocto-poky/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; |