Qt buildfix, gitignore in ext

Qt/QtMain.cpp

@@ -75,55 +75,86 @@ MainWindow *g_mainWindow;
 
 #ifdef SDL
 SDL_AudioSpec g_retFmt;
+static int g_audioFramesPerBuffer = 0;
 
 static SDL_AudioDeviceID audioDev = 0;
+static SDL_AudioStream *audioStream = nullptr;
 
-extern void mixaudio(void *userdata, Uint8 *stream, int len) {
+static void sdl_mixaudio_callback(void *userdata, SDL_AudioStream *stream, int additional_amount, int total_amount) {
-	NativeMix((short *)stream, len / 4, AUDIO_FREQ, userdata);
+	if (additional_amount <= 0) {
+		return;
+	}
+	const int frames = additional_amount / (int)(sizeof(int16_t) * 2);
+	if (frames <= 0) {
+		return;
+	}
+	std::vector<int16_t> mixBuf(frames * 2);
+	NativeMix(mixBuf.data(), frames, AUDIO_FREQ, userdata);
+	SDL_PutAudioStreamData(stream, mixBuf.data(), (int)(mixBuf.size() * sizeof(int16_t)));
 }
 
 static void InitSDLAudioDevice() {
-	SDL_AudioSpec fmt;
+	SDL_AudioSpec fmt{};
-	memset(&fmt, 0, sizeof(fmt));
+	fmt.freq = AUDIO_FREQ;
-	fmt.freq = 44100;
+	fmt.format = SDL_AUDIO_S16;
-	fmt.format = AUDIO_S16;
+	fmt.channels = AUDIO_CHANNELS;
-	fmt.channels = 2;
+	g_audioFramesPerBuffer = std::max(g_Config.iSDLAudioBufferSize, 128);
-	fmt.samples = std::max(g_Config.iSDLAudioBufferSize, 128);
-	fmt.callback = &mixaudio;
-	fmt.userdata = nullptr;
 
-	audioDev = 0;
+	SDL_AudioDeviceID chosenDevice = SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK;
 	if (!g_Config.sAudioDevice.empty()) {
-		audioDev = SDL_OpenAudioDevice(g_Config.sAudioDevice.c_str(), 0, &fmt, &g_retFmt, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE);
+		int deviceCount = 0;
-		if (audioDev <= 0) {
+		SDL_AudioDeviceID *devices = SDL_GetAudioPlaybackDevices(&deviceCount);
-			WARN_LOG(Log::Audio, "Failed to open preferred audio device %s", g_Config.sAudioDevice.c_str());
+		for (int i = 0; devices && i < deviceCount; ++i) {
+			const char *deviceName = SDL_GetAudioDeviceName(devices[i]);
+			if (deviceName && g_Config.sAudioDevice == deviceName) {
+				chosenDevice = devices[i];
+				break;
 			}
 		}
-	if (audioDev <= 0) {
+		if (devices) {
-		audioDev = SDL_OpenAudioDevice(nullptr, 0, &fmt, &g_retFmt, SDL_AUDIO_ALLOW_FREQUENCY_CHANGE);
+			SDL_free(devices);
 		}
-	if (audioDev <= 0) {
+		if (chosenDevice == SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK) {
+			WARN_LOG(Log::Audio, "Failed to find preferred audio device %s", g_Config.sAudioDevice.c_str());
+		}
+	}
+
+	audioStream = SDL_OpenAudioDeviceStream(chosenDevice, &fmt, sdl_mixaudio_callback, nullptr);
+	if (!audioStream && chosenDevice != SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK) {
+		audioStream = SDL_OpenAudioDeviceStream(SDL_AUDIO_DEVICE_DEFAULT_PLAYBACK, &fmt, sdl_mixaudio_callback, nullptr);
+	}
+
+	if (!audioStream) {
 		ERROR_LOG(Log::Audio, "Failed to open audio: %s", SDL_GetError());
-	} else {
+		audioDev = 0;
-		if (g_retFmt.samples != fmt.samples) // Notify, but still use it
+		return;
-			ERROR_LOG(Log::Audio, "Output audio samples: %d (requested: %d)", g_retFmt.samples, fmt.samples);
+	}
+
+	audioDev = SDL_GetAudioStreamDevice(audioStream);
+	if (!SDL_GetAudioDeviceFormat(audioDev, &g_retFmt, &g_audioFramesPerBuffer)) {
+		g_retFmt = fmt;
+	}
 	if (g_retFmt.format != fmt.format || g_retFmt.channels != fmt.channels) {
 		ERROR_LOG(Log::Audio, "Sound buffer format does not match requested format.");
 		ERROR_LOG(Log::Audio, "Output audio freq: %d (requested: %d)", g_retFmt.freq, fmt.freq);
 		ERROR_LOG(Log::Audio, "Output audio format: %d (requested: %d)", g_retFmt.format, fmt.format);
 		ERROR_LOG(Log::Audio, "Output audio channels: %d (requested: %d)", g_retFmt.channels, fmt.channels);
-			ERROR_LOG(Log::Audio, "Provided output format does not match requirement, turning audio off");
-			SDL_CloseAudioDevice(audioDev);
 	}
-		SDL_PauseAudioDevice(audioDev, 0);
+
+	if (!SDL_ResumeAudioStreamDevice(audioStream)) {
+		ERROR_LOG(Log::Audio, "Failed to start audio stream: %s", SDL_GetError());
+		SDL_DestroyAudioStream(audioStream);
+		audioStream = nullptr;
+		audioDev = 0;
 	}
 }
 
 static void StopSDLAudioDevice() {
-	if (audioDev > 0) {
+	if (audioStream) {
-		SDL_PauseAudioDevice(audioDev, 1);
+		SDL_DestroyAudioStream(audioStream);
-		SDL_CloseAudioDevice(audioDev);
+		audioStream = nullptr;
 	}
+	audioDev = 0;
 }
 #endif
 
@@ -149,19 +180,24 @@ std::string System_GetProperty(SystemProperty prop) {
 	case SYSPROP_AUDIO_DEVICE_LIST:
 		{
 			std::string result;
-			for (int i = 0; i < SDL_GetNumAudioDevices(0); ++i) {
+			int count = 0;
-				const char *name = SDL_GetAudioDeviceName(i, 0);
+			SDL_AudioDeviceID *devices = SDL_GetAudioPlaybackDevices(&count);
+			for (int i = 0; devices && i < count; ++i) {
+				const char *name = SDL_GetAudioDeviceName(devices[i]);
 				if (!name) {
 					continue;
 				}
 
-				if (i == 0) {
+				if (result.empty()) {
 					result = name;
 				} else {
 					result.append(1, '\0');
 					result.append(name);
 				}
 			}
+			if (devices) {
+				SDL_free(devices);
+			}
 			return result;
 		}
 #endif
@@ -195,14 +231,14 @@ int64_t System_GetPropertyInt(SystemProperty prop) {
 	case SYSPROP_AUDIO_SAMPLE_RATE:
 		return g_retFmt.freq;
 	case SYSPROP_AUDIO_FRAMES_PER_BUFFER:
-		return g_retFmt.samples;
+		return g_audioFramesPerBuffer;
 	case SYSPROP_KEYBOARD_LAYOUT:
 	{
 		// TODO: Use Qt APIs for detecting this
 		char q, w, y;
-		q = SDL_GetKeyFromScancode(SDL_SCANCODE_Q);
+		q = SDL_GetKeyFromScancode(SDL_SCANCODE_Q, SDL_KMOD_NONE, false);
-		w = SDL_GetKeyFromScancode(SDL_SCANCODE_W);
+		w = SDL_GetKeyFromScancode(SDL_SCANCODE_W, SDL_KMOD_NONE, false);
-		y = SDL_GetKeyFromScancode(SDL_SCANCODE_Y);
+		y = SDL_GetKeyFromScancode(SDL_SCANCODE_Y, SDL_KMOD_NONE, false);
 		if (q == 'a' && w == 'z' && y == 'y')
 			return KEYBOARD_LAYOUT_AZERTY;
 		else if (q == 'q' && w == 'w' && y == 'z')
@@ -883,10 +919,7 @@ int main(int argc, char *argv[])
 	INFO_LOG(Log::System, "Left mainInternal here.");
 
 #ifdef SDL
-	if (audioDev > 0) {
+	StopSDLAudioDevice();
-		SDL_PauseAudioDevice(audioDev, 1);
-		SDL_CloseAudioDevice(audioDev);
-	}
 #endif
 	NativeShutdown();
 	glslang::FinalizeProcess();

ext/.gitignore

@@ -2,3 +2,4 @@ Win32
 x64
 ARM64
 ARM
+SDL3