From patchwork Tue Apr 17 12:32:43 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: 153159 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 357D5B707E for ; Tue, 17 Apr 2012 22:34:23 +1000 (EST) Received: from localhost ([::1]:38110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK7bx-0002m2-39 for incoming@patchwork.ozlabs.org; Tue, 17 Apr 2012 08:34:21 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58548) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK7bl-0002lr-G2 for qemu-devel@nongnu.org; Tue, 17 Apr 2012 08:34:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SK7bd-00005R-Uf for qemu-devel@nongnu.org; Tue, 17 Apr 2012 08:34:09 -0400 Received: from mail-pb0-f45.google.com ([209.85.160.45]:47043) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SK7bd-0008AG-MR for qemu-devel@nongnu.org; Tue, 17 Apr 2012 08:34:01 -0400 Received: by mail-pb0-f45.google.com with SMTP id uo5so8847635pbc.4 for ; Tue, 17 Apr 2012 05:34:00 -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=vKKDkuHn+Ck/KHzHmhRKy6b+2oNaPOkTu69xdyMS5ok=; b=HxjRoALcZV3n0rOWwy7j0gjHLMSi4/e35I29tv96mzl+FNjKpCh9/dBr8kjDfh7KP/ a6NSIaflq11OFU0wdAvbc2B2wBKyvPNl2o6tk6oJjgaISXC3EaMRcyGV1d50DVKvmx+X in4t8jhr0PLiMpwh+DxlyJULXRbGDK20Y9y8pjEDpl2HCaWvOYUtEfe96aBOnrOQe22Z CDNYF/wPvh+3qTP/mtO+207/WpbWKBECysVWdQ4Kh1xgIxGfoNIYuH4mWftzQZy/l8Cl joKE6uvXzISPFcn8tNZVn01HnT6qv857lQVdNNN7JnOnQRxrMmkbJYtyW7wFChdgtD/b 2SUg== Received: by 10.68.194.1 with SMTP id hs1mr36185502pbc.6.1334666040783; Tue, 17 Apr 2012 05:34:00 -0700 (PDT) Received: from localhost (140.pool85-58-59.dynamic.orange.es. [85.58.59.140]) by mx.google.com with ESMTPS id pj1sm20615383pbc.44.2012.04.17.05.33.53 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 17 Apr 2012 05:33:56 -0700 (PDT) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Tue, 17 Apr 2012 14:32:43 +0200 Message-Id: <1334665964-3075-10-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.7.10 In-Reply-To: <1334665964-3075-1-git-send-email-marcandre.lureau@redhat.com> References: <1334665964-3075-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: 209.85.160.45 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , dlaor@redhat.com, kraxel@redhat.com, areis@redhat.com Subject: [Qemu-devel] [PATCH 09/10] Allow controlling volume with PulseAudio backend 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 Signed-off-by: Marc-André Lureau --- audio/paaudio.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 94 insertions(+), 5 deletions(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index 6f50c1c..e6708d0 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -677,15 +677,103 @@ static void qpa_fini_in (HWVoiceIn *hw) static int qpa_ctl_out (HWVoiceOut *hw, int cmd, ...) { - (void) hw; - (void) cmd; + PAVoiceOut *pa = (PAVoiceOut *) hw; + pa_operation *op; + pa_cvolume v; + paaudio *g = &glob_paaudio; + + pa_cvolume_init (&v); + + switch (cmd) { + case VOICE_VOLUME: + { + SWVoiceOut *sw; + va_list ap; + + va_start (ap, cmd); + sw = va_arg (ap, SWVoiceOut *); + va_end (ap); + + v.channels = 2; + v.values[0] = ((PA_VOLUME_NORM - PA_VOLUME_MUTED) * sw->vol.l) / UINT32_MAX; + v.values[1] = ((PA_VOLUME_NORM - PA_VOLUME_MUTED) * sw->vol.r) / UINT32_MAX; + + pa_threaded_mainloop_lock (g->mainloop); + + op = pa_context_set_sink_input_volume (g->context, + pa_stream_get_index (pa->stream), + &v, NULL, NULL); + if (!op) + qpa_logerr (pa_context_errno (g->context), + "set_sink_input_volume() failed\n"); + else + pa_operation_unref (op); + + op = pa_context_set_sink_input_mute (g->context, + pa_stream_get_index (pa->stream), + sw->vol.mute, NULL, NULL); + if (!op) { + qpa_logerr (pa_context_errno (g->context), + "set_sink_input_mute() failed\n"); + } else { + pa_operation_unref (op); + } + + pa_threaded_mainloop_unlock (g->mainloop); + } + } return 0; } static int qpa_ctl_in (HWVoiceIn *hw, int cmd, ...) { - (void) hw; - (void) cmd; + PAVoiceIn *pa = (PAVoiceIn *) hw; + pa_operation *op; + pa_cvolume v; + paaudio *g = &glob_paaudio; + + pa_cvolume_init (&v); + + switch (cmd) { + case VOICE_VOLUME: + { + SWVoiceIn *sw; + va_list ap; + + va_start (ap, cmd); + sw = va_arg (ap, SWVoiceIn *); + va_end (ap); + + v.channels = 2; + v.values[0] = ((PA_VOLUME_NORM - PA_VOLUME_MUTED) * sw->vol.l) / UINT32_MAX; + v.values[1] = ((PA_VOLUME_NORM - PA_VOLUME_MUTED) * sw->vol.r) / UINT32_MAX; + + pa_threaded_mainloop_lock (g->mainloop); + + /* FIXME: use the upcoming "set_source_output_{volume,mute}" */ + op = pa_context_set_source_volume_by_index (g->context, + pa_stream_get_device_index (pa->stream), + &v, NULL, NULL); + if (!op) { + qpa_logerr (pa_context_errno (g->context), + "set_source_volume() failed\n"); + } else { + pa_operation_unref(op); + } + + op = pa_context_set_source_mute_by_index (g->context, + pa_stream_get_index (pa->stream), + sw->vol.mute, NULL, NULL); + if (!op) { + qpa_logerr (pa_context_errno (g->context), + "set_source_mute() failed\n"); + } else { + pa_operation_unref (op); + } + + pa_threaded_mainloop_unlock (g->mainloop); + } + } return 0; } @@ -822,5 +910,6 @@ struct audio_driver pa_audio_driver = { .max_voices_out = INT_MAX, .max_voices_in = INT_MAX, .voice_size_out = sizeof (PAVoiceOut), - .voice_size_in = sizeof (PAVoiceIn) + .voice_size_in = sizeof (PAVoiceIn), + .ctl_caps = VOICE_VOLUME_CAP };