diff options
| author | Kővágó, Zoltán <dirty.ice.hu@gmail.com> | 2015-06-03 23:03:47 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-06-15 12:42:47 +0200 |
| commit | 5706db1deb061ee9affdcea81e59c4c2cad7c41e (patch) | |
| tree | 95bcad953310cc46fc8924cb52369b862cd31fb0 /audio/alsaaudio.c | |
| parent | 307119e7d948bcdb5918fd762153deda471e695b (diff) | |
audio: expose drv_opaque to init_out and init_in
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 <DirtY.iCE.hu@gmail.com>
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'audio/alsaaudio.c')
| -rw-r--r-- | audio/alsaaudio.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index ed7655de86..5a5bb1445d 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -807,7 +807,8 @@ static void alsa_fini_out (HWVoiceOut *hw) alsa->pcm_buf = NULL; } -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 = (ALSAVoiceOut *) hw; struct alsa_params_req req; @@ -916,7 +917,7 @@ static int alsa_ctl_out (HWVoiceOut *hw, int cmd, ...) return -1; } -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 = (ALSAVoiceIn *) hw; struct alsa_params_req req; |