[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 03/13] audio: paaudio: ability to specify stream name
From: |
Gerd Hoffmann |
Subject: |
[PULL 03/13] audio: paaudio: ability to specify stream name |
Date: |
Fri, 18 Oct 2019 09:41:34 +0200 |
From: Kővágó, Zoltán <address@hidden>
This can be used to identify stream in tools like pavucontrol when one
creates multiple -audiodevs or runs multiple qemu instances.
Signed-off-by: Kővágó, Zoltán <address@hidden>
Acked-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
audio/paaudio.c | 4 ++--
qapi/audio.json | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/audio/paaudio.c b/audio/paaudio.c
index 3e6580a5ee50..2cba492d8265 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -339,7 +339,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings
*as,
pa->stream = qpa_simple_new (
c,
- g->dev->id,
+ ppdo->has_stream_name ? ppdo->stream_name : g->dev->id,
PA_STREAM_PLAYBACK,
ppdo->has_name ? ppdo->name : NULL,
&ss,
@@ -388,7 +388,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings
*as, void *drv_opaque)
pa->stream = qpa_simple_new (
c,
- g->dev->id,
+ ppdo->has_stream_name ? ppdo->stream_name : g->dev->id,
PA_STREAM_RECORD,
ppdo->has_name ? ppdo->name : NULL,
&ss,
diff --git a/qapi/audio.json b/qapi/audio.json
index 9fefdf5186dd..e45218f081f2 100644
--- a/qapi/audio.json
+++ b/qapi/audio.json
@@ -206,6 +206,11 @@
#
# @name: name of the sink/source to use
#
+# @stream-name: name of the PulseAudio stream created by qemu. Can be
+# used to identify the stream in PulseAudio when you
+# create multiple PulseAudio devices or run multiple qemu
+# instances (default: audiodev's id, since 4.2)
+#
# @latency: latency you want PulseAudio to achieve in microseconds
# (default 15000)
#
@@ -215,6 +220,7 @@
'base': 'AudiodevPerDirectionOptions',
'data': {
'*name': 'str',
+ '*stream-name': 'str',
'*latency': 'uint32' } }
##
--
2.18.1
- [PULL 00/13] Audio 20191018 patches, Gerd Hoffmann, 2019/10/18
- [PULL 01/13] audio: fix parameter dereference before NULL check, Gerd Hoffmann, 2019/10/18
- [PULL 03/13] audio: paaudio: ability to specify stream name,
Gerd Hoffmann <=
- [PULL 13/13] paaudio: fix channel order for usb-audio 5.1 and 7.1 streams, Gerd Hoffmann, 2019/10/18
- [PULL 07/13] audio: support more than two channels in volume setting, Gerd Hoffmann, 2019/10/18
- [PULL 12/13] usbaudio: change playback counters to 64 bit, Gerd Hoffmann, 2019/10/18
- [PULL 09/13] audio: basic support for multichannel audio, Gerd Hoffmann, 2019/10/18
- [PULL 08/13] audio: replace shift in audio_pcm_info with bytes_per_frame, Gerd Hoffmann, 2019/10/18
- [PULL 10/13] usb-audio: do not count on avail bytes actually available, Gerd Hoffmann, 2019/10/18
- [PULL 04/13] audio: add mixing-engine option (documentation), Gerd Hoffmann, 2019/10/18
- [PULL 05/13] audio: make mixeng optional, Gerd Hoffmann, 2019/10/18
- [PULL 11/13] usb-audio: support more than two channels of audio, Gerd Hoffmann, 2019/10/18
- [PULL 06/13] paaudio: get/put_buffer functions, Gerd Hoffmann, 2019/10/18