From 245b8b7d5cea56a4c482ae505a3f777946816371 Mon Sep 17 00:00:00 2001
From: nehalmistry <>
Date: Sun, 7 Apr 2002 04:10:12 +0000
Subject: [PATCH] Speed up stopping CD play
---
src/sound/sound_server.cpp | 12 +++++-------
src/ui/menus.cpp | 8 ++++----
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/src/sound/sound_server.cpp b/src/sound/sound_server.cpp
index a4914beff..d7597d5f0 100644
--- a/src/sound/sound_server.cpp
+++ b/src/sound/sound_server.cpp
@@ -1225,18 +1225,16 @@ global void QuitSound(void)
global void QuitCD(void)
{
#ifdef USE_SDLCD
- if (strcmp(CDMode,":off")) {
+ if (strcmp(CDMode,":off"))
SDL_CDStop(CDRom);
- SDL_CDClose(CDRom);
- }
+ SDL_CDClose(CDRom);
#endif
#ifdef USE_LIBCDA
- if (strcmp(CDMode,":off")) {
+ if (strcmp(CDMode,":off"))
cd_stop();
- cd_close();
- cd_exit();
- }
+ cd_close();
+ cd_exit();
#endif
}
diff --git a/src/ui/menus.cpp b/src/ui/menus.cpp
index b4e9124c5..2dac40b67 100644
--- a/src/ui/menus.cpp
+++ b/src/ui/menus.cpp
@@ -1499,20 +1499,20 @@ local void GameOptions(void)
local void SetCdMode(Menuitem *mi)
{
#if defined(USE_SDLCD) || defined(USE_LIBCDA)
+
+ /// Start Playing CD
if (!strcmp(":off", CDMode)) {
-// CDMode = ":random";
PlayMusic(":random");
} else {
+ /// Stop Playing CD
#ifdef USE_SDLCD
SDL_CDStop(CDRom);
- SDL_CDClose(CDRom);
#endif
#ifdef USE_LIBCDA
cd_stop();
- cd_close();
- cd_exit();
#endif
+
CDMode = ":off";
}
#endif