[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/5] audio: pa: Set volume of recording stream instea
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 1/5] audio: pa: Set volume of recording stream instead of recording device |
Date: |
Mon, 6 Jun 2016 09:02:55 +0200 |
From: Peter Krempa <address@hidden>
Since pulseaudio 1.0 it's possible to set the individual stream volume
rather than setting the device volume. With this, setting hardware mixer
of a emulated sound card doesn't mess up the volume configuration of the
host.
A side effect is that this limits compatible pulseaudio version to 1.0
which was released on 2011-09-27.
Signed-off-by: Peter Krempa <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
audio/paaudio.c | 11 +++++------
configure | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 57678e7..65beb6f 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -781,23 +781,22 @@ static int qpa_ctl_in (HWVoiceIn *hw, int cmd, ...)
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),
+ op = pa_context_set_source_output_volume (g->context,
+ pa_stream_get_index (pa->stream),
&v, NULL, NULL);
if (!op) {
qpa_logerr (pa_context_errno (g->context),
- "set_source_volume() failed\n");
+ "set_source_output_volume() failed\n");
} else {
pa_operation_unref(op);
}
- op = pa_context_set_source_mute_by_index (g->context,
+ op = pa_context_set_source_output_mute (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");
+ "set_source_output_mute() failed\n");
} else {
pa_operation_unref (op);
}
diff --git a/configure b/configure
index b5aab72..6d01d96 100755
--- a/configure
+++ b/configure
@@ -2813,8 +2813,8 @@ for drv in $audio_drv_list; do
;;
pa)
- audio_drv_probe $drv pulse/mainloop.h "-lpulse" \
- "pa_mainloop *m = 0; pa_mainloop_free (m); return 0;"
+ audio_drv_probe $drv pulse/pulseaudio.h "-lpulse" \
+ "pa_context_set_source_output_volume(NULL, 0, NULL, NULL, NULL);
return 0;"
libs_softmmu="-lpulse $libs_softmmu"
audio_pt_int="yes"
;;
--
1.8.3.1
- [Qemu-devel] [PULL 0/5] audio patch queue, Gerd Hoffmann, 2016/06/06
- [Qemu-devel] [PULL 5/5] hw/audio: QOM'ify milkymist-ac97.c, Gerd Hoffmann, 2016/06/06
- [Qemu-devel] [PULL 3/5] hw/audio: QOM cleanup for intel-hda, Gerd Hoffmann, 2016/06/06
- [Qemu-devel] [PULL 2/5] hw/audio: QOM'ify cs4231.c, Gerd Hoffmann, 2016/06/06
- [Qemu-devel] [PULL 1/5] audio: pa: Set volume of recording stream instead of recording device,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 4/5] hw/audio: QOM'ify intel-hda, Gerd Hoffmann, 2016/06/06
- Re: [Qemu-devel] [PULL 0/5] audio patch queue, Peter Maydell, 2016/06/06