From patchwork Tue Mar 13 15:20:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marc-Andr=C3=A9_Lureau?= X-Patchwork-Id: 146429 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 3DAC8B6EEC for ; Wed, 14 Mar 2012 02:22:09 +1100 (EST) Received: from localhost ([::1]:38441 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7TY7-00028m-15 for incoming@patchwork.ozlabs.org; Tue, 13 Mar 2012 11:22:07 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37642) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7TXK-0000Dk-Aw for qemu-devel@nongnu.org; Tue, 13 Mar 2012 11:21:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7TXB-0003AC-MN for qemu-devel@nongnu.org; Tue, 13 Mar 2012 11:21:17 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:38634) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7TXB-00039n-DB for qemu-devel@nongnu.org; Tue, 13 Mar 2012 11:21:09 -0400 Received: by eeit10 with SMTP id t10so359321eei.4 for ; Tue, 13 Mar 2012 08:21:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=VP8eRCzjwoL1ZMEULd3sb1yVY50qxTMUGYuN6yCP7T4=; b=qhSlk3mFJ2Ah+LuSvn7uM5UWESY55CoC7sgvnXpWqWwS9YSpuKzfmBIJ67CPPDMgNV loDNXP+crdsYZubVg6dgT605NQRVFKRh/jKLRfwZhvMUyquc+5WDe1sMTC0PhJTr9l+c s9p5HccWJDsnoqhdJIpbAPl8LGKCLQC7RZcG0KrO0GwthZgc88BgwEz5Ul49qHRmfpFW rqMNa16XeJ+j3T/azrWgzrIcpUNw7nVY2VLeNfE6RF5te+u29jhqtggRtbDV3BpfrKAz +D4kOGQHFPpfQ6NGc4vOGui3Ydl03ySk10BVdYSQzahgl0BcjEbldbxzzv0ROuaPZNfk Frwg== Received: by 10.14.53.8 with SMTP id f8mr1292268eec.102.1331652067508; Tue, 13 Mar 2012 08:21:07 -0700 (PDT) Received: from localhost (254.pool85-58-48.dynamic.orange.es. [85.58.48.254]) by mx.google.com with ESMTPS id n56sm2975376eeb.4.2012.03.13.08.21.05 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 13 Mar 2012 08:21:06 -0700 (PDT) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Tue, 13 Mar 2012 16:20:49 +0100 Message-Id: <1331652059-10090-2-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1331652059-10090-1-git-send-email-marcandre.lureau@redhat.com> References: <1331652059-10090-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 74.125.83.45 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , dnb@redhat.com, dlaor@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH v4 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 Add a new PCM control operation to update the stream volume on the audio backend. The argument given is a SWVoiceOut/SWVoiceIn. v4: - verified other backends didn't fail/assert on this new control they randomly return 0 or -1, but we ignore return value. Signed-off-by: Marc-André Lureau --- 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 398763f..d76c342 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -2053,17 +2053,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) {