From e69c7a3ac4e3a764b0ace52ea580a877eb7f72da Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sun, 21 Aug 2011 09:51:49 +0200
Subject: CGE: Remove mixer

---
 engines/cge/cge_main.cpp | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

(limited to 'engines/cge/cge_main.cpp')

diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp
index 56033c9c9f..759f942c29 100644
--- a/engines/cge/cge_main.cpp
+++ b/engines/cge/cge_main.cpp
@@ -46,7 +46,6 @@
 #include "cge/talk.h"
 #include "cge/vmenu.h"
 #include "cge/gettext.h"
-#include "cge/mixer.h"
 #include "cge/cge_main.h"
 #include "cge/cge.h"
 #include "cge/walk.h"
@@ -257,12 +256,6 @@ Common::Error CGEEngine::saveGameState(int slot, const Common::String &desc) {
 
 void CGEEngine::saveSound() {
 	warning("STUB: CGEEngine::saveSound");
-	/*  Convert to saving any such needed data in ScummVM configuration file
-
-	CFile cfg(usrPath(progName(CFG_EXT)), WRI);
-	if (!cfg._error)
-		cfg.write(&_sndDrvInfo, sizeof(_sndDrvInfo) - sizeof(_sndDrvInfo.Vol2));
-	*/
 }
 
 void CGEEngine::saveGame(int slotNumber, const Common::String &desc) {
@@ -914,13 +907,10 @@ void CGEEngine::optionTouch(int opt, uint16 mask) {
 			switchColorMode();
 		break;
 	case 2:
-		if (mask & kMouseLeftUp) {
+		if (mask & kMouseLeftUp)
 			switchMusic();
-		} else if (mask & kMouseRightUp)
-			if (!Mixer::_appear) {
-				Mixer::_appear = true;
-				new Mixer(this, kButtonX, kButtonY);
-			}
+		else if (mask & kMouseRightUp)
+			warning("TODO: Use ScummVM sound dialog");
 		break;
 	case 3:
 		if (mask & kMouseLeftUp)
-- 
cgit v1.2.3