forked from pool/alsa-utils
Takashi Iwai
7200ea9d85
- Backport upstream patches: A few portability fixes, alsaucm fixes and extensions, alsatplg minor fixes, alsa-info.sh extensions: 0001-treewide-sys-poll-to-poll.patch 0002-treewide-Fix-wrong-formats-on-32-bit.patch 0003-treewide-Fix-printf-formats.patch 0004-aplay-Adjust-buffer-sizes-to-fix-snprintf-warnings.patch 0005-aplay-Limit-VUMeter-progress-bar-to-100-for-negative.patch 0006-alsactl-sysfs-add-sys-kernel-uevent_seqnum-check-to-.patch 0007-alsaucm-use-the-first-sound-card-use-case-name-hw-CA.patch 0008-alsaucm-add-text-dump-command.patch 0009-alsaucm-add-json-dump-command.patch 0010-alsaucm-dump-fix-the-prefixed.patch 0011-alsactl-fix-sched-idle-set-it-really-to-SCHED_IDLE.patch 0012-configure-Fix-linking-of-alsatplg-with-the-older-lib.patch 0013-alsatplg-add-n-normalize-option.patch 0014-alsatplg-add-s-sort-and-fix-memory-leaks.patch 0015-alsatplg-fix-another-small-leak-in-normalize_config.patch 0016-alsa-info.sh-Consolidate-PCI-device-output.patch 0017-alsa-info.sh-Read-from-proc-modules-and-sort-the-res.patch 0018-alsa-info.sh-Simplify-iteration-over-cards-when-call.patch 0019-alsa-info.sh-Use-existing-function-to-print-ALSA-con.patch 0020-alsa-info.sh-Exit-script-after-writing-information-t.patch 0021-alsa-info.sh-Replace-gauge-with-infobox-for-upload-d.patch 0022-alsa-info.sh-Remove-progress-spinner-during-upload-w.patch 0023-alsa-info.sh-Condense-nested-commands-for-file-uploa.patch 0024-alsa-info.sh-Condense-nested-commands-for-formatting.patch 0025-alsa-info.sh-Perform-test-for-wget-earlier.patch 0026-alsa-info.sh-Warn-after-actual-upload-failure-do-not.patch OBS-URL: https://build.opensuse.org/request/show/766332 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=165
44 lines
1.2 KiB
Diff
44 lines
1.2 KiB
Diff
From 745c5df26066de94622dd38c667da31ac6b88510 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Mon, 25 Nov 2019 17:58:51 +0100
|
|
Subject: [PATCH 07/26] alsaucm: use the first sound card (use case name
|
|
'hw:CARDNO') as default
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
alsaucm/usecase.c | 17 +++++++----------
|
|
1 file changed, 7 insertions(+), 10 deletions(-)
|
|
|
|
--- a/alsaucm/usecase.c
|
|
+++ b/alsaucm/usecase.c
|
|
@@ -188,22 +188,19 @@ static void my_exit(struct context *cont
|
|
|
|
static void do_initial_open(struct context *context)
|
|
{
|
|
- const char **list;
|
|
- int err;
|
|
+ int card, err;
|
|
+ char name[16];
|
|
|
|
if (!context->no_open && context->card == NULL) {
|
|
- err = snd_use_case_card_list(&list);
|
|
+ card = -1;
|
|
+ err = snd_card_next(&card);
|
|
if (err < 0) {
|
|
- fprintf(stderr, "%s: unable to obtain card list: %s\n",
|
|
+ fprintf(stderr, "%s: no sound card found: %s\n",
|
|
context->command, snd_strerror(err));
|
|
my_exit(context, EXIT_FAILURE);
|
|
}
|
|
- if (err == 0) {
|
|
- printf("No card found\n");
|
|
- my_exit(context, EXIT_SUCCESS);
|
|
- }
|
|
- context->card = strdup(list[0]);
|
|
- snd_use_case_free_list(list, err);
|
|
+ snprintf(name, sizeof(name), "hw:%d", card);
|
|
+ context->card = strdup(name);
|
|
}
|
|
|
|
/* open library */
|