From nobody Tue Feb 25 11:48:27 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z2G8C2dDnz5pjrK; Tue, 25 Feb 2025 11:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z2G8C1VMYz3kmB; Tue, 25 Feb 2025 11:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740484107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qSzTaushSYAyfOZMusASMoyG6vpALdn018w1FcL1tjk=; b=e6oeWKWc+S945O0pjykasVL1QJRDx5cRJK7gHUEPbgMRspqzpJZTw/U8LlfB4AjPn/Obi6 ZBQyPlDDbuZywJynumXYgyBqgU7+72Wdakax3WsnxjrmqEZ21Tt6x9n28+NaJXwxi2mA6F Vb9hJ7iK1sn61fjqb7qS2MlQPXoix3mT+OUSsnQ+7N3vssmtxG6JS/AWZwzInOKOx8tw1Z Dw4h7BnqE+zJVHecl5fm80HLw7nwsvPfiFMXQ7J9bRbJ1zuQig4oAngQt2EJ24ReHx9HIv n2TQ28D1UIa1cfWNHE89qYQwRFaFJ6+ZMrv9JEBRBctawWDAQlcE1fMXU5mH1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740484107; a=rsa-sha256; cv=none; b=CtGBjjEV+7JJGjewpJqhQmBw4OsKOJv3jEI3LeCoUUERjNQERU3CIInaSf3XjGSq36NJAe E8Xbxrc00xWxAbdPOz4MYTGk1VvcXBkXV2eH9jv0Z/JekgL7lh8ZV7XeR7IhA4IwEtf4Lo IgJTDzgLFVCNiB7Kl57jRDF6NIDx//2lJ4tth7Dh8YYFI9kKzqxPXbb8IOKPk1KlEyoZAX pSpRQ73pFysK5XYnQ2vRdYqM13rJc3BwIlP7QR4t7H1Nz2PPtojJrFHsXQwdtyKg9nHOGI Lo+HLqmYP1fIGgp1zaT8O+Zkkq53iuw1LCNGztOYpYOaSvi2z2jsm2fVLOwWAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740484107; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qSzTaushSYAyfOZMusASMoyG6vpALdn018w1FcL1tjk=; b=bBybChxFjsxw3T1fH5ff3l7+OL8efVMKWKmVUD48VudaZ4PAiZycqKISsgs7mk3aqSxaK6 DuvSKD5Bb84UQWtiGoX1ThhSjmfHDeoN2k4Tnekpee6r1LsKCp1cQqcFoRZCYOz7nIbQTC leePe+rrydYl1uN95wUdNyeZiaTdrrWZYANL9xVb1FkqCYGTaSevnN1Owmaw8W6p0Zf76v wlGhlZr5EsTLKOo2gNRbTeCDXQMJgE7icck9kLPjlyalKKo6Wxk5wfVqh0dyAWsXyRUMz3 22rzzyckiDM0p6HJZfgqKqzyE+ScwNTU62PExsqrLdrEf+MbU6NXIQ9JW2aRDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z2G8C0y4zz8pl; Tue, 25 Feb 2025 11:48:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51PBmRLs051275; Tue, 25 Feb 2025 11:48:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51PBmR84051272; Tue, 25 Feb 2025 11:48:27 GMT (envelope-from git) Date: Tue, 25 Feb 2025 11:48:27 GMT Message-Id: <202502251148.51PBmR84051272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: f121de8fbcbc - main - mixer(3): Do not skip devices with no volume control List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f121de8fbcbc8aa82f9fb59039c502406b7c88b6 Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=f121de8fbcbc8aa82f9fb59039c502406b7c88b6 commit f121de8fbcbc8aa82f9fb59039c502406b7c88b6 Author: Christos Margiolis AuthorDate: 2025-02-25 11:44:49 +0000 Commit: Christos Margiolis CommitDate: 2025-02-25 11:44:49 +0000 mixer(3): Do not skip devices with no volume control Some devices might not have a software volume control, but still be able to be set as recording sources. PR: 279787 Sponsored by: The FreeBSD Foundation MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D48730 --- lib/libmixer/mixer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/libmixer/mixer.c b/lib/libmixer/mixer.c index 4abbed9b27d3..2be3a48eb755 100644 --- a/lib/libmixer/mixer.c +++ b/lib/libmixer/mixer.c @@ -113,14 +113,14 @@ dunit: TAILQ_INIT(&m->devs); for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) { - if (!MIX_ISDEV(m, i)) + if (!MIX_ISDEV(m, i) && !MIX_ISREC(m, i)) continue; if ((dp = calloc(1, sizeof(struct mix_dev))) == NULL) goto fail; dp->parent_mixer = m; dp->devno = i; dp->nctl = 0; - if (_mixer_readvol(dp) < 0) + if (MIX_ISDEV(m, i) && _mixer_readvol(dp) < 0) goto fail; (void)strlcpy(dp->name, names[i], sizeof(dp->name)); TAILQ_INIT(&dp->ctls);