aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEugene Sandulenko2009-08-22 13:18:26 +0000
committerEugene Sandulenko2009-08-22 13:18:26 +0000
commit1cedb6577111bca746628b0d3f4b0e8b232338c5 (patch)
treef2ddfa7c26a80f8b134526c513892a20c16ff3e8
parent811cea60e76f39434e00c07d5b02ed920c16c191 (diff)
downloadscummvm-rg350-1cedb6577111bca746628b0d3f4b0e8b232338c5.tar.gz
scummvm-rg350-1cedb6577111bca746628b0d3f4b0e8b232338c5.tar.bz2
scummvm-rg350-1cedb6577111bca746628b0d3f4b0e8b232338c5.zip
Give meaningful name to variable
svn-id: r43647
-rw-r--r--backends/platform/linuxmoto/linuxmoto-sdl.cpp2
-rw-r--r--backends/platform/sdl/sdl.cpp6
-rw-r--r--backends/platform/sdl/sdl.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/backends/platform/linuxmoto/linuxmoto-sdl.cpp b/backends/platform/linuxmoto/linuxmoto-sdl.cpp
index bc163c807c..82c69bc7d7 100644
--- a/backends/platform/linuxmoto/linuxmoto-sdl.cpp
+++ b/backends/platform/linuxmoto/linuxmoto-sdl.cpp
@@ -56,7 +56,7 @@ void OSystem_LINUXMOTO::suspendAudio() {
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);
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 7bfab26a86..547720d435 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -724,7 +724,7 @@ void OSystem_SDL::setupMixer() {
_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 @@ void OSystem_SDL::setupMixer() {
// 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 @@ void OSystem_SDL::setupMixer() {
_mixer->setReady(true);
#ifdef MIXER_DOUBLE_BUFFERING
- initThreadedMixer(_mixer, _obtained.samples * 4);
+ initThreadedMixer(_mixer, _obtainedRate.samples * 4);
#endif
// start the sound system
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index e5c41e6611..82c1e7bf1b 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -231,7 +231,7 @@ public:
protected:
bool _inited;
- SDL_AudioSpec _obtained;
+ SDL_AudioSpec _obtainedRate;
#ifdef USE_OSD
SDL_Surface *_osdSurface;