From patchwork Mon Mar 12 18:50:10 2012 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: 146224 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 513D7B6FB7 for ; Tue, 13 Mar 2012 06:33:36 +1100 (EST) Received: from localhost ([::1]:40677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7Azt-0002Oy-9u for incoming@patchwork.ozlabs.org; Mon, 12 Mar 2012 15:33:33 -0400 Received: from eggs.gnu.org ([208.118.235.92]:40626) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7ALI-0000wu-DU for qemu-devel@nongnu.org; Mon, 12 Mar 2012 14:51:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7AKx-00004z-CT for qemu-devel@nongnu.org; Mon, 12 Mar 2012 14:51:35 -0400 Received: from mail-ey0-f173.google.com ([209.85.215.173]:63230) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7AKx-0008JW-3F for qemu-devel@nongnu.org; Mon, 12 Mar 2012 14:51:15 -0400 Received: by mail-ey0-f173.google.com with SMTP id f11so1649617eaa.4 for ; Mon, 12 Mar 2012 11:51:14 -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; bh=XIn7pl72jyrTjtEyxtk7K4tUL6WqB5EFHwft/mJJ0rg=; b=uGlylkLqP/CL+673DWo5XpF/lAvBigJZazBgFhDTv1E2CQUPVTCzVULgba/9zIJVPY xIqx17vYlUPa3yujAES4yi898DAgFErHxBEKKRJ8gkXRV7PqFdt08JGH3bXVgFY/DEP/ PvwkZpY5GgUFthn/qriLGEfGciLgwDxLOiPXpF2LX1t2fWxPJ/dizoKKYWZwADge8KIh IZnYjTXRvM/bdHbwmjiKIHk6RdqzlvHWqXcde9xHDK70f+Q/gnw+Ha7D7t6Cktr5M18k KsejtwRozIJNQh0Yih7eyZp5bJkZIEiJBW8yuNpECCcQzT4hpJPYSMGEeGcsoNZ7Oyvs GCNQ== Received: by 10.14.100.207 with SMTP id z55mr1946618eef.104.1331578274146; Mon, 12 Mar 2012 11:51:14 -0700 (PDT) Received: from localhost (133.pool85-58-35.dynamic.orange.es. [85.58.35.133]) by mx.google.com with ESMTPS id s48sm52811431eem.0.2012.03.12.11.51.11 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Mar 2012 11:51:12 -0700 (PDT) From: "=?UTF-8?q?Marc-Andr=C3=A9=20Lureau?=" To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2012 19:50:10 +0100 Message-Id: <1331578211-18232-11-git-send-email-marcandre.lureau@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <1331578211-18232-1-git-send-email-marcandre.lureau@redhat.com> References: <1331578211-18232-1-git-send-email-marcandre.lureau@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.215.173 Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , dnb@redhat.com, dlaor@redhat.com, kraxel@redhat.com Subject: [Qemu-devel] [PATCH 10/11] 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 --- audio/paaudio.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 91 insertions(+), 5 deletions(-) diff --git a/audio/paaudio.c b/audio/paaudio.c index beed434..7ddc16d 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -664,15 +664,100 @@ 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; } @@ -801,5 +886,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 };