[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/13] audio: paaudio: fix connection and stream name
From: |
Gerd Hoffmann |
Subject: |
[PULL 02/13] audio: paaudio: fix connection and stream name |
Date: |
Fri, 18 Oct 2019 09:41:33 +0200 |
From: Kővágó, Zoltán <address@hidden>
Connection name was previously erroneously set to the server socket
path, while connection names were simply "qemu". After this patch, the
connection name will be the vm name (falling back to "qemu" if not
specified), while stream names will be the audiodev's id.
Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
audio/paaudio.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/audio/paaudio.c b/audio/paaudio.c
index ed31f863f7fe..3e6580a5ee50 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -2,6 +2,7 @@
#include "qemu/osdep.h"
#include "qemu/module.h"
+#include "qemu-common.h"
#include "audio.h"
#include "qapi/opts-visitor.h"
@@ -338,7 +339,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings
*as,
pa->stream = qpa_simple_new (
c,
- "qemu",
+ g->dev->id,
PA_STREAM_PLAYBACK,
ppdo->has_name ? ppdo->name : NULL,
&ss,
@@ -387,7 +388,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings
*as, void *drv_opaque)
pa->stream = qpa_simple_new (
c,
- "qemu",
+ g->dev->id,
PA_STREAM_RECORD,
ppdo->has_name ? ppdo->name : NULL,
&ss,
@@ -549,6 +550,7 @@ static int qpa_validate_per_direction_opts(Audiodev *dev,
/* common */
static void *qpa_conn_init(const char *server)
{
+ const char *vm_name;
PAConnection *c = g_malloc0(sizeof(PAConnection));
QTAILQ_INSERT_TAIL(&pa_conns, c, list);
@@ -557,8 +559,9 @@ static void *qpa_conn_init(const char *server)
goto fail;
}
+ vm_name = qemu_get_vm_name();
c->context = pa_context_new(pa_threaded_mainloop_get_api(c->mainloop),
- server);
+ vm_name ? vm_name : "qemu");
if (!c->context) {
goto fail;
}
--
2.18.1
- [PULL 13/13] paaudio: fix channel order for usb-audio 5.1 and 7.1 streams, (continued)
- [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
- [PULL 02/13] audio: paaudio: fix connection and stream name,
Gerd Hoffmann <=
- Re: [PULL 00/13] Audio 20191018 patches, Peter Maydell, 2019/10/18