From c97ee14a65afc0b8a11ef5c10105e966f67a5934 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 10 Mar 2010 21:01:44 +0000
Subject: Remove last traces of OSystem::getOutputSampleRate()

svn-id: r48229
---
 backends/platform/PalmOS/Src/be_base.h     | 3 ---
 backends/platform/PalmOS/Src/os5_sound.cpp | 9 +++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'backends/platform/PalmOS')

diff --git a/backends/platform/PalmOS/Src/be_base.h b/backends/platform/PalmOS/Src/be_base.h
index 1d5883be38..30130ebfff 100644
--- a/backends/platform/PalmOS/Src/be_base.h
+++ b/backends/platform/PalmOS/Src/be_base.h
@@ -184,8 +184,6 @@ protected:
 	Boolean _useNumPad, _showBatLow;
 	UInt32 _batCheckTicks, _batCheckLast;
 
-	int _samplesPerSec;
-
 public:
 	void initBackend();
 
@@ -251,7 +249,6 @@ public:
 	virtual void unlockMutex(MutexRef mutex) {}
 	virtual void deleteMutex(MutexRef mutex) {}
 
-	int getOutputSampleRate() const { return _samplesPerSec; }
 	virtual Audio::Mixer *getMixer();
 
 	void quit();
diff --git a/backends/platform/PalmOS/Src/os5_sound.cpp b/backends/platform/PalmOS/Src/os5_sound.cpp
index 7553f032a9..1898f6ae90 100644
--- a/backends/platform/PalmOS/Src/os5_sound.cpp
+++ b/backends/platform/PalmOS/Src/os5_sound.cpp
@@ -98,10 +98,11 @@ bool OSystem_PalmOS5::setSoundCallback(SoundProc proc, void *param) {
 		_soundEx.set = false;
 		_soundEx.dataP = NULL;	// set by the handler
 
+		uint32 samplesPerSec;
 		if (ConfMan.hasKey("output_rate"))
-			_samplesPerSec = ConfMan.getInt("output_rate");
+			samplesPerSec = ConfMan.getInt("output_rate");
 		else
-			_samplesPerSec = SAMPLES_PER_SEC;
+			samplesPerSec = SAMPLES_PER_SEC;
 
 		// try to create sound stream
 		if (OPTIONS_TST(kOptPalmSoundAPI)) {
@@ -109,7 +110,7 @@ bool OSystem_PalmOS5::setSoundCallback(SoundProc proc, void *param) {
 						&_soundEx.handle,
 						sndOutput,
 						sndFormatPCM,
-						_samplesPerSec,
+						samplesPerSec,
 						sndInt16Little,
 						sndStereo,
 						sound_callback(),
@@ -132,7 +133,7 @@ bool OSystem_PalmOS5::setSoundCallback(SoundProc proc, void *param) {
 	}
 	// if not true some scenes (indy3 256,...) may freeze (ESC to skip)
 
-	_mixerMgr->setOutputRate(_samplesPerSec);
+	_mixerMgr->setOutputRate(samplesPerSec);
 	_mixerMgr->setReady(true);
 
 	return true;
-- 
cgit v1.2.3