From 5706db1deb061ee9affdcea81e59c4c2cad7c41e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= Date: Wed, 3 Jun 2015 23:03:47 +0200 Subject: audio: expose drv_opaque to init_out and init_in MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently the opaque pointer returned by audio_driver's init is only exposed to the driver's fini, but not to audio_pcm_ops. This way if someone wants to share a variable with the driver and the pcm, he must use global variables. This patch fixes it by adding a third parameter to audio_pcm_op's init_out and init_in. Signed-off-by: Kővágó, Zoltán Signed-off-by: Gerd Hoffmann --- audio/paaudio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'audio/paaudio.c') diff --git a/audio/paaudio.c b/audio/paaudio.c index 90ff24500b..bdf6cd52e1 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -534,7 +534,8 @@ fail: return NULL; } -static int qpa_init_out (HWVoiceOut *hw, struct audsettings *as) +static int qpa_init_out(HWVoiceOut *hw, struct audsettings *as, + void *drv_opaque) { int error; static pa_sample_spec ss; @@ -601,7 +602,7 @@ static int qpa_init_out (HWVoiceOut *hw, struct audsettings *as) return -1; } -static int qpa_init_in (HWVoiceIn *hw, struct audsettings *as) +static int qpa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_opaque) { int error; static pa_sample_spec ss; -- cgit v1.2.3