PEGASUS: Switch sound playback to using the MMSound class

engines/pegasus/menu.cpp

@@ -26,6 +26,8 @@
 #include "pegasus/console.h"
 #include "pegasus/pegasus.h"
 
+#include "pegasus/MMShell/Sounds/MMSound.h"
+
 namespace Pegasus {
 
 enum {
@@ -44,7 +46,9 @@ enum {
 };	
 
 void PegasusEngine::runMainMenu() {
-	_sound->playSound("Sounds/Main Menu.aiff", true);
+	MMSound sound;
+	sound.InitFromAIFFFile("Sounds/Main Menu.aiff");
+	sound.LoopSound();
 
 	// Note down how long since the last click
 	uint32 lastClickTime = _system->getMillis();
@@ -82,14 +86,14 @@ void PegasusEngine::runMainMenu() {
 				case Common::KEYCODE_RETURN:
 					if (buttonSelected != kDifficultyButton) {
 						drawMenuButtonSelected(buttonSelected);
+						sound.StopSound();
 						setGameMode(buttonSelected);
 
-						if (_gameMode != kMainMenuMode) {
-							_sound->stopSound();
+						if (_gameMode != kMainMenuMode)
 							return;
-						}
-
+
 						drawMenu(buttonSelected);
+						sound.LoopSound();
 					}
 					break;
 				case Common::KEYCODE_d:
@@ -118,7 +122,7 @@ void PegasusEngine::runMainMenu() {
 		return;
 
 	// Too slow! Go back and show the intro again.
-	_sound->stopSound();
+	sound.StopSound();
 	_video->playMovie(_introDirectory + "/LilMovie.movie");
 	_gameMode = kIntroMode;
 }
@@ -173,9 +177,7 @@ void PegasusEngine::setGameMode(int buttonSelected) {
 			_gameMode = kMainGameMode;
 			break;
 		case kDemoCreditsButton:
-			_sound->stopSound();
 			runDemoCredits();
-			_sound->playSound("Sounds/Main Menu.aiff", true);
 			break;
 		case kDemoQuitButton:
 			_gameMode = kQuitMode;
@@ -184,9 +186,7 @@ void PegasusEngine::setGameMode(int buttonSelected) {
 	} else {
 		switch (buttonSelected) {
 		case kInterfaceOverviewButton:
-			_sound->stopSound();
 			runInterfaceOverview();
-			_sound->playSound("Sounds/Main Menu.aiff", true);
 			break;
 		case kStartButton:
 			_gameMode = kMainGameMode;
@@ -195,9 +195,7 @@ void PegasusEngine::setGameMode(int buttonSelected) {
 			showLoadDialog();
 			break;
 		case kCreditsButton:
-			_sound->stopSound();
 			runCredits();
-			_sound->playSound("Sounds/Main Menu.aiff", true);
 			break;
 		case kQuitButton:
 			_gameMode = kQuitMode;

engines/pegasus/module.mk

@@ -8,7 +8,6 @@ MODULE_OBJS = \
 	menu.o \
 	overview.o \
 	pegasus.o \
-	sound.o \
 	video.o \
 	Game_Shell/CItem.o \
 	MMShell/Sounds/MMSound.o \

engines/pegasus/pegasus.cpp

@@ -37,14 +37,17 @@
 //#define RUN_SUB_MOVIE // :D :D :D :D :D :D
 //#define RUN_INTERFACE_TEST
 
+#ifdef RUN_INTERFACE_TEST
+#include "pegasus/MMShell/Sounds/MMSound.h"
+#endif
+
 namespace Pegasus {
 
 PegasusEngine::PegasusEngine(OSystem *syst, const PegasusGameDescription *gamedesc) : Engine(syst), _gameDescription(gamedesc) {
 }
 
 PegasusEngine::~PegasusEngine() {
 	delete _video;
-	delete _sound;
 	delete _gfx;
 	delete _resFork;
 	delete _inventoryLid;
@@ -56,7 +59,6 @@ Common::Error PegasusEngine::run() {
 	_console = new PegasusConsole(this);
 	_gfx = new GraphicsManager(this);
 	_video = new VideoManager(this);
-	_sound = new SoundManager(this);
 	_resFork = new Common::MacResManager();
 	_inventoryLid = new Common::MacResManager();
 	_biochipLid = new Common::MacResManager();
@@ -112,7 +114,9 @@ Common::Error PegasusEngine::run() {
 #elif defined(RUN_INTERFACE_TEST)
 	drawInterface();
 	_gfx->setCursor(kMainCursor);
-	_sound->playSound("Sounds/Caldoria/Apartment Music.aiff", true);
+	MMSound sound;
+	sound.InitFromAIFFFile("Sounds/Caldoria/Apartment Music.aiff");
+	sound.LoopSound();
 
 	while (!shouldQuit()) {
 		Common::Event event;

engines/pegasus/pegasus.h

@@ -31,7 +31,6 @@
 
 #include "engines/engine.h"
 
-#include "pegasus/sound.h"
 #include "pegasus/graphics.h"
 #include "pegasus/video.h"
 
@@ -204,7 +203,6 @@ class PegasusEngine : public ::Engine {
 	GUI::Debugger *getDebugger();
 
 	VideoManager *_video;
-	SoundManager *_sound;
 	GraphicsManager *_gfx;
 	Common::MacResManager *_resFork, *_inventoryLid, *_biochipLid;