thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BACKENDS: Move MixerManager code into ModularMixerBackend

Browse source
This commit is contained in:
Cameron Cawley 2019-11-30 20:22:19 +00:00 • committed by Eugene Sandulenko
parent d1bfa2c4ec
commit b9d2b87085
4 changed files with 52 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

17
backends/platform/sdl/sdl.h
View file

@ -36,7 +36,7 @@
/**
* Base OSystem class for all SDL ports.
*/
class OSystem_SDL : public ModularMutexBackend, public ModularGraphicsBackend {
class OSystem_SDL : public ModularMutexBackend, public ModularMixerBackend, public ModularGraphicsBackend {
public:
OSystem_SDL();
virtual ~OSystem_SDL();
@ -48,13 +48,6 @@ public:
*/
virtual void init() override;
/**
* Get the Mixer Manager instance. Not to confuse with getMixer(),
* that returns Audio::Mixer. The Mixer Manager is a SDL wrapper class
* for the Audio::Mixer. Used by other managers.
*/
virtual MixerManager *getMixerManager();
virtual bool hasFeature(Feature f) override;
// Override functions from ModularBackend and OSystem
@ -83,7 +76,7 @@ public:
virtual uint32 getMillis(bool skipRecord = false) override;
virtual void delayMillis(uint msecs) override;
virtual void getTimeAndDate(TimeDate &td) const override;
virtual Audio::Mixer *getMixer() override;
virtual MixerManager *getMixerManager() override;
virtual Common::TimerManager *getTimerManager() override;
virtual Common::SaveFileManager *getSavefileManager() override;
@ -107,12 +100,6 @@ protected:
*/
Common::String _logFilePath;
/**
* Mixer manager that configures and setups SDL for
* the wrapped Audio::Mixer, the true mixer.
*/
MixerManager *_mixerManager;
/**
* The event source we use for obtaining SDL events.
*/