From e991cd8c53ad21af037df1e0a16816aeea2d0fe2 Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Wed, 9 Jun 2010 20:09:57 +0000
Subject: - Revised abstract AudioCDManager. - Removed AudioCDManager
 Singleton, and changed code for using AudioCDManager in OSystem. - Added
 initialization code for new AudioCDManager in BaseBackend and OSystem_SDL.

svn-id: r49548
---
 base/main.cpp | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'base')

diff --git a/base/main.cpp b/base/main.cpp
index bfb6611a91..7f3b9467b3 100644
--- a/base/main.cpp
+++ b/base/main.cpp
@@ -52,8 +52,6 @@
 #include "gui/message.h"
 #include "gui/error.h"
 
-#include "sound/audiocd.h"
-
 #include "backends/keymapper/keymapper.h"
 
 #if defined(_WIN32_WCE)
@@ -417,15 +415,6 @@ extern "C" int scummvm_main(int argc, const char * const argv[]) {
 			GUI::displayErrorDialog("Could not find any engine capable of running the selected game");
 		}
 
-		// We will destroy the AudioCDManager singleton here to save some memory.
-		// This will not make the CD audio stop, one would have to enable this:
-		//AudioCD.stop();
-		// but the engine is responsible for stopping CD playback anyway and
-		// this way we catch engines not doing it properly. For some more
-		// information about why AudioCDManager::destroy does not stop the CD
-		// playback read the FIXME in sound/audiocd.h
-		Audio::AudioCDManager::destroy();
-
 		// reset the graphics to default
 		setupGraphics(system);
 		launcherDialog();
-- 
cgit v1.2.3