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/wavaudio.c | |
| parent | 307119e7d948bcdb5918fd762153deda471e695b (diff) | |
| download | qemu-5706db1deb061ee9affdcea81e59c4c2cad7c41e.tar.gz | |
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/wavaudio.c')
| -rw-r--r-- | audio/wavaudio.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/audio/wavaudio.c b/audio/wavaudio.c index 6846a1a9f7..09083da2cf 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) } } -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 = (WAVVoiceOut *) hw; int bits16 = 0, stereo = 0; @@ -117,8 +118,6 @@ static int wav_init_out (HWVoiceOut *hw, struct audsettings *as) }; struct audsettings wav_as = conf.settings; - (void) as; - stereo = wav_as.nchannels == 2; switch (wav_as.fmt) { case AUD_FMT_S8: |