[Scummvm-cvs-logs] scummvm master -> 2589228329759839b066aa9c6e4192095573812c

digitall dgturner at iee.org
Wed Feb 12 13:16:40 CET 2014


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

Summary:
a4ad32c5d9 SDL: Add debugging code to output SDL audio driver name being used.
2589228329 SDL: Add debugging code to output SDL video driver name being used.


Commit: a4ad32c5d9d4a09765c8441b7296a0aefe66d327
    https://github.com/scummvm/scummvm/commit/a4ad32c5d9d4a09765c8441b7296a0aefe66d327
Author: D G Turner (digitall at scummvm.org)
Date: 2014-02-12T04:08:47-08:00

Commit Message:
SDL: Add debugging code to output SDL audio driver name being used.

This is to aid with investigation of bug #6510 - "SDL: Audio delay in
daily builds" and similar future issues.

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 3c79290..cebeac2 100644
--- a/backends/mixer/sdl/sdl-mixer.cpp
+++ b/backends/mixer/sdl/sdl-mixer.cpp
@@ -58,6 +58,12 @@ void SdlMixerManager::init() {
 		error("Could not initialize SDL: %s", SDL_GetError());
 	}
 
+	const int maxNameLen = 20;
+	char sdlDriverName[maxNameLen];
+	sdlDriverName[0] = '\0';
+	SDL_AudioDriverName(sdlDriverName, maxNameLen);
+	debug(1, "Using SDL Audio Driver \"%s\"", sdlDriverName);
+	
 	// Get the desired audio specs
 	SDL_AudioSpec desired = getAudioSpec(SAMPLES_PER_SEC);
 


Commit: 2589228329759839b066aa9c6e4192095573812c
    https://github.com/scummvm/scummvm/commit/2589228329759839b066aa9c6e4192095573812c
Author: D G Turner (digitall at scummvm.org)
Date: 2014-02-12T04:11:53-08:00

Commit Message:
SDL: Add debugging code to output SDL video driver name being used.

Changed paths:
    backends/platform/sdl/sdl.cpp



diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 913ae51..f56c00e 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -274,6 +274,14 @@ void OSystem_SDL::initSDL() {
 		if (SDL_Init(sdlFlags) == -1)
 			error("Could not initialize SDL: %s", SDL_GetError());
 
+		const int maxNameLen = 20;
+		char sdlDriverName[maxNameLen];
+		sdlDriverName[0] = '\0';
+		SDL_VideoDriverName(sdlDriverName, maxNameLen);
+		// Using printf rather than debug() here as debug()/logging
+		// is not active by this point.
+		printf("Using SDL Video Driver \"%s\" ...\n", sdlDriverName);
+
 		_initedSDL = true;
 	}
 }






More information about the Scummvm-git-logs mailing list