From patchwork Thu Oct 13 12:26:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 119473 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id DECA8B6F82 for ; Thu, 13 Oct 2011 23:40:17 +1100 (EST) Received: from localhost ([::1]:52606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REKa7-0002iw-2n for incoming@patchwork.ozlabs.org; Thu, 13 Oct 2011 08:40:15 -0400 Received: from eggs.gnu.org ([140.186.70.92]:55756) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REKNf-00057a-DB for qemu-devel@nongnu.org; Thu, 13 Oct 2011 08:27:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1REKNV-0006kZ-Ry for qemu-devel@nongnu.org; Thu, 13 Oct 2011 08:27:20 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:51170) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1REKNV-0006gF-IF for qemu-devel@nongnu.org; Thu, 13 Oct 2011 08:27:13 -0400 Received: by mail-wy0-f173.google.com with SMTP id 22so1972788wyh.4 for ; Thu, 13 Oct 2011 05:27:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=lcOkhm/cjGZ0IgA6ReYsT/wmYCdTXvwZjJOP8XAkiuM=; b=DVeUynxm94xIBv3Ln9bhRP5f0G26jNQa4suRzGD7iDSg/VF9BEhqo1ORNiB5s6xJX1 9KtndgsEMNVP/tTLaaTO+Ycq/L7DplYkviDtEqe1d+abE0tPqgUvSrzGiUwpNxA3Y4Di Ehvxd+ole9TQbo32jLvJqoCZFHJrn3/A0d5do= Received: by 10.227.3.15 with SMTP id 15mr1318308wbl.33.1318508795764; Thu, 13 Oct 2011 05:26:35 -0700 (PDT) Received: from localhost (75.Red-83-60-208.dynamicIP.rima-tde.net. [83.60.208.75]) by mx.google.com with ESMTPS id q16sm5663078wbo.15.2011.10.13.05.26.34 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 13 Oct 2011 05:26:35 -0700 (PDT) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Thu, 13 Oct 2011 14:26:14 +0200 Message-Id: <1318508784-8172-1-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.7.6.2 In-Reply-To: <1316621468-32171-1-git-send-email-marcandre.lureau@redhat.com> References: <1316621468-32171-1-git-send-email-marcandre.lureau@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , kraxel@redhat.com Subject: [Qemu-devel] [PATCH 01/11] audio: add VOICE_VOLUME ctl X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org --- audio/audio.c | 12 ++++++++++++ audio/audio_int.h | 1 + 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/audio/audio.c b/audio/audio.c index 5649075..c759c1f 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -2050,17 +2050,29 @@ void AUD_del_capture (CaptureVoiceOut *cap, void *cb_opaque) void AUD_set_volume_out (SWVoiceOut *sw, int mute, uint8_t lvol, uint8_t rvol) { if (sw) { + HWVoiceOut *hw = sw->hw; + sw->vol.mute = mute; sw->vol.l = nominal_volume.l * lvol / 255; sw->vol.r = nominal_volume.r * rvol / 255; + + if (hw->pcm_ops->ctl_out) { + hw->pcm_ops->ctl_out (hw, VOICE_VOLUME, sw); + } } } void AUD_set_volume_in (SWVoiceIn *sw, int mute, uint8_t lvol, uint8_t rvol) { if (sw) { + HWVoiceIn *hw = sw->hw; + sw->vol.mute = mute; sw->vol.l = nominal_volume.l * lvol / 255; sw->vol.r = nominal_volume.r * rvol / 255; + + if (hw->pcm_ops->ctl_in) { + hw->pcm_ops->ctl_in (hw, VOICE_VOLUME, sw); + } } } diff --git a/audio/audio_int.h b/audio/audio_int.h index 2003f8b..117f95e 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -231,6 +231,7 @@ void audio_run (const char *msg); #define VOICE_ENABLE 1 #define VOICE_DISABLE 2 +#define VOICE_VOLUME 3 static inline int audio_ring_dist (int dst, int src, int len) {