From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49696) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2H4J-0001vR-8T for qemu-devel@nongnu.org; Tue, 09 Jun 2015 06:47:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2H4G-0004cN-Iw for qemu-devel@nongnu.org; Tue, 09 Jun 2015 06:47:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58487) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2H4G-0004c9-8z for qemu-devel@nongnu.org; Tue, 09 Jun 2015 06:47:40 -0400 From: Gerd Hoffmann Date: Tue, 9 Jun 2015 12:47:23 +0200 Message-Id: <1433846851-20552-5-git-send-email-kraxel@redhat.com> In-Reply-To: <1433846851-20552-1-git-send-email-kraxel@redhat.com> References: <1433846851-20552-1-git-send-email-kraxel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 04/12] audio: expose drv_opaque to init_out and init_in List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Vassili Karpov (malc)" , Gerd Hoffmann , =?UTF-8?q?K=C5=91v=C3=A1g=C3=B3=2C=20Zolt=C3=A1n?= From: K=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n 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=C5=91v=C3=A1g=C3=B3, Zolt=C3=A1n Signed-off-by: Gerd Hoffmann --- audio/alsaaudio.c | 5 +++-- audio/audio_int.h | 4 ++-- audio/audio_template.h | 2 +- audio/coreaudio.c | 3 ++- audio/dsound_template.h | 6 ++++-- audio/noaudio.c | 4 ++-- audio/ossaudio.c | 5 +++-- audio/paaudio.c | 5 +++-- audio/sdlaudio.c | 3 ++- audio/spiceaudio.c | 5 +++-- audio/wavaudio.c | 5 ++--- 11 files changed, 27 insertions(+), 20 deletions(-) diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index 74ead97..87e71c6 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -819,7 +819,8 @@ static void alsa_fini_out (HWVoiceOut *hw) alsa->pcm_buf =3D NULL; } =20 -static int alsa_init_out (HWVoiceOut *hw, struct audsettings *as) +static int alsa_init_out(HWVoiceOut *hw, struct audsettings *as, + void *drv_opaque) { ALSAVoiceOut *alsa =3D (ALSAVoiceOut *) hw; struct alsa_params_req req; @@ -928,7 +929,7 @@ static int alsa_ctl_out (HWVoiceOut *hw, int cmd, ...= ) return -1; } =20 -static int alsa_init_in (HWVoiceIn *hw, struct audsettings *as) +static int alsa_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv= _opaque) { ALSAVoiceIn *alsa =3D (ALSAVoiceIn *) hw; struct alsa_params_req req; diff --git a/audio/audio_int.h b/audio/audio_int.h index 0eba44f..566df5e 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -156,13 +156,13 @@ struct audio_driver { }; =20 struct audio_pcm_ops { - int (*init_out)(HWVoiceOut *hw, struct audsettings *as); + int (*init_out)(HWVoiceOut *hw, struct audsettings *as, void *drv_o= paque); void (*fini_out)(HWVoiceOut *hw); int (*run_out) (HWVoiceOut *hw, int live); int (*write) (SWVoiceOut *sw, void *buf, int size); int (*ctl_out) (HWVoiceOut *hw, int cmd, ...); =20 - int (*init_in) (HWVoiceIn *hw, struct audsettings *as); + int (*init_in) (HWVoiceIn *hw, struct audsettings *as, void *drv_op= aque); void (*fini_in) (HWVoiceIn *hw); int (*run_in) (HWVoiceIn *hw); int (*read) (SWVoiceIn *sw, void *buf, int size); diff --git a/audio/audio_template.h b/audio/audio_template.h index 584e536..f716d97 100644 --- a/audio/audio_template.h +++ b/audio/audio_template.h @@ -262,7 +262,7 @@ static HW *glue (audio_pcm_hw_add_new_, TYPE) (struct= audsettings *as) #ifdef DAC QLIST_INIT (&hw->cap_head); #endif - if (glue (hw->pcm_ops->init_, TYPE) (hw, as)) { + if (glue (hw->pcm_ops->init_, TYPE) (hw, as, s->drv_opaque)) { goto err0; } =20 diff --git a/audio/coreaudio.c b/audio/coreaudio.c index 5964c62..20346bc 100644 --- a/audio/coreaudio.c +++ b/audio/coreaudio.c @@ -287,7 +287,8 @@ static int coreaudio_write (SWVoiceOut *sw, void *buf= , int len) return audio_pcm_sw_write (sw, buf, len); } =20 -static int coreaudio_init_out (HWVoiceOut *hw, struct audsettings *as) +static int coreaudio_init_out(HWVoiceOut *hw, struct audsettings *as, + void *drv_opaque) { OSStatus status; coreaudioVoiceOut *core =3D (coreaudioVoiceOut *) hw; diff --git a/audio/dsound_template.h b/audio/dsound_template.h index 8b37d16..98276fb 100644 --- a/audio/dsound_template.h +++ b/audio/dsound_template.h @@ -174,9 +174,11 @@ static void dsound_fini_out (HWVoiceOut *hw) } =20 #ifdef DSBTYPE_IN -static int dsound_init_in (HWVoiceIn *hw, struct audsettings *as) +static int dsound_init_in(HWVoiceIn *hw, struct audsettings *as, + void *drv_opaque) #else -static int dsound_init_out (HWVoiceOut *hw, struct audsettings *as) +static int dsound_init_out(HWVoiceOut *hw, struct audsettings *as, + void *drv_opaque) #endif { int err; diff --git a/audio/noaudio.c b/audio/noaudio.c index cb38662..50db1f3 100644 --- a/audio/noaudio.c +++ b/audio/noaudio.c @@ -63,7 +63,7 @@ static int no_write (SWVoiceOut *sw, void *buf, int len= ) return audio_pcm_sw_write (sw, buf, len); } =20 -static int no_init_out (HWVoiceOut *hw, struct audsettings *as) +static int no_init_out(HWVoiceOut *hw, struct audsettings *as, void *drv= _opaque) { audio_pcm_init_info (&hw->info, as); hw->samples =3D 1024; @@ -82,7 +82,7 @@ static int no_ctl_out (HWVoiceOut *hw, int cmd, ...) return 0; } =20 -static int no_init_in (HWVoiceIn *hw, struct audsettings *as) +static int no_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_o= paque) { audio_pcm_init_info (&hw->info, as); hw->samples =3D 1024; diff --git a/audio/ossaudio.c b/audio/ossaudio.c index 4db2ca6..069ff60 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -510,7 +510,8 @@ static void oss_fini_out (HWVoiceOut *hw) } } =20 -static int oss_init_out (HWVoiceOut *hw, struct audsettings *as) +static int oss_init_out(HWVoiceOut *hw, struct audsettings *as, + void *drv_opaque) { OSSVoiceOut *oss =3D (OSSVoiceOut *) hw; struct oss_params req, obt; @@ -676,7 +677,7 @@ static int oss_ctl_out (HWVoiceOut *hw, int cmd, ...) return 0; } =20 -static int oss_init_in (HWVoiceIn *hw, struct audsettings *as) +static int oss_init_in(HWVoiceIn *hw, struct audsettings *as, void *drv_= opaque) { OSSVoiceIn *oss =3D (OSSVoiceIn *) hw; struct oss_params req, obt; diff --git a/audio/paaudio.c b/audio/paaudio.c index 90ff245..bdf6cd5 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -534,7 +534,8 @@ fail: return NULL; } =20 -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 audse= ttings *as) return -1; } =20 -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; diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c index d24daa5..b95a7e0 100644 --- a/audio/sdlaudio.c +++ b/audio/sdlaudio.c @@ -332,7 +332,8 @@ static void sdl_fini_out (HWVoiceOut *hw) sdl_close (&glob_sdl); } =20 -static int sdl_init_out (HWVoiceOut *hw, struct audsettings *as) +static int sdl_init_out(HWVoiceOut *hw, struct audsettings *as, + void *drv_opaque) { SDLVoiceOut *sdl =3D (SDLVoiceOut *) hw; SDLAudioState *s =3D &glob_sdl; diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c index 7b79bed..5c6f726 100644 --- a/audio/spiceaudio.c +++ b/audio/spiceaudio.c @@ -115,7 +115,8 @@ static int rate_get_samples (struct audio_pcm_info *i= nfo, SpiceRateCtl *rate) =20 /* playback */ =20 -static int line_out_init (HWVoiceOut *hw, struct audsettings *as) +static int line_out_init(HWVoiceOut *hw, struct audsettings *as, + void *drv_opaque) { SpiceVoiceOut *out =3D container_of (hw, SpiceVoiceOut, hw); struct audsettings settings; @@ -243,7 +244,7 @@ static int line_out_ctl (HWVoiceOut *hw, int cmd, ...= ) =20 /* record */ =20 -static int line_in_init (HWVoiceIn *hw, struct audsettings *as) +static int line_in_init(HWVoiceIn *hw, struct audsettings *as, void *drv= _opaque) { SpiceVoiceIn *in =3D container_of (hw, SpiceVoiceIn, hw); struct audsettings settings; diff --git a/audio/wavaudio.c b/audio/wavaudio.c index 6846a1a..09083da 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -105,7 +105,8 @@ static void le_store (uint8_t *buf, uint32_t val, int= len) } } =20 -static int wav_init_out (HWVoiceOut *hw, struct audsettings *as) +static int wav_init_out(HWVoiceOut *hw, struct audsettings *as, + void *drv_opaque) { WAVVoiceOut *wav =3D (WAVVoiceOut *) hw; int bits16 =3D 0, stereo =3D 0; @@ -117,8 +118,6 @@ static int wav_init_out (HWVoiceOut *hw, struct audse= ttings *as) }; struct audsettings wav_as =3D conf.settings; =20 - (void) as; - stereo =3D wav_as.nchannels =3D=3D 2; switch (wav_as.fmt) { case AUD_FMT_S8: --=20 1.8.3.1