[Scummvm-cvs-logs] SF.net SVN: scummvm:[43644] scummvm/branches/branch-1-0-0/backends/platform
sev at users.sourceforge.net
sev at users.sourceforge.net
Sat Aug 22 15:12:25 CEST 2009
Revision: 43644
http://scummvm.svn.sourceforge.net/scummvm/?rev=43644&view=rev
Author: sev
Date: 2009-08-22 13:12:25 +0000 (Sat, 22 Aug 2009)
Log Message:
-----------
Give meaningful name to variable
Modified Paths:
--------------
scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-sdl.cpp
scummvm/branches/branch-1-0-0/backends/platform/sdl/sdl.cpp
scummvm/branches/branch-1-0-0/backends/platform/sdl/sdl.h
Modified: scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-sdl.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-sdl.cpp 2009-08-22 13:11:55 UTC (rev 43643)
+++ scummvm/branches/branch-1-0-0/backends/platform/linuxmoto/linuxmoto-sdl.cpp 2009-08-22 13:12:25 UTC (rev 43644)
@@ -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/branches/branch-1-0-0/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/sdl/sdl.cpp 2009-08-22 13:11:55 UTC (rev 43643)
+++ scummvm/branches/branch-1-0-0/backends/platform/sdl/sdl.cpp 2009-08-22 13:12:25 UTC (rev 43644)
@@ -694,7 +694,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);
@@ -702,7 +702,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
@@ -710,7 +710,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/branches/branch-1-0-0/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/branches/branch-1-0-0/backends/platform/sdl/sdl.h 2009-08-22 13:11:55 UTC (rev 43643)
+++ scummvm/branches/branch-1-0-0/backends/platform/sdl/sdl.h 2009-08-22 13:12:25 UTC (rev 43644)
@@ -210,7 +210,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