From: Kővágó, Zoltán <dirty.ice.hu@gmail.com>
Date: Sun, 18 Aug 2019 23:06:52 +0000 (+0200)
Subject: paaudio: do not move stream when sink/source name is specified
X-Git-Tag: v4.2.0-rc0~222^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a435f74780dccc7d52ddffff69230492e410c1d;p=thirdparty%2Fqemu.git

paaudio: do not move stream when sink/source name is specified

Unless we disable stream moving, pulseaudio can easily move the stream
on connect, effectively ignoring the source/sink specified by the user.

Signed-off-by: Kővágó, Zoltán <DirtY.iCE.hu@gmail.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: c245929463e6e46a48b2875a150815e2ccba11b4.1566168923.git.DirtY.iCE.hu@gmail.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/audio/paaudio.c b/audio/paaudio.c
index cc3a34c2eae..24d98b344a3 100644
--- a/audio/paaudio.c
+++ b/audio/paaudio.c
@@ -517,6 +517,11 @@ static pa_stream *qpa_simple_new (
 #endif
         | PA_STREAM_AUTO_TIMING_UPDATE;
 
+    if (dev) {
+        /* don't move the stream if the user specified a sink/source */
+        flags |= PA_STREAM_DONT_MOVE;
+    }
+
     if (dir == PA_STREAM_PLAYBACK) {
         r = pa_stream_connect_playback(stream, dev, attr, flags, NULL, NULL);
     } else {