From patchwork Thu Mar 22 15:21:29 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: 148268 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 CEB82B6FA3 for ; Fri, 23 Mar 2012 02:22:31 +1100 (EST) Received: from localhost ([::1]:42217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAjqP-0007MX-1J for incoming@patchwork.ozlabs.org; Thu, 22 Mar 2012 11:22:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:47751) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAjpq-0006TF-Tm for qemu-devel@nongnu.org; Thu, 22 Mar 2012 11:22:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SAjpk-0002Gm-Gg for qemu-devel@nongnu.org; Thu, 22 Mar 2012 11:21:54 -0400 Received: from mail-wg0-f41.google.com ([74.125.82.41]:44411) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SAjpk-0002GF-7c for qemu-devel@nongnu.org; Thu, 22 Mar 2012 11:21:48 -0400 Received: by wgbds1 with SMTP id ds1so461559wgb.4 for ; Thu, 22 Mar 2012 08:21:46 -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=Y+4Ucu9xOHKfJRgFKHOIqYexUpPA2gdCR0ow1jRO8vENVLOtpdxayoAn9PTouJBndl Kkf1aBWdDCw9SNcXjKHLZqE51WhkpXqKrrCdRPB9DalFQ5tQMJMvgir6KVaIwO4BlJM2 pmdoF5B7U6+1vbF9w0P4kqppSXgeX1hH0ZOXFmfj7GpXZoKsZnXu2PaMIBxaxngR8Pwv ji0COgzvMZx9WEZFiIAm2PS3j4YCrL3oter2ct6IKmjII0EBxg3eVKqcGj5pYGg+wIYe jPkPd1Ld6cxekcPan3mbKzkaSnxkJyOmiRI3MulPw+wY3DHOTYMKl3R56qLIKp0SdcN/ hyRA== Received: by 10.180.95.1 with SMTP id dg1mr6107745wib.21.1332429706242; Thu, 22 Mar 2012 08:21:46 -0700 (PDT) Received: from localhost (49.pool85-58-61.dynamic.orange.es. [85.58.61.49]) by mx.google.com with ESMTPS id ff2sm9942569wib.9.2012.03.22.08.21.43 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Mar 2012 08:21:44 -0700 (PDT) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Thu, 22 Mar 2012 16:21:29 +0100 Message-Id: <1332429698-10395-2-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1332429698-10395-1-git-send-email-marcandre.lureau@redhat.com> References: <1332429698-10395-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.82.41 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [Qemu-devel] [PATCH 01/10] 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) {