From nobody Tue Mar 04 15:47:11 2025 X-Original-To: dev-commits-src-branches@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 4Z6g6S1Lh3z5qGYc; Tue, 04 Mar 2025 15:47:12 +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 4Z6g6R3pS7z42h2; Tue, 04 Mar 2025 15:47:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741103231; 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=21PZLXJGtbmNmpN5RfEbMOyX0sA37zEswmd8V+MF4kg=; b=BGpMZEwSConnL6z4VzOpD08/FmdfdcxxGW27Yw0LimPoiuOKrDstkoKyoOPtmqcP2TupC1 VOZ3tvJImJZUac8bSr88dp/8XMbUP3Xk6UpDJWtfmxh5yEZoOXe6afogIAgyX/N34Rvqir K8YBS0Kg3mcJCgFl9pzRHoOX/dyuixiHmOOtzx9hPEVv5KBRGu5axgSR/kJ9N+44r65kv3 uhIsN7UMix3SsbrrNbMCcSGqohWaJ3tSWin27s0Oq9XxKhIITC/Fy1eL3pAob1CdA4bVr3 d6iXqwA64Vbd9SiDCcO5CmunOmW/gyZdSqsEewHNDi753LvcAPv5MiGaMh51gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741103231; a=rsa-sha256; cv=none; b=yH/IB/mDVR/9WDAIzF/WFY2yi4IUCAJ7lAs5WX/gvb+TBjpn5DxtEGO2ecrL+NjXGwC8aG EHPaqPukDedmnYxJKzONzZ5DS1qgO2MIRLxUHbyTC+JNvSxdI4hFiQYjyS+aD0zIV6FaXg w2BljrQiT48TjqKV+Bq33Csc/fEnL24MOvWoyYpgAM89Urm75AioyDDecMlh7nB0KJpfP1 4D2y0LRxxhfeHYgWvEvg+o5J59QZPlmkJdEfahYZG/OiD2q8JxJiXzjJGpYLTIfn4vJ+Fc bzGErO7EAByU/JYfUyETpXDIfmHNphCT2qE8ARSWdjEGVEzqc5dnjRL0N35YgQ== 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=1741103231; 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=21PZLXJGtbmNmpN5RfEbMOyX0sA37zEswmd8V+MF4kg=; b=ADwVP++niOhvwvG3+D6TaUSGHfUWXkZ40C7LWfO1kh1si8ZAAvt0/SlKfmuNX5isBA9MY3 Qok8HEGdFt3g39ea3KKwPpcH+zJsABAqR+wc1SJ4jMY2cvYL5pywSmeFu7YNDdcbuNO1hT yrUV3S+cICc7aJ3sj6VE90ap1WNKiJ3WgHSL6K+KWGAod0mFyFfU/g+Y1BOVkUJk24K2Xd MWw+w8cKpIaYf14Fr5FxeRfxZP/cgDziORbVCRwhPQnikNXAGXK+yexwSsj2MosflqM2NE 4agTTPY5/5XUQebLqyHNsdKKvPjxfhjfOI6iKQVm9NifNna9lhtiAhqh8OADhw== 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 4Z6g6R2lD8z8H9; Tue, 04 Mar 2025 15:47:11 +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 524FlBX1050271; Tue, 4 Mar 2025 15:47:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 524FlBdT050268; Tue, 4 Mar 2025 15:47:11 GMT (envelope-from git) Date: Tue, 4 Mar 2025 15:47:11 GMT Message-Id: <202503041547.524FlBdT050268@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 311b84540e73 - stable/14 - mixer(3): Do not skip devices with no volume control List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 311b84540e737a55d032aa46975ea2379350077a Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=311b84540e737a55d032aa46975ea2379350077a commit 311b84540e737a55d032aa46975ea2379350077a Author: Christos Margiolis AuthorDate: 2025-02-25 11:44:49 +0000 Commit: Christos Margiolis CommitDate: 2025-03-04 15:46:07 +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 (cherry picked from commit f121de8fbcbc8aa82f9fb59039c502406b7c88b6) --- 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);