MOHAWK: Allow the games to have a different sound manager

engines/mohawk/cstime.cpp

@@ -54,6 +54,7 @@ MohawkEngine_CSTime::MohawkEngine_CSTime(OSystem *syst, const MohawkGameDescript
 
 	_console = 0;
 	_gfx = 0;
+	_sound = 0;
 	_cursor = 0;
 	_interface = 0;
 	_view = 0;
@@ -66,6 +67,7 @@ MohawkEngine_CSTime::~MohawkEngine_CSTime() {
 	delete _interface;
 	delete _view;
 	delete _console;
+	delete _sound;
 	delete _gfx;
 	delete _rnd;
 }
@@ -75,6 +77,7 @@ Common::Error MohawkEngine_CSTime::run() {
 
 	_console = new CSTimeConsole(this);
 	_gfx = new CSTimeGraphics(this);
+	_sound = new Sound(this);
 	_cursor = new DefaultCursorManager(this, ID_CURS);
 
 	_interface = new CSTimeInterface(this);

engines/mohawk/cstime.h

@@ -136,6 +136,7 @@ class MohawkEngine_CSTime : public MohawkEngine {
 
 	Common::RandomSource *_rnd;
 
+	Sound *_sound;
 	CSTimeGraphics *_gfx;
 	bool _needsUpdate;
 

engines/mohawk/livingbooks.cpp

@@ -144,6 +144,7 @@ MohawkEngine_LivingBooks::MohawkEngine_LivingBooks(OSystem *syst, const MohawkGa
 
 	_rnd = new Common::RandomSource("livingbooks");
 
+	_sound = NULL;
 	_page = NULL;
 
 	const Common::FSNode gameDataDir(ConfMan.get("path"));
@@ -158,6 +159,7 @@ MohawkEngine_LivingBooks::~MohawkEngine_LivingBooks() {
 	destroyPage();
 
 	delete _console;
+	delete _sound;
 	delete _gfx;
 	delete _rnd;
 	_bookInfoFile.clear();
@@ -182,6 +184,7 @@ Common::Error MohawkEngine_LivingBooks::run() {
 		error("Could not find xRes/yRes variables");
 
 	_gfx = new LBGraphics(this, _screenWidth, _screenHeight);
+	_sound = new Sound(this);
 
 	if (getGameType() != GType_LIVINGBOOKSV1)
 		_cursor = new LivingBooksCursorManager_v2();

engines/mohawk/livingbooks.h

@@ -714,6 +714,7 @@ class MohawkEngine_LivingBooks : public MohawkEngine {
 
 	Common::RandomSource *_rnd;
 
+	Sound *_sound;
 	LBGraphics *_gfx;
 	bool _needsRedraw, _needsUpdate;
 

engines/mohawk/mohawk.cpp

@@ -40,14 +40,12 @@ MohawkEngine::MohawkEngine(OSystem *syst, const MohawkGameDescription *gamedesc)
 	// Setup mixer
 	syncSoundSettings();
 
-	_sound = 0;
 	_video = 0;
 	_pauseDialog = 0;
 	_cursor = 0;
 }
 
 MohawkEngine::~MohawkEngine() {
-	delete _sound;
 	delete _video;
 	delete _pauseDialog;
 	delete _cursor;
@@ -58,22 +56,19 @@ MohawkEngine::~MohawkEngine() {
 }
 
 Common::Error MohawkEngine::run() {
-	_sound = new Sound(this);
 	_video = new VideoManager(this);
 	_pauseDialog = new PauseDialog(this, "The game is paused. Press any key to continue.");
 
 	return Common::kNoError;
 }
 
 void MohawkEngine::pauseEngineIntern(bool pause) {
+	Engine::pauseEngineIntern(pause);
+
 	if (pause) {
 		_video->pauseVideos();
-		_sound->pauseSound();
-		_sound->pauseSLST();
 	} else {
 		_video->resumeVideos();
-		_sound->resumeSound();
-		_sound->resumeSLST();
 		_system->updateScreen();
 	}
 }

engines/mohawk/mohawk.h

@@ -100,7 +100,6 @@ class MohawkEngine : public ::Engine {
 
 	bool hasFeature(EngineFeature f) const;
 
-	Sound *_sound;
 	VideoManager *_video;
 	CursorManager *_cursor;
 

engines/mohawk/myst.cpp

@@ -75,6 +75,7 @@ MohawkEngine_Myst::MohawkEngine_Myst(OSystem *syst, const MohawkGameDescription
 	_curResource = -1;
 	_hoverResource = nullptr;
 
+	_sound = nullptr;
 	_gfx = nullptr;
 	_console = nullptr;
 	_scriptParser = nullptr;
@@ -88,6 +89,7 @@ MohawkEngine_Myst::~MohawkEngine_Myst() {
 	DebugMan.clearAllDebugChannels();
 
 	delete _gfx;
+	delete _sound;
 	delete _console;
 	delete _scriptParser;
 	delete _gameState;
@@ -220,6 +222,7 @@ Common::Error MohawkEngine_Myst::run() {
 	MohawkEngine::run();
 
 	_gfx = new MystGraphics(this);
+	_sound = new Sound(this);
 	_console = new MystConsole(this);
 	_gameState = new MystGameState(this, _saveFileMan);
 	_optionsDialog = new MystOptionsDialog(this);

engines/mohawk/myst.h

@@ -200,6 +200,7 @@ class MohawkEngine_Myst : public MohawkEngine {
 
 	bool _showResourceRects;
 
+	Sound *_sound;
 	MystGraphics *_gfx;
 	MystGameState *_gameState;
 	MystScriptParser *_scriptParser;

engines/mohawk/riven.cpp

@@ -59,6 +59,7 @@ MohawkEngine_Riven::MohawkEngine_Riven(OSystem *syst, const MohawkGameDescriptio
 	_curStack = kStackUnknown;
 	_hotspots = nullptr;
 	_gfx = nullptr;
+	_sound = nullptr;
 	_externalScriptHandler = nullptr;
 	_rnd = nullptr;
 	_scriptMan = nullptr;
@@ -92,6 +93,7 @@ MohawkEngine_Riven::MohawkEngine_Riven(OSystem *syst, const MohawkGameDescriptio
 }
 
 MohawkEngine_Riven::~MohawkEngine_Riven() {
+	delete _sound;
 	delete _gfx;
 	delete _console;
 	delete _externalScriptHandler;
@@ -123,6 +125,7 @@ Common::Error MohawkEngine_Riven::run() {
 		SearchMan.add("arcriven.z", &_installerArchive, 0, false);
 
 	_gfx = new RivenGraphics(this);
+	_sound = new Sound(this);
 	_console = new RivenConsole(this);
 	_saveLoad = new RivenSaveLoad(this, _saveFileMan);
 	_externalScriptHandler = new RivenExternal(this);

engines/mohawk/riven.h

@@ -121,6 +121,7 @@ class MohawkEngine_Riven : public MohawkEngine {
 	MohawkEngine_Riven(OSystem *syst, const MohawkGameDescription *gamedesc);
 	virtual ~MohawkEngine_Riven();
 
+	Sound *_sound;
 	RivenGraphics *_gfx;
 	RivenExternal *_externalScriptHandler;
 	Common::RandomSource *_rnd;

engines/mohawk/sound.cpp

@@ -518,16 +518,6 @@ void Sound::stopSLSTSound(uint16 index, bool fade) {
 	_currentSLSTSounds.remove_at(index);
 }
 
-void Sound::pauseSLST() {
-	for (uint16 i = 0; i < _currentSLSTSounds.size(); i++)
-		_vm->_mixer->pauseHandle(*_currentSLSTSounds[i].handle, true);
-}
-
-void Sound::resumeSLST() {
-	for (uint16 i = 0; i < _currentSLSTSounds.size(); i++)
-		_vm->_mixer->pauseHandle(*_currentSLSTSounds[i].handle, false);
-}
-
 Audio::RewindableAudioStream *Sound::makeLivingBooksWaveStream_v1(Common::SeekableReadStream *stream) {
 	uint16 header = stream->readUint16BE();
 	uint16 rate = 0;
@@ -591,18 +581,6 @@ void Sound::stopSound(uint16 id) {
 		}
 }
 
-void Sound::pauseSound() {
-	for (uint32 i = 0; i < _handles.size(); i++)
-		if (_handles[i].type == kUsedHandle)
-			_vm->_mixer->pauseHandle(_handles[i].handle, true);
-}
-
-void Sound::resumeSound() {
-	for (uint32 i = 0; i < _handles.size(); i++)
-		if (_handles[i].type == kUsedHandle)
-			_vm->_mixer->pauseHandle(_handles[i].handle, false);
-}
-
 bool Sound::isPlaying(uint16 id) {
 	for (uint32 i = 0; i < _handles.size(); i++)
 		if (_handles[i].type == kUsedHandle && _handles[i].id == id)

engines/mohawk/sound.h

@@ -132,8 +132,6 @@ class Sound {
 	void stopMidi();
 	void stopSound();
 	void stopSound(uint16 id);
-	void pauseSound();
-	void resumeSound();
 	bool isPlaying(uint16 id);
 	bool isPlaying();
 	uint getNumSamplesPlayed(uint16 id);
@@ -149,8 +147,6 @@ class Sound {
 	// Riven-specific sound functions
 	void playSLST(uint16 index, uint16 card);
 	void playSLST(SLSTRecord slstRecord);
-	void pauseSLST();
-	void resumeSLST();
 	void stopAllSLST(bool fade = false);
 	static byte convertRivenVolume(uint16 volume);