[Scummvm-cvs-logs] SF.net SVN: scummvm:[43647] scummvm/trunk/backends/platform

sev at users.sourceforge.net sev at users.sourceforge.net
Sat Aug 22 15:18:27 CEST 2009


Revision: 43647
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43647&view=rev
Author:   sev
Date:     2009-08-22 13:18:26 +0000 (Sat, 22 Aug 2009)

Log Message:
-----------
Give meaningful name to variable

Modified Paths:
--------------
    scummvm/trunk/backends/platform/linuxmoto/linuxmoto-sdl.cpp
    scummvm/trunk/backends/platform/sdl/sdl.cpp
    scummvm/trunk/backends/platform/sdl/sdl.h

Modified: scummvm/trunk/backends/platform/linuxmoto/linuxmoto-sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/linuxmoto/linuxmoto-sdl.cpp	2009-08-22 13:16:13 UTC (rev 43646)
+++ scummvm/trunk/backends/platform/linuxmoto/linuxmoto-sdl.cpp	2009-08-22 13:18:26 UTC (rev 43647)
@@ -56,7 +56,7 @@
 int OSystem_LINUXMOTO::resumeAudio() {
 	if (!_audioSuspended)
 		return -2;
-	if (SDL_OpenAudio(&_obtained, NULL) < 0){
+	if (SDL_OpenAudio(&_obtainedRate, NULL) < 0){
 		return -1;
 	}
 	SDL_PauseAudio(0);

Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp	2009-08-22 13:16:13 UTC (rev 43646)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp	2009-08-22 13:18:26 UTC (rev 43647)
@@ -724,7 +724,7 @@
 	_mixer = new Audio::MixerImpl(this);
 	assert(_mixer);
 
-	if (SDL_OpenAudio(&desired, &_obtained) != 0) {
+	if (SDL_OpenAudio(&desired, &_obtainedRate) != 0) {
 		warning("Could not open audio device: %s", SDL_GetError());
 		_samplesPerSec = 0;
 		_mixer->setReady(false);
@@ -732,7 +732,7 @@
 		// Note: This should be the obtained output rate, but it seems that at
 		// least on some platforms SDL will lie and claim it did get the rate
 		// even if it didn't. Probably only happens for "weird" rates, though.
-		_samplesPerSec = _obtained.freq;
+		_samplesPerSec = _obtainedRate.freq;
 		debug(1, "Output sample rate: %d Hz", _samplesPerSec);
 
 		// Tell the mixer that we are ready and start the sound processing
@@ -740,7 +740,7 @@
 		_mixer->setReady(true);
 
 #ifdef MIXER_DOUBLE_BUFFERING
-		initThreadedMixer(_mixer, _obtained.samples * 4);
+		initThreadedMixer(_mixer, _obtainedRate.samples * 4);
 #endif
 
 		// start the sound system

Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h	2009-08-22 13:16:13 UTC (rev 43646)
+++ scummvm/trunk/backends/platform/sdl/sdl.h	2009-08-22 13:18:26 UTC (rev 43647)
@@ -231,7 +231,7 @@
 
 protected:
 	bool _inited;
-	SDL_AudioSpec _obtained;
+	SDL_AudioSpec _obtainedRate;
 
 #ifdef USE_OSD
 	SDL_Surface *_osdSurface;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list