From: divverent <divverent@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 2 Feb 2019 02:48:15 +0000 (+0000)
Subject: Fix engine not starting on Windows if linked against SDL > 2.0.5
X-Git-Tag: xonotic-v0.8.5~38
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=3bd7661c7b5ae8a3a0810f9a0bd3dc971863f891

Fix engine not starting on Windows if linked against SDL > 2.0.5

This migrates SDL_OpenAudio -> SDL_OpenAudioDevice et cetera, i.e. with explicit
device handles now.

Changes from DarkplacesRM

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12471 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=2075ae43356d724bae305ce8fd36ea570718b14a
---

diff --git a/snd_sdl.c b/snd_sdl.c
index 583ea1f8..21341dce 100644
--- a/snd_sdl.c
+++ b/snd_sdl.c
@@ -25,6 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 
 static unsigned int sdlaudiotime = 0;
+static int audio_device = 0;
 
 
 // Note: SDL calls SDL_LockAudio() right before this function, so no need to lock the audio data here
@@ -124,7 +125,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 				"\tSamples   : %i\n",
 				wantspec.channels, wantspec.format, wantspec.freq, wantspec.samples);
 
-	if( SDL_OpenAudio( &wantspec, &obtainspec ) )
+	if ((audio_device = SDL_OpenAudioDevice(NULL, 0, &wantspec, &obtainspec, 0)) == 0)
 	{
 		Con_Printf( "Failed to open the audio device! (%s)\n", SDL_GetError() );
 		return false;
@@ -142,7 +143,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 		wantspec.format != obtainspec.format ||
 		wantspec.channels != obtainspec.channels)
 	{
-		SDL_CloseAudio();
+		SDL_CloseAudioDevice(audio_device);
 
 		// Pass the obtained format as a suggested format
 		if (suggested != NULL)
@@ -163,7 +164,7 @@ qboolean SndSys_Init (const snd_format_t* requested, snd_format_t* suggested)
 		Cvar_SetValueQuick (&snd_channellayout, SND_CHANNELLAYOUT_STANDARD);
 
 	sdlaudiotime = 0;
-	SDL_PauseAudio( false );
+	SDL_PauseAudioDevice(audio_device, 0);
 
 	return true;
 }
@@ -178,8 +179,10 @@ Stop the sound card, delete "snd_renderbuffer" and free its other resources
 */
 void SndSys_Shutdown(void)
 {
-	SDL_CloseAudio();
-
+	if (audio_device > 0) {
+		SDL_CloseAudioDevice(audio_device);
+		audio_device = 0;
+	}
 	if (snd_renderbuffer != NULL)
 	{
 		Mem_Free(snd_renderbuffer->ring);
@@ -224,7 +227,7 @@ Get the exclusive lock on "snd_renderbuffer"
 */
 qboolean SndSys_LockRenderBuffer (void)
 {
-	SDL_LockAudio();
+	SDL_LockAudioDevice(audio_device);
 	return true;
 }
 
@@ -238,7 +241,7 @@ Release the exclusive lock on "snd_renderbuffer"
 */
 void SndSys_UnlockRenderBuffer (void)
 {
-	SDL_UnlockAudio();
+	SDL_UnlockAudioDevice(audio_device);
 }
 
 /*