From patchwork Mon Aug 26 00:29:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?B?Wm9sdMOhbiBLxZF2w6Fnw7M=?= X-Patchwork-Id: 1152904 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X3LE/T/Y"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46GtK61cwDz9sN4 for ; Mon, 26 Aug 2019 10:33:30 +1000 (AEST) Received: from localhost ([::1]:48856 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i22wq-0005Jm-5Y for incoming@patchwork.ozlabs.org; Sun, 25 Aug 2019 20:33:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48788) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i22sm-0002UF-Tz for qemu-devel@nongnu.org; Sun, 25 Aug 2019 20:29:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i22sl-00021L-TE for qemu-devel@nongnu.org; Sun, 25 Aug 2019 20:29:16 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:40674) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i22sl-00020J-Nh for qemu-devel@nongnu.org; Sun, 25 Aug 2019 20:29:15 -0400 Received: by mail-wm1-x342.google.com with SMTP id c5so13927346wmb.5 for ; Sun, 25 Aug 2019 17:29:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kzgx2650E0fVXX9zEvy6QLqOBlzWHa5+1jbkOPeTG2o=; b=X3LE/T/Y1k/8LVPIz/GohuMKAx45ghAfZbU5yXV+ZSXqSno7pvh+tFl6DmnoLS2wmr NHmg0iW2BUc4oe8ZaSu7P8uOS2dey2rVks/RKqc05uguIHy+8RN+JeNjKfI1C7iMX3cg eF/5CsNSufgYWsInYiG+Hja5/NiQr4JAv3JEznJjEB4MUR/P5qPgeOeDRgZKx5iq/3Mw vVi9FoKnmMXu5nJUtLF+LTScVA2cQe6flBzq7TGFINn36vwJgcDi2Mdzc3lo4MC1PCtQ D4uxWvWYg/n8uLcAoUpx7iJDPvRU/KNVgPjFS8GC/olrksdHXZeoweWD6c3mSf3PiHMA LouA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kzgx2650E0fVXX9zEvy6QLqOBlzWHa5+1jbkOPeTG2o=; b=a4974qUhmTXoZePWdTM9nUBgS5mtHq7wovPERxQrTWODGa07NFbtKZdyXc4G9Q26v6 gQaQplVN+3NMpuXRcw6MDaSZJ0mQbCngxcSbVIT1TsSzRAQpJoYbshU2qAIqxP4HCVG4 pjSbHqU6Q019eoLjJDzh18TKcVuv+Tutf7fH84xH8sYEXtVgwUlyJCQTnxJnrZdvkmNJ SRJ8V41t3bzYraEgHI/UMDgOup19M1K9vPHgx7olO13Lz+FsOurXn4i/u8w3kPfT0Z8q Z4DCPvLHHpUuXpjELVJ9PKB5TKsBv6NMCHiufbmIFIosPVXCzpAIZdGHVqGbILRzT9SS 2gCA== X-Gm-Message-State: APjAAAV09wUj+iQWkJ3OXCxgQGhXdzFSBiDnFRI6gc+DMrkHJdaTnZ6A Za9N2RtMG3h8swvAR+nRmeNnNLReB1A= X-Google-Smtp-Source: APXvYqxCrdClo0IEeC5gKB/BMDsKgv5CDVKqv9tK53F2pKp1NHOCb1mN56HplDplcKUwuX9d0ZfeQA== X-Received: by 2002:a1c:804b:: with SMTP id b72mr18103789wmd.139.1566779354532; Sun, 25 Aug 2019 17:29:14 -0700 (PDT) Received: from decltype.home.dirty-ice.org (2a01-036c-0113-61b1-0001-0000-0000-00d3.pool6.digikabel.hu. [2a01:36c:113:61b1:1::d3]) by smtp.gmail.com with ESMTPSA id c19sm8662339wml.13.2019.08.25.17.29.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Aug 2019 17:29:14 -0700 (PDT) From: "=?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?=" X-Google-Original-From: =?utf-8?b?S8WRdsOhZ8OzLCBab2x0w6Fu?= To: qemu-devel@nongnu.org Date: Mon, 26 Aug 2019 02:29:09 +0200 Message-Id: <5206082e64b6d7b9194e9076180399e5c5183650.1566779143.git.DirtY.iCE.hu@gmail.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: References: MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH 3/3] audio: paaudio: ability to specify stream name X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Markus Armbruster , Gerd Hoffmann , Maxim Levitsky Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 Reviewed-by: Maxim Levitsky --- qapi/audio.json | 6 ++++++ audio/paaudio.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/qapi/audio.json b/qapi/audio.json index 9fefdf5186..a433b3c9d7 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 "qemu", 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' } } ## diff --git a/audio/paaudio.c b/audio/paaudio.c index 777b8e4718..827f442b6e 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -562,7 +562,7 @@ static int qpa_init_out(HWVoiceOut *hw, struct audsettings *as, pa->stream = qpa_simple_new ( c, - "qemu", + ppdo->has_stream_name ? ppdo->stream_name : "qemu", PA_STREAM_PLAYBACK, ppdo->has_name ? ppdo->name : NULL, &ss, @@ -630,7 +630,7 @@ static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) pa->stream = qpa_simple_new ( c, - "qemu", + ppdo->has_stream_name ? ppdo->stream_name : "qemu", PA_STREAM_RECORD, ppdo->has_name ? ppdo->name : NULL, &ss,