From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 0HqJIZtLVWRd/wAASxT56A (envelope-from ) for ; Fri, 05 May 2023 20:31:55 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id IO5DIZtLVWTH1QAAauVa8A (envelope-from ) for ; Fri, 05 May 2023 20:31:55 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id CD10B12B37 for ; Fri, 5 May 2023 20:31:54 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pv0C1-0005EC-Kp; Fri, 05 May 2023 14:30:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pv0Bz-0005D9-Vg for bug-guix@gnu.org; Fri, 05 May 2023 14:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pv0Bz-00062x-MR for bug-guix@gnu.org; Fri, 05 May 2023 14:30:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pv0Bz-0003Bn-Iu for bug-guix@gnu.org; Fri, 05 May 2023 14:30:07 -0400 X-Loop: help-debbugs@gnu.org Subject: bug#63082: [PATCH v3 13/16] services: mpd: Auto-detect mpd-output mixer type by default. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Fri, 05 May 2023 18:30:07 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63082 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 63082@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 63082-submit@debbugs.gnu.org id=B63082.168331139112082 (code B ref 63082); Fri, 05 May 2023 18:30:07 +0000 Received: (at 63082) by debbugs.gnu.org; 5 May 2023 18:29:51 +0000 Received: from localhost ([127.0.0.1]:57505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pv0Bi-00038j-LH for submit@debbugs.gnu.org; Fri, 05 May 2023 14:29:51 -0400 Received: from mail-qt1-f176.google.com ([209.85.160.176]:56326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pv0Bf-00037I-AU for 63082@debbugs.gnu.org; Fri, 05 May 2023 14:29:48 -0400 Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-3f364b1149eso10369541cf.0 for <63082@debbugs.gnu.org>; Fri, 05 May 2023 11:29:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1683311382; x=1685903382; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=QoxS5dW/em2ldx7JT7TBgH36bYnOCk3lZyWskDOH/PU=; b=e6Q+NXLFZ95PjWKszZyltbjvdNbnxHR7/6Q9NKi98uHW61UgPSY27r0uPQtw4NYnZ6 Bm7IrayoKFcdHSCox8YZQSeJts1p4vubbF4lbdE+Kc5Mw7GPp2Nw6/zXI5gblqh63kh/ /1U8bXW/BJSRW1Sfgj11kRj7XpA3ESvM0sEiNc7UmkvkfiNxokvituz1Y9MVfkrYjQ6x Uz0yYd8VEixbhrIBywH72gm7/j6AATNew5H+FFn6aRprfBCKZvvz04NdEAZNKAMlicMb m0EJkpXHAY5L7ZaukiDBpCJNw7nyyua+1GzW8cLMO4j6rcPpFFx2Py11HVYeebEY4o/O z4cQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683311382; x=1685903382; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QoxS5dW/em2ldx7JT7TBgH36bYnOCk3lZyWskDOH/PU=; b=iIcfLA1xEuTJ/Q78wIzGxjPBm5hJLvHrwa/g18OqBLbcyNR819u9oOSq8X75WH3oAl LiIQJZvYnMWsIDFehEEjKNMlAlbD0vaPLTuj2OiFfRkgj6KVPy2k6Uk1eYsnhMWMek7p Mk5O0iSBunWb2slbHbK4rf6ZhAuhcCszzrT4qIuIxYpF+cLGvmV1GXQxnR6zkAjKgUiF 8AzNpHiFkmJvq3VMTQGuil76ynydK7K4jik/ZTgO2SifA9rWZrCN/hA+WKESUZ/bJqYQ ry08CAvwMvWYVAYTXMjOPDlrlqj9bj01YYgvc7ZzgB2Rp4if2nXqOfItgInGnQMMnyIM 4BOA== X-Gm-Message-State: AC+VfDyjgw4daLtv0feiaIiTt2R+txIA0j7B4uJfAwjkeBgiUrmujvoG Rdt0In/vXlVo8HZzswxczJpYjRNZxcQ= X-Google-Smtp-Source: ACHHUZ6lsDpMA15XYzhkCsaidAhsshlOdbyJMWf1gd+ACQNK1kRIxpMMO5TC1SrBw1nkYDMbGT1zKQ== X-Received: by 2002:a05:622a:510:b0:3ec:d85d:2afe with SMTP id l16-20020a05622a051000b003ecd85d2afemr4583364qtx.2.1683311381735; Fri, 05 May 2023 11:29:41 -0700 (PDT) Received: from localhost.localdomain (dsl-205-236-230-162.b2b2c.ca. [205.236.230.162]) by smtp.gmail.com with ESMTPSA id c1-20020ac81e81000000b003e97fe68511sm834399qtm.3.2023.05.05.11.29.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 May 2023 11:29:41 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 5 May 2023 14:29:08 -0400 Message-Id: <726c25b0e7a28b095dfde163952f9d8711bbe219.1683299529.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: bug-guix-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1683311514; a=rsa-sha256; cv=none; b=Z545d8N8/4F1/OaQl0pM394rtP6NgCu1F+Kti9Rt1S1QmwSgVwU4uzs6Wmklkwuh0Tlzz5 DLn0YH1f3M9vB6nhIDXZxEfatrVLgj7mf/DyK/409KQBquKuoI58MerRrxXeHYc0IIGDUJ MfhDEONSpEPL1oySqCqXxONUERmEKlWmA2g46kfCS5ARGdRf2fJwC19oHPP57dnwkUBfL5 3VwJp3jrdUsEq7gdKzqRbDHXb8V7dh9oNye52YH4nbqPiI33IxuZf3MlGAk1jZUr24VLrJ 9lR9TBzVeOY57M2Q7vQtVVjpPNNCE4NflY/fzexAk/jss7/ucwaMfZzq1TMJ3A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=e6Q+NXLF; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1683311514; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=QoxS5dW/em2ldx7JT7TBgH36bYnOCk3lZyWskDOH/PU=; b=ILwtXcK5A2Lds165GnT21JmEs+J8rU9SDw7K3/PIfsbVfvUhNEF3qMrnfTceSMMlXw8obs yQ4NlwOqDhIHpdy1kELIBiSU7DtfAV26ZxtiXVtHScfHb8krDFdo8T5en6lf77Q9bfH3oK TySjdUx2UdCXHS4VUaW0GhV9sewSr3+xP3ict6qIHml2ViFzbJhC2RKmpzC2oW76CH7ukU ktqQPtawwEN2SLyd3msKCLe8WzpYURdDAeLZd19pLzQL03UWoRNbL4MY4ZR/oeZiTEBY4c xl2Ko6Ii3CQ8Yg9UIAWQEFAI3If8eZldkw1fmXXMtc5R8bxyx4uAmGXyURka3w== X-Migadu-Spam-Score: -3.20 X-Spam-Score: -3.20 X-Migadu-Queue-Id: CD10B12B37 X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=e6Q+NXLF; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-TUID: zl8/uNAV/n+e Relates to . * gnu/services/audio.scm (mpd-output) [mixer-type]: Change default value from "none" to unspecified. * doc/guix.texi (Audio Services): Regenerate doc. --- doc/guix.texi | 11 +++++++---- gnu/services/audio.scm | 15 +++++++++------ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index cdc1f4dedc..0981aa1568 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -33739,8 +33739,9 @@ Audio Services @end table @end deftp +@c %start of fragment @deftp {Data Type} mpd-output -Data type representing a @command{mpd} audio output. +Available @code{mpd-output} fields are: @table @asis @item @code{name} (default: @code{"MPD"}) (type: string) @@ -33767,15 +33768,16 @@ Audio Services @item @code{always-on?} (default: @code{#f}) (type: boolean) If set to @code{#t}, then MPD attempts to keep this audio output always -open. This may be useful for streaming servers, when you don?t want to +open. This may be useful for streaming servers, when you don’t want to disconnect all listeners even when playback is accidentally stopped. -@item @code{mixer-type} (default: @code{"none"}) (type: string) +@item @code{mixer-type} (type: maybe-string) This field accepts a string that specifies which mixer should be used for this audio output: the @code{hardware} mixer, the @code{software} mixer, the @code{null} mixer (allows setting the volume, but with no effect; this can be used as a trick to implement an external mixer -External Mixer) or no mixer (@code{none}). +External Mixer) or no mixer (@code{none}). When left unspecified, a +@code{hardware} mixer is used for devices that support it. @item @code{replay-gain-handler} (type: maybe-string) This field accepts a string that specifies how @@ -33790,6 +33792,7 @@ Audio Services @end table @end deftp +@c %end of fragment The following example shows a configuration of @command{mpd} that configures some of its plugins and provides a HTTP audio streaming output. diff --git a/gnu/services/audio.scm b/gnu/services/audio.scm index 7040a63ecd..1e0a8b7f9e 100644 --- a/gnu/services/audio.scm +++ b/gnu/services/audio.scm @@ -346,15 +346,18 @@ (define-configuration mpd-output disconnect all listeners even when playback is accidentally stopped.") (mixer-type - (string "none") - "This field accepts a string that specifies which mixer should be used -for this audio output: the @code{hardware} mixer, the @code{software} -mixer, the @code{null} mixer (allows setting the volume, but with no -effect; this can be used as a trick to implement an external mixer -External Mixer) or no mixer (@code{none})." + maybe-string + "This field accepts a string that specifies which mixer should be used for +this audio output: the @code{hardware} mixer, the @code{software} mixer, the +@code{null} mixer (allows setting the volume, but with no effect; this can be +used as a trick to implement an external mixer External Mixer) or no +mixer (@code{none}). When left unspecified, a @code{hardware} mixer is used +for devices that support it." (sanitizer (lambda (x) ; TODO: deprecated, remove me later. (cond + ((eq? %unset-value x) + x) ((symbol? x) (warning (G_ "symbol value for 'mixer-type' is deprecated, \ use string instead~%")) -- 2.39.2