From patchwork Wed Mar 20 19:24:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Schaefer X-Patchwork-Id: 17534 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UIOcm-0004mx-Ny; Wed, 20 Mar 2013 20:24:36 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp id 1UIOcm-0000VB-DD; Wed, 20 Mar 2013 20:24:36 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757700Ab3CTTYa (ORCPT + 1 other); Wed, 20 Mar 2013 15:24:30 -0400 Received: from mail-ee0-f49.google.com ([74.125.83.49]:48968 "EHLO mail-ee0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932538Ab3CTTYT (ORCPT ); Wed, 20 Mar 2013 15:24:19 -0400 Received: by mail-ee0-f49.google.com with SMTP id d41so1306198eek.36 for ; Wed, 20 Mar 2013 12:24:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=NEjrCLJnxoB8CkhAJt9h+wcgeYv4ZCaUO6PKH63anE8=; b=tvDacYkeZ/xpUozo9Sai98VzjeYpBs9yJbFN7hincWkpdI1WWFmzP1JD4fSehnhnqR vieSNohP/E/mjzgyg+537c/honZetGQLWTgRcIJTMaQViJAFw5G5p70aibELURHYvc2a 6XuDlwGSjJoUTRI4q3BOWVmXzHutGwAtrdNztuV6Vw+z6//rvVhIUaSugJxQvikF/a+i 6OulRyj9SCzoZH5QrS64IW3bt5V+FLahIv8nFzue5tjRjOQ6EykS0Sb/pmGbj2ikUwJJ HmTCQ5ICnQafJQZpRYE7XtGyldAmmarGnIXqg7Z8ziFAGafvvPiK+Uq6digk5tCqb7PV WzcQ== X-Received: by 10.14.3.133 with SMTP id 5mr43808122eeh.43.1363807458387; Wed, 20 Mar 2013 12:24:18 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-109-91-213-156.unitymediagroup.de. [109.91.213.156]) by mx.google.com with ESMTPS id z45sm4408888eeu.10.2013.03.20.12.24.16 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 20 Mar 2013 12:24:17 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: mchehab@redhat.com Cc: hverkuil@xs4all.nl, linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [RFC PATCH 08/10] bttv: apply mute settings on open Date: Wed, 20 Mar 2013 20:24:48 +0100 Message-Id: <1363807490-3906-9-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1363807490-3906-1-git-send-email-fschaefer.oss@googlemail.com> References: <1363807490-3906-1-git-send-email-fschaefer.oss@googlemail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2013.3.20.191215 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1400_1499 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, CT_TEXT_PLAIN_UTF8_CAPS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Previously, this has been done implicitly for video device nodes by calling set_input() (which calls audio_input() and also modified the mute setting). Since input and mute setting are now untangled (as much as possible), we need to apply the mute setting with an explicit call to audio_mute(). Also apply the mute setting when the radio device node gets opened. Signed-off-by: Frank Schäfer Acked-by: Hans Verkuil --- drivers/media/pci/bt8xx/bttv-driver.c | 3 ++- 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-) diff --git a/drivers/media/pci/bt8xx/bttv-driver.c b/drivers/media/pci/bt8xx/bttv-driver.c index 55eab61..2fb2168 100644 --- a/drivers/media/pci/bt8xx/bttv-driver.c +++ b/drivers/media/pci/bt8xx/bttv-driver.c @@ -3065,7 +3065,7 @@ static int bttv_open(struct file *file) fh, &btv->lock); set_tvnorm(btv,btv->tvnorm); set_input(btv, btv->input, btv->tvnorm); - + audio_mute(btv, btv->mute); /* The V4L2 spec requires one global set of cropping parameters which only change on request. These are stored in btv->crop[1]. @@ -3230,6 +3230,7 @@ static int radio_open(struct file *file) v4l2_fh_init(&fh->fh, vdev); btv->radio_user++; + audio_mute(btv, btv->mute); v4l2_fh_add(&fh->fh);