From a70bb259c7a78ba5b802abadbffbc56228449b50 Mon Sep 17 00:00:00 2001 From: pionere Date: Thu, 20 Jan 2022 13:16:03 +0100 Subject: [PATCH] drop handle parameter of OpenDevice --- src/audio/SDL_audio.c | 4 ++-- src/audio/SDL_sysaudio.h | 2 +- src/audio/aaudio/SDL_aaudio.c | 2 +- src/audio/alsa/SDL_alsa_audio.c | 4 ++-- src/audio/android/SDL_androidaudio.c | 2 +- src/audio/arts/SDL_artsaudio.c | 2 +- src/audio/coreaudio/SDL_coreaudio.m | 10 ++++++---- src/audio/directsound/SDL_directsound.c | 4 ++-- src/audio/disk/SDL_diskaudio.c | 3 ++- src/audio/dsp/SDL_dspaudio.c | 2 +- src/audio/dummy/SDL_dummyaudio.c | 2 +- src/audio/emscripten/SDL_emscriptenaudio.c | 2 +- src/audio/esd/SDL_esdaudio.c | 2 +- src/audio/fusionsound/SDL_fsaudio.c | 2 +- src/audio/haiku/SDL_haikuaudio.cc | 2 +- src/audio/jack/SDL_jackaudio.c | 2 +- src/audio/nacl/SDL_naclaudio.c | 2 +- src/audio/nas/SDL_nasaudio.c | 2 +- src/audio/netbsd/SDL_netbsdaudio.c | 2 +- src/audio/openslES/SDL_openslES.c | 2 +- src/audio/os2/SDL_os2audio.c | 4 ++-- src/audio/paudio/SDL_paudio.c | 2 +- src/audio/pipewire/SDL_pipewire.c | 4 ++-- src/audio/psp/SDL_pspaudio.c | 2 +- src/audio/pulseaudio/SDL_pulseaudio.c | 4 ++-- src/audio/qsa/SDL_qsa_audio.c | 4 ++-- src/audio/sndio/SDL_sndioaudio.c | 2 +- src/audio/sun/SDL_sunaudio.c | 2 +- src/audio/vita/SDL_vitaaudio.c | 2 +- src/audio/wasapi/SDL_wasapi.c | 4 ++-- src/audio/winmm/SDL_winmm.c | 3 ++- 31 files changed, 46 insertions(+), 42 deletions(-) diff --git a/src/audio/SDL_audio.c b/src/audio/SDL_audio.c index 9d6f936e7..3a841450c 100644 --- a/src/audio/SDL_audio.c +++ b/src/audio/SDL_audio.c @@ -289,7 +289,7 @@ SDL_AudioFreeDeviceHandle_Default(void *handle) static int -SDL_AudioOpenDevice_Default(_THIS, void *handle, const char *devname) +SDL_AudioOpenDevice_Default(_THIS, const char *devname) { return SDL_Unsupported(); } @@ -1383,7 +1383,7 @@ open_audio_device(const char *devname, int iscapture, } } - if (current_audio.impl.OpenDevice(device, handle, devname) < 0) { + if (current_audio.impl.OpenDevice(device, devname) < 0) { close_audio_device(device); return 0; } diff --git a/src/audio/SDL_sysaudio.h b/src/audio/SDL_sysaudio.h index 0bedfbb52..8aa729817 100644 --- a/src/audio/SDL_sysaudio.h +++ b/src/audio/SDL_sysaudio.h @@ -65,7 +65,7 @@ extern void SDL_OpenedAudioDeviceDisconnected(SDL_AudioDevice *device); typedef struct SDL_AudioDriverImpl { void (*DetectDevices) (void); - int (*OpenDevice) (_THIS, void *handle, const char *devname); + int (*OpenDevice) (_THIS, const char *devname); void (*ThreadInit) (_THIS); /* Called by audio thread at start */ void (*ThreadDeinit) (_THIS); /* Called by audio thread at end */ void (*WaitDevice) (_THIS); diff --git a/src/audio/aaudio/SDL_aaudio.c b/src/audio/aaudio/SDL_aaudio.c index 63382104e..1d1553ba7 100644 --- a/src/audio/aaudio/SDL_aaudio.c +++ b/src/audio/aaudio/SDL_aaudio.c @@ -71,7 +71,7 @@ void aaudio_errorCallback( AAudioStream *stream, void *userData, aaudio_result_t #define LIB_AAUDIO_SO "libaaudio.so" static int -aaudio_OpenDevice(_THIS, void *handle, const char *devname) +aaudio_OpenDevice(_THIS, const char *devname) { struct SDL_PrivateAudioData *private; SDL_bool iscapture = this->iscapture; diff --git a/src/audio/alsa/SDL_alsa_audio.c b/src/audio/alsa/SDL_alsa_audio.c index 4a2eec7f0..3f990a2a0 100644 --- a/src/audio/alsa/SDL_alsa_audio.c +++ b/src/audio/alsa/SDL_alsa_audio.c @@ -543,7 +543,7 @@ ALSA_set_buffer_size(_THIS, snd_pcm_hw_params_t *params) } static int -ALSA_OpenDevice(_THIS, void *handle, const char *devname) +ALSA_OpenDevice(_THIS, const char *devname) { int status = 0; SDL_bool iscapture = this->iscapture; @@ -570,7 +570,7 @@ ALSA_OpenDevice(_THIS, void *handle, const char *devname) /* Open the audio device */ /* Name of device should depend on # channels in spec */ status = ALSA_snd_pcm_open(&pcm_handle, - get_audio_device(handle, this->spec.channels), + get_audio_device(this->handle, this->spec.channels), iscapture ? SND_PCM_STREAM_CAPTURE : SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK); diff --git a/src/audio/android/SDL_androidaudio.c b/src/audio/android/SDL_androidaudio.c index 92bb5910e..aa0d44242 100644 --- a/src/audio/android/SDL_androidaudio.c +++ b/src/audio/android/SDL_androidaudio.c @@ -36,7 +36,7 @@ static SDL_AudioDevice* audioDevice = NULL; static SDL_AudioDevice* captureDevice = NULL; static int -ANDROIDAUDIO_OpenDevice(_THIS, void *handle, const char *devname) +ANDROIDAUDIO_OpenDevice(_THIS, const char *devname) { SDL_AudioFormat test_format; SDL_bool iscapture = this->iscapture; diff --git a/src/audio/arts/SDL_artsaudio.c b/src/audio/arts/SDL_artsaudio.c index 359eec40d..ce74b7d4d 100644 --- a/src/audio/arts/SDL_artsaudio.c +++ b/src/audio/arts/SDL_artsaudio.c @@ -216,7 +216,7 @@ ARTS_Suspend(void) } static int -ARTS_OpenDevice(_THIS, void *handle, const char *devname) +ARTS_OpenDevice(_THIS, const char *devname) { int rc = 0; int bits, frag_spec = 0; diff --git a/src/audio/coreaudio/SDL_coreaudio.m b/src/audio/coreaudio/SDL_coreaudio.m index 952a74d1a..304599fff 100644 --- a/src/audio/coreaudio/SDL_coreaudio.m +++ b/src/audio/coreaudio/SDL_coreaudio.m @@ -741,8 +741,10 @@ COREAUDIO_CloseDevice(_THIS) #if MACOSX_COREAUDIO static int -prepare_device(_THIS, void *handle, int iscapture) +prepare_device(_THIS) { + void *handle = this->handle; + SDL_bool iscapture = this->iscapture; AudioDeviceID devid = (AudioDeviceID) ((size_t) handle); OSStatus result = noErr; UInt32 size = 0; @@ -983,7 +985,7 @@ audioqueue_thread(void *arg) and quits (flagging the audioqueue for shutdown), or toggles to some other system output device (in which case we'll try again). */ const AudioDeviceID prev_devid = this->hidden->deviceID; - if (prepare_device(this, this->handle, this->iscapture) && (prev_devid != this->hidden->deviceID)) { + if (prepare_device(this) && (prev_devid != this->hidden->deviceID)) { AudioQueueStop(this->hidden->audioQueue, 1); if (assign_device_to_audioqueue(this)) { int i; @@ -1015,7 +1017,7 @@ audioqueue_thread(void *arg) } static int -COREAUDIO_OpenDevice(_THIS, void *handle, const char *devname) +COREAUDIO_OpenDevice(_THIS, const char *devname) { AudioStreamBasicDescription *strdesc; SDL_AudioFormat test_format; @@ -1112,7 +1114,7 @@ COREAUDIO_OpenDevice(_THIS, void *handle, const char *devname) strdesc->mBytesPerPacket = strdesc->mBytesPerFrame * strdesc->mFramesPerPacket; #if MACOSX_COREAUDIO - if (!prepare_device(this, handle, iscapture)) { + if (!prepare_device(this)) { return -1; } #endif diff --git a/src/audio/directsound/SDL_directsound.c b/src/audio/directsound/SDL_directsound.c index 86e58a1a6..eda0eecec 100644 --- a/src/audio/directsound/SDL_directsound.c +++ b/src/audio/directsound/SDL_directsound.c @@ -473,14 +473,14 @@ CreateCaptureBuffer(_THIS, const DWORD bufsize, WAVEFORMATEX *wfmt) } static int -DSOUND_OpenDevice(_THIS, void *handle, const char *devname) +DSOUND_OpenDevice(_THIS, const char *devname) { const DWORD numchunks = 8; HRESULT result; SDL_bool tried_format = SDL_FALSE; SDL_bool iscapture = this->iscapture; SDL_AudioFormat test_format; - LPGUID guid = (LPGUID) handle; + LPGUID guid = (LPGUID) this->handle; DWORD bufsize; /* Initialize all variables that we clean on shutdown */ diff --git a/src/audio/disk/SDL_diskaudio.c b/src/audio/disk/SDL_diskaudio.c index 9eec2e849..f1edf503e 100644 --- a/src/audio/disk/SDL_diskaudio.c +++ b/src/audio/disk/SDL_diskaudio.c @@ -126,8 +126,9 @@ get_filename(const SDL_bool iscapture, const char *devname) } static int -DISKAUDIO_OpenDevice(_THIS, void *handle, const char *devname) +DISKAUDIO_OpenDevice(_THIS, const char *devname) { + void *handle = _this->handle; /* handle != NULL means "user specified the placeholder name on the fake detected device list" */ SDL_bool iscapture = _this->iscapture; const char *fname = get_filename(iscapture, handle ? NULL : devname); diff --git a/src/audio/dsp/SDL_dspaudio.c b/src/audio/dsp/SDL_dspaudio.c index 0176da9e4..8d4ee9435 100644 --- a/src/audio/dsp/SDL_dspaudio.c +++ b/src/audio/dsp/SDL_dspaudio.c @@ -68,7 +68,7 @@ DSP_CloseDevice(_THIS) static int -DSP_OpenDevice(_THIS, void *handle, const char *devname) +DSP_OpenDevice(_THIS, const char *devname) { SDL_bool iscapture = this->iscapture; const int flags = ((iscapture) ? OPEN_FLAGS_INPUT : OPEN_FLAGS_OUTPUT); diff --git a/src/audio/dummy/SDL_dummyaudio.c b/src/audio/dummy/SDL_dummyaudio.c index e2b7bc6d0..dab1edb59 100644 --- a/src/audio/dummy/SDL_dummyaudio.c +++ b/src/audio/dummy/SDL_dummyaudio.c @@ -28,7 +28,7 @@ #include "SDL_dummyaudio.h" static int -DUMMYAUDIO_OpenDevice(_THIS, void *handle, const char *devname) +DUMMYAUDIO_OpenDevice(_THIS, const char *devname) { _this->hidden = (void *) 0x1; /* just something non-NULL */ return 0; /* always succeeds. */ diff --git a/src/audio/emscripten/SDL_emscriptenaudio.c b/src/audio/emscripten/SDL_emscriptenaudio.c index 157892f8f..a5b153368 100644 --- a/src/audio/emscripten/SDL_emscriptenaudio.c +++ b/src/audio/emscripten/SDL_emscriptenaudio.c @@ -192,7 +192,7 @@ EMSCRIPTENAUDIO_CloseDevice(_THIS) } static int -EMSCRIPTENAUDIO_OpenDevice(_THIS, void *handle, const char *devname) +EMSCRIPTENAUDIO_OpenDevice(_THIS, const char *devname) { SDL_AudioFormat test_format; SDL_bool iscapture = this->iscapture; diff --git a/src/audio/esd/SDL_esdaudio.c b/src/audio/esd/SDL_esdaudio.c index 152100519..ccf07916c 100644 --- a/src/audio/esd/SDL_esdaudio.c +++ b/src/audio/esd/SDL_esdaudio.c @@ -208,7 +208,7 @@ get_progname(void) static int -ESD_OpenDevice(_THIS, void *handle, const char *devname) +ESD_OpenDevice(_THIS, const char *devname) { esd_format_t format = (ESD_STREAM | ESD_PLAY); SDL_AudioFormat test_format = 0; diff --git a/src/audio/fusionsound/SDL_fsaudio.c b/src/audio/fusionsound/SDL_fsaudio.c index 92c214ceb..fbe684de8 100644 --- a/src/audio/fusionsound/SDL_fsaudio.c +++ b/src/audio/fusionsound/SDL_fsaudio.c @@ -174,7 +174,7 @@ SDL_FS_CloseDevice(_THIS) static int -SDL_FS_OpenDevice(_THIS, void *handle, const char *devname) +SDL_FS_OpenDevice(_THIS, const char *devname) { int bytes; SDL_AudioFormat test_format; diff --git a/src/audio/haiku/SDL_haikuaudio.cc b/src/audio/haiku/SDL_haikuaudio.cc index c23b63ec6..bb6b78c1d 100644 --- a/src/audio/haiku/SDL_haikuaudio.cc +++ b/src/audio/haiku/SDL_haikuaudio.cc @@ -120,7 +120,7 @@ UnmaskSignals(sigset_t * omask) static int -HAIKUAUDIO_OpenDevice(_THIS, void *handle, const char *devname) +HAIKUAUDIO_OpenDevice(_THIS, const char *devname) { media_raw_audio_format format; SDL_AudioFormat test_format; diff --git a/src/audio/jack/SDL_jackaudio.c b/src/audio/jack/SDL_jackaudio.c index 649077c87..f6e7e0cd3 100644 --- a/src/audio/jack/SDL_jackaudio.c +++ b/src/audio/jack/SDL_jackaudio.c @@ -280,7 +280,7 @@ JACK_CloseDevice(_THIS) } static int -JACK_OpenDevice(_THIS, void *handle, const char *devname) +JACK_OpenDevice(_THIS, const char *devname) { /* Note that JACK uses "output" for capture devices (they output audio data to us) and "input" for playback (we input audio data to them). diff --git a/src/audio/nacl/SDL_naclaudio.c b/src/audio/nacl/SDL_naclaudio.c index 14fcf9da0..bf48165f5 100644 --- a/src/audio/nacl/SDL_naclaudio.c +++ b/src/audio/nacl/SDL_naclaudio.c @@ -99,7 +99,7 @@ static void NACLAUDIO_CloseDevice(SDL_AudioDevice *device) { } static int -NACLAUDIO_OpenDevice(_THIS, void *handle, const char *devname) { +NACLAUDIO_OpenDevice(_THIS, const char *devname) { PP_Instance instance = PSGetInstanceId(); const PPB_Audio *ppb_audio = PSInterfaceAudio(); const PPB_AudioConfig *ppb_audiocfg = PSInterfaceAudioConfig(); diff --git a/src/audio/nas/SDL_nasaudio.c b/src/audio/nas/SDL_nasaudio.c index adedb2e42..d6d863232 100644 --- a/src/audio/nas/SDL_nasaudio.c +++ b/src/audio/nas/SDL_nasaudio.c @@ -311,7 +311,7 @@ find_device(_THIS) } static int -NAS_OpenDevice(_THIS, void *handle, const char *devname) +NAS_OpenDevice(_THIS, const char *devname) { AuElement elms[3]; int buffer_size; diff --git a/src/audio/netbsd/SDL_netbsdaudio.c b/src/audio/netbsd/SDL_netbsdaudio.c index 4e710d35a..6ff81578a 100644 --- a/src/audio/netbsd/SDL_netbsdaudio.c +++ b/src/audio/netbsd/SDL_netbsdaudio.c @@ -202,7 +202,7 @@ NETBSDAUDIO_CloseDevice(_THIS) } static int -NETBSDAUDIO_OpenDevice(_THIS, void *handle, const char *devname) +NETBSDAUDIO_OpenDevice(_THIS, const char *devname) { SDL_bool iscapture = this->iscapture; SDL_AudioFormat test_format; diff --git a/src/audio/openslES/SDL_openslES.c b/src/audio/openslES/SDL_openslES.c index 3190435ad..e0c732ba9 100644 --- a/src/audio/openslES/SDL_openslES.c +++ b/src/audio/openslES/SDL_openslES.c @@ -582,7 +582,7 @@ failed: } static int -openslES_OpenDevice(_THIS, void *handle, const char *devname) +openslES_OpenDevice(_THIS, const char *devname) { this->hidden = (struct SDL_PrivateAudioData *) SDL_calloc(1, (sizeof *this->hidden)); if (this->hidden == NULL) { diff --git a/src/audio/os2/SDL_os2audio.c b/src/audio/os2/SDL_os2audio.c index 247d14aa8..9ddfb7607 100644 --- a/src/audio/os2/SDL_os2audio.c +++ b/src/audio/os2/SDL_os2audio.c @@ -248,7 +248,7 @@ static void OS2_CloseDevice(_THIS) SDL_free(pAData); } -static int OS2_OpenDevice(_THIS, void *handle, const char *devname) +static int OS2_OpenDevice(_THIS, const char *devname) { SDL_PrivateAudioData *pAData; SDL_AudioFormat test_format; @@ -284,7 +284,7 @@ static int OS2_OpenDevice(_THIS, void *handle, const char *devname) } /* Open audio device */ - stMCIAmpOpen.usDeviceID = (handle != NULL) ? ((ULONG)handle - 1) : 0; + stMCIAmpOpen.usDeviceID = (_this->handle != NULL) ? ((ULONG)_this->handle - 1) : 0; stMCIAmpOpen.pszDeviceType = (PSZ)MCI_DEVTYPE_AUDIO_AMPMIX; ulRC = mciSendCommand(0, MCI_OPEN, (_getEnvULong("SDL_AUDIO_SHARE", 1, 0) != 0)? diff --git a/src/audio/paudio/SDL_paudio.c b/src/audio/paudio/SDL_paudio.c index 602aa6004..ae2fc2950 100644 --- a/src/audio/paudio/SDL_paudio.c +++ b/src/audio/paudio/SDL_paudio.c @@ -223,7 +223,7 @@ PAUDIO_CloseDevice(_THIS) } static int -PAUDIO_OpenDevice(_THIS, void *handle, const char *devname) +PAUDIO_OpenDevice(_THIS, const char *devname) { const char *workaround = SDL_getenv("SDL_DSP_NOSELECT"); char audiodev[1024]; diff --git a/src/audio/pipewire/SDL_pipewire.c b/src/audio/pipewire/SDL_pipewire.c index 171c40849..5a10b28a8 100644 --- a/src/audio/pipewire/SDL_pipewire.c +++ b/src/audio/pipewire/SDL_pipewire.c @@ -1027,7 +1027,7 @@ static const struct pw_stream_events stream_input_events = { PW_VERSION_STREAM_ .process = input_callback }; static int -PIPEWIRE_OpenDevice(_THIS, void *handle, const char *devname) +PIPEWIRE_OpenDevice(_THIS, const char *devname) { /* * NOTE: The PW_STREAM_FLAG_RT_PROCESS flag can be set to call the stream @@ -1108,7 +1108,7 @@ PIPEWIRE_OpenDevice(_THIS, void *handle, const char *devname) } } - SDL_snprintf(thread_name, sizeof(thread_name), "SDLAudio%c%ld", (iscapture) ? 'C' : 'P', (long)handle); + SDL_snprintf(thread_name, sizeof(thread_name), "SDLAudio%c%ld", (iscapture) ? 'C' : 'P', (long)this->handle); priv->loop = PIPEWIRE_pw_thread_loop_new(thread_name, NULL); if (priv->loop == NULL) { return SDL_SetError("Pipewire: Failed to create stream loop (%i)", errno); diff --git a/src/audio/psp/SDL_pspaudio.c b/src/audio/psp/SDL_pspaudio.c index 25ef44282..d908170c6 100644 --- a/src/audio/psp/SDL_pspaudio.c +++ b/src/audio/psp/SDL_pspaudio.c @@ -42,7 +42,7 @@ #define PSPAUDIO_DRIVER_NAME "psp" static int -PSPAUDIO_OpenDevice(_THIS, void *handle, const char *devname) +PSPAUDIO_OpenDevice(_THIS, const char *devname) { int format, mixlen, i; diff --git a/src/audio/pulseaudio/SDL_pulseaudio.c b/src/audio/pulseaudio/SDL_pulseaudio.c index 9f954ea86..a969f2b1f 100644 --- a/src/audio/pulseaudio/SDL_pulseaudio.c +++ b/src/audio/pulseaudio/SDL_pulseaudio.c @@ -544,7 +544,7 @@ FindDeviceName(struct SDL_PrivateAudioData *h, const SDL_bool iscapture, void *h } static int -PULSEAUDIO_OpenDevice(_THIS, void *handle, const char *devname) +PULSEAUDIO_OpenDevice(_THIS, const char *devname) { struct SDL_PrivateAudioData *h = NULL; SDL_AudioFormat test_format; @@ -644,7 +644,7 @@ PULSEAUDIO_OpenDevice(_THIS, void *handle, const char *devname) return SDL_SetError("Could not connect to PulseAudio server"); } - if (!FindDeviceName(h, iscapture, handle)) { + if (!FindDeviceName(h, iscapture, this->handle)) { return SDL_SetError("Requested PulseAudio sink/source missing?"); } diff --git a/src/audio/qsa/SDL_qsa_audio.c b/src/audio/qsa/SDL_qsa_audio.c index b940cde3d..5c4ab38ba 100644 --- a/src/audio/qsa/SDL_qsa_audio.c +++ b/src/audio/qsa/SDL_qsa_audio.c @@ -257,9 +257,9 @@ QSA_CloseDevice(_THIS) } static int -QSA_OpenDevice(_THIS, void *handle, const char *devname) +QSA_OpenDevice(_THIS, const char *devname) { - const QSA_Device *device = (const QSA_Device *) handle; + const QSA_Device *device = (const QSA_Device *) this->handle; SDL_Bool iscapture = this->iscapture; int status = 0; int format = 0; diff --git a/src/audio/sndio/SDL_sndioaudio.c b/src/audio/sndio/SDL_sndioaudio.c index 0c2507284..29e5315b9 100644 --- a/src/audio/sndio/SDL_sndioaudio.c +++ b/src/audio/sndio/SDL_sndioaudio.c @@ -237,7 +237,7 @@ SNDIO_CloseDevice(_THIS) } static int -SNDIO_OpenDevice(_THIS, void *handle, const char *devname) +SNDIO_OpenDevice(_THIS, const char *devname) { SDL_AudioFormat test_format; struct sio_par par; diff --git a/src/audio/sun/SDL_sunaudio.c b/src/audio/sun/SDL_sunaudio.c index f2680ebc3..595692423 100644 --- a/src/audio/sun/SDL_sunaudio.c +++ b/src/audio/sun/SDL_sunaudio.c @@ -188,7 +188,7 @@ SUNAUDIO_CloseDevice(_THIS) } static int -SUNAUDIO_OpenDevice(_THIS, void *handle, const char *devname) +SUNAUDIO_OpenDevice(_THIS, const char *devname) { #ifdef AUDIO_SETINFO int enc; diff --git a/src/audio/vita/SDL_vitaaudio.c b/src/audio/vita/SDL_vitaaudio.c index 8dd54e28d..524124e80 100644 --- a/src/audio/vita/SDL_vitaaudio.c +++ b/src/audio/vita/SDL_vitaaudio.c @@ -45,7 +45,7 @@ #define VITAAUD_DRIVER_NAME "vita" static int -VITAAUD_OpenDevice(_THIS, void *handle, const char *devname) +VITAAUD_OpenDevice(_THIS, const char *devname) { int format, mixlen, i, port = SCE_AUDIO_OUT_PORT_TYPE_MAIN; int vols[2] = {SCE_AUDIO_MAX_VOLUME, SCE_AUDIO_MAX_VOLUME}; diff --git a/src/audio/wasapi/SDL_wasapi.c b/src/audio/wasapi/SDL_wasapi.c index 200674643..e7d640c12 100644 --- a/src/audio/wasapi/SDL_wasapi.c +++ b/src/audio/wasapi/SDL_wasapi.c @@ -636,9 +636,9 @@ WASAPI_PrepDevice(_THIS, const SDL_bool updatestream) static int -WASAPI_OpenDevice(_THIS, void *handle, const char *devname) +WASAPI_OpenDevice(_THIS, const char *devname) { - LPCWSTR devid = (LPCWSTR) handle; + LPCWSTR devid = (LPCWSTR) this->handle; /* Initialize all variables that we clean on shutdown */ this->hidden = (struct SDL_PrivateAudioData *) diff --git a/src/audio/winmm/SDL_winmm.c b/src/audio/winmm/SDL_winmm.c index 23a8ce8b6..444d21576 100644 --- a/src/audio/winmm/SDL_winmm.c +++ b/src/audio/winmm/SDL_winmm.c @@ -283,10 +283,11 @@ PrepWaveFormat(_THIS, UINT devId, WAVEFORMATEX *pfmt, const int iscapture) } static int -WINMM_OpenDevice(_THIS, void *handle, const char *devname) +WINMM_OpenDevice(_THIS, const char *devname) { SDL_AudioFormat test_format; SDL_bool iscapture = this->iscapture; + void *handle = this->handle; MMRESULT result; WAVEFORMATEX waveformat; UINT devId = WAVE_MAPPER; /* WAVE_MAPPER == choose system's default */