diff options
| author | Kővágó, Zoltán <dirty.ice.hu@gmail.com> | 2015-06-03 23:03:52 +0200 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2015-06-15 12:42:48 +0200 |
| commit | 191e1f0acd32360b917fa54a52389b97d9b52b6f (patch) | |
| tree | 428c5336614e75cf0761a5931bec9fe81f210491 /audio/dsound_template.h | |
| parent | 49dd6d0d33e1a59b4055713079e64062bc5092b5 (diff) | |
| download | qemu-191e1f0acd32360b917fa54a52389b97d9b52b6f.zip | |
dsoundaudio: do not use global variables
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/dsound_template.h')
| -rw-r--r-- | audio/dsound_template.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/audio/dsound_template.h b/audio/dsound_template.h index 98276fb019..85ba8582bb 100644 --- a/audio/dsound_template.h +++ b/audio/dsound_template.h @@ -67,7 +67,8 @@ static int glue (dsound_lock_, TYPE) ( LPVOID *p2p, DWORD *blen1p, DWORD *blen2p, - int entire + int entire, + dsound *s ) { HRESULT hr; @@ -75,13 +76,14 @@ static int glue (dsound_lock_, TYPE) ( LPVOID p1 = NULL, p2 = NULL; DWORD blen1 = 0, blen2 = 0; DWORD flag; + DSoundConf *conf = &s->conf; #ifdef DSBTYPE_IN flag = entire ? DSCBLOCK_ENTIREBUFFER : 0; #else flag = entire ? DSBLOCK_ENTIREBUFFER : 0; #endif - for (i = 0; i < conf.lock_retries; ++i) { + for (i = 0; i < conf->lock_retries; ++i) { hr = glue (IFACE, _Lock) ( buf, pos, @@ -96,7 +98,7 @@ static int glue (dsound_lock_, TYPE) ( if (FAILED (hr)) { #ifndef DSBTYPE_IN if (hr == DSERR_BUFFERLOST) { - if (glue (dsound_restore_, TYPE) (buf)) { + if (glue (dsound_restore_, TYPE) (buf, s)) { dsound_logerr (hr, "Could not lock " NAME "\n"); goto fail; } @@ -110,7 +112,7 @@ static int glue (dsound_lock_, TYPE) ( break; } - if (i == conf.lock_retries) { + if (i == conf->lock_retries) { dolog ("%d attempts to lock " NAME " failed\n", i); goto fail; } @@ -183,9 +185,10 @@ static int dsound_init_out(HWVoiceOut *hw, struct audsettings *as, { int err; HRESULT hr; - dsound *s = &glob_dsound; + dsound *s = drv_opaque; WAVEFORMATEX wfx; struct audsettings obt_as; + DSoundConf *conf = &s->conf; #ifdef DSBTYPE_IN const char *typ = "ADC"; DSoundVoiceIn *ds = (DSoundVoiceIn *) hw; @@ -212,7 +215,7 @@ static int dsound_init_out(HWVoiceOut *hw, struct audsettings *as, bd.dwSize = sizeof (bd); bd.lpwfxFormat = &wfx; #ifdef DSBTYPE_IN - bd.dwBufferBytes = conf.bufsize_in; + bd.dwBufferBytes = conf->bufsize_in; hr = IDirectSoundCapture_CreateCaptureBuffer ( s->dsound_capture, &bd, @@ -221,7 +224,7 @@ static int dsound_init_out(HWVoiceOut *hw, struct audsettings *as, ); #else bd.dwFlags = DSBCAPS_STICKYFOCUS | DSBCAPS_GETCURRENTPOSITION2; - bd.dwBufferBytes = conf.bufsize_out; + bd.dwBufferBytes = conf->bufsize_out; hr = IDirectSound_CreateSoundBuffer ( s->dsound, &bd, @@ -271,6 +274,7 @@ static int dsound_init_out(HWVoiceOut *hw, struct audsettings *as, ); } hw->samples = bc.dwBufferBytes >> hw->info.shift; + ds->s = s; #ifdef DEBUG_DSOUND dolog ("caps %ld, desc %ld\n", |