aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/null
diff options
context:
space:
mode:
authorMax Horn2010-03-11 23:39:51 +0000
committerMax Horn2010-03-11 23:39:51 +0000
commit9b837d66d4647a7642a761cefe5798d30a21504a (patch)
treee5e96cd1a48850a699f0e77a748d415921f7b18e /backends/platform/null
parent5886a0cc7715c874919a7056dfb6b65d3be19dce (diff)
downloadscummvm-rg350-9b837d66d4647a7642a761cefe5798d30a21504a.tar.gz
scummvm-rg350-9b837d66d4647a7642a761cefe5798d30a21504a.tar.bz2
scummvm-rg350-9b837d66d4647a7642a761cefe5798d30a21504a.zip
Replace Audio::MixerImpl::setOutputRate with a new 'sampleRate' param to the MixerImpl constructor
svn-id: r48238
Diffstat (limited to 'backends/platform/null')
-rw-r--r--backends/platform/null/null.cpp10
1 files changed, 1 insertions, 9 deletions
diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index 1539dfe8fd..51166baae7 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -108,9 +108,6 @@ public:
virtual void unlockMutex(MutexRef mutex);
virtual void deleteMutex(MutexRef mutex);
- typedef void (*SoundProc)(void *param, byte *buf, int len);
- virtual bool setSoundCallback(SoundProc proc, void *param);
-
virtual void quit();
virtual Common::SaveFileManager *getSavefileManager();
@@ -150,10 +147,9 @@ OSystem_NULL::~OSystem_NULL() {
void OSystem_NULL::initBackend() {
_savefile = new DefaultSaveFileManager();
- _mixer = new Audio::MixerImpl(this);
+ _mixer = new Audio::MixerImpl(this, 22050);
_timer = new DefaultTimerManager();
- _mixer->setOutputRate(22050);
_mixer->setReady(false);
gettimeofday(&_startTime, NULL);
@@ -299,10 +295,6 @@ void OSystem_NULL::unlockMutex(MutexRef mutex) {
void OSystem_NULL::deleteMutex(MutexRef mutex) {
}
-bool OSystem_NULL::setSoundCallback(SoundProc proc, void *param) {
- return true;
-}
-
void OSystem_NULL::quit() {
}