[Scummvm-cvs-logs] scummvm master -> c5e7aa8e93cbc1bea8442ac88a4e6db9873763e2

digitall dgturner at iee.org
Fri Feb 14 16:37:39 CET 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
c5e7aa8e93 SDL: Add warning if "waveout" driver is being used for audio.


Commit: c5e7aa8e93cbc1bea8442ac88a4e6db9873763e2
    https://github.com/scummvm/scummvm/commit/c5e7aa8e93cbc1bea8442ac88a4e6db9873763e2
Author: D G Turner (digitall at scummvm.org)
Date: 2014-02-14T07:34:22-08:00

Commit Message:
SDL: Add warning if "waveout" driver is being used for audio.

This will help avoid bug reports like #6510 - "SDL: Audio delay
in daily builds" in future.

Changed paths:
    backends/mixer/sdl/sdl-mixer.cpp



diff --git a/backends/mixer/sdl/sdl-mixer.cpp b/backends/mixer/sdl/sdl-mixer.cpp
index cebeac2..c5c717f 100644
--- a/backends/mixer/sdl/sdl-mixer.cpp
+++ b/backends/mixer/sdl/sdl-mixer.cpp
@@ -63,6 +63,10 @@ void SdlMixerManager::init() {
 	sdlDriverName[0] = '\0';
 	SDL_AudioDriverName(sdlDriverName, maxNameLen);
 	debug(1, "Using SDL Audio Driver \"%s\"", sdlDriverName);
+
+	// Warning if SDL on Windows is using the fallback waveout driver, rather than the nominal DX DirectSound driver, which can cause issues with audio.
+	if (strcmp(sdlDriverName, "waveout") == 0)
+		warning("Using the fallback \"waveout\" SDL audio driver instead of \"dsound\" can cause audio lag. Fix your DirectX setup and/or SDL.dll to avoid this.");
 	
 	// Get the desired audio specs
 	SDL_AudioSpec desired = getAudioSpec(SAMPLES_PER_SEC);






More information about the Scummvm-git-logs mailing list