diff options
author | Tanu Kaskinen <tanuk@iki.fi> | 2016-02-17 18:56:14 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-18 07:39:32 +0000 |
commit | a231a4e86a09c10a89871fb532f1b33000f8b001 (patch) | |
tree | 26776a8167b4711639558d362e6a4e905c7e3419 /meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch | |
parent | 1adbb73d0d45fb989332b561c4cd9d5b8169c7e3 (diff) | |
download | poky-a231a4e86a09c10a89871fb532f1b33000f8b001.tar.gz |
alsa-utils: 1.0.29 -> 1.1.0
Changelog: http://alsa-project.org/main/index.php/Changes_v1.0.29_v1.1.0
This release introduces two new tools:
- alsatplg for converting topology data from text representation to a
binary format consumed by the kernel
- alsabat; "bat" stands for "basic audio tester"
Backported a patch from upstream that renames bat to alsabat.
Rebased patch "0001-alsactl-don-t-let-systemd-unit-restore-the-volume-wh.patch".
Dropped patches "alsa-utils-aplay-interrupt-signal-handling.patch" and
"assume-storing-is-success-if-not-sound-card-device.patch", because
the issues have been fixed upstream.
(From OE-Core rev: 0b10c468cee39520bb8f7330222fb177ceff249d)
Signed-off-by: Tanu Kaskinen <tanuk@iki.fi>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch | 48 |
1 files changed, 0 insertions, 48 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 deleted file mode 100644 index 5df004aeae..0000000000 --- a/meta/recipes-multimedia/alsa/alsa-utils/alsa-utils-aplay-interrupt-signal-handling.patch +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | aplay/arecord (alsa-utils v1.0.28) cannot interrupt streaming | ||
4 | via CTRL-C. Fixed the issue by reverting buggy patches and | ||
5 | properly handling 'in_aborting' flag in appropriate functions. | ||
6 | |||
7 | Signed-off-by: Anant Agrawal <Anant_Agrawal@mentor.com> | ||
8 | Signed-off-by: Mikhail Durnev <mikhail_durnev@mentor.com> | ||
9 | |||
10 | --- a/aplay/aplay.c 2014-05-19 16:25:14.000000000 +0530 | ||
11 | +++ b/aplay/aplay.c 2014-05-20 15:17:14.364823007 +0530 | ||
12 | @@ -392,14 +392,22 @@ | ||
13 | putchar('\n'); | ||
14 | if (!quiet_mode) | ||
15 | fprintf(stderr, _("Aborted by signal %s...\n"), strsignal(sig)); | ||
16 | - if (handle) | ||
17 | + if (stream == SND_PCM_STREAM_CAPTURE) { | ||
18 | + if (fmt_rec_table[file_type].end) { | ||
19 | + fmt_rec_table[file_type].end(fd); | ||
20 | + fd = -1; | ||
21 | + } | ||
22 | + stream = -1; | ||
23 | + } | ||
24 | + if (fd > 1) { | ||
25 | + close(fd); | ||
26 | + fd = -1; | ||
27 | + } | ||
28 | + if (handle && sig != SIGABRT) { | ||
29 | snd_pcm_abort(handle); | ||
30 | - if (sig == SIGABRT) { | ||
31 | - /* do not call snd_pcm_close() and abort immediately */ | ||
32 | handle = NULL; | ||
33 | - prg_exit(EXIT_FAILURE); | ||
34 | } | ||
35 | - signal(sig, signal_handler); | ||
36 | + prg_exit(EXIT_FAILURE); | ||
37 | } | ||
38 | |||
39 | /* call on SIGUSR1 signal. */ | ||
40 | @@ -2096,7 +2104,7 @@ | ||
41 | ssize_t result = count, r; | ||
42 | size_t size; | ||
43 | |||
44 | - while (count > 0) { | ||
45 | + while (count > 0 && !in_aborting) { | ||
46 | size = count; | ||
47 | if (size > chunk_bytes - buffer_pos) | ||
48 | size = chunk_bytes - buffer_pos; | ||