From 1483e577d1e46ad5d08d2eb3805b6c91c969f0a5 Mon Sep 17 00:00:00 2001
From: Chris Danford <chrisdanford@users.sourceforge.net>
Date: Wed, 2 Mar 2005 07:42:37 +0000
Subject: [PATCH] add PlayMusic metrics instead of using optional GetPath

---
 stepmania/src/ScreenOptionsMaster.cpp | 13 ++++++-------
 stepmania/src/ScreenOptionsMaster.h   |  2 ++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/stepmania/src/ScreenOptionsMaster.cpp b/stepmania/src/ScreenOptionsMaster.cpp
index 239c33fc45..a038aae85e 100644
--- a/stepmania/src/ScreenOptionsMaster.cpp
+++ b/stepmania/src/ScreenOptionsMaster.cpp
@@ -26,7 +26,8 @@
 
 REGISTER_SCREEN_CLASS( ScreenOptionsMaster );
 ScreenOptionsMaster::ScreenOptionsMaster( CString sClassName ):
-	ScreenOptions( sClassName )
+	ScreenOptions( sClassName ),
+	PLAY_MUSIC( sClassName, "PlayMusic" )
 {
 	LOG->Trace("ScreenOptionsMaster::ScreenOptionsMaster(%s)", m_sName.c_str() );
 }
@@ -111,13 +112,11 @@ void ScreenOptionsMaster::Update( float fDelta )
 	{
 		/*
 		 * Don't play sounds during the ctor, since derived classes havn't loaded yet.
-		 * If this file doesn't exist, leave the music alone (eg. ScreenPlayerOptions music sample
-		 * left over from ScreenSelectMusic).  If you really want to play no music, add a redir
-		 * to _silent.
+		 * Leave the music alone (eg. ScreenPlayerOptions music sample
+		 * left over from ScreenSelectMusic).
 		 */
-		CString MusicPath = THEME->GetPathS( m_sName, "music", true );
-		if( MusicPath != "" )
-			SOUND->PlayMusic( MusicPath );
+		if( PLAY_MUSIC )
+			SOUND->PlayMusic( THEME->GetPathS( m_sName, "music" ) );
 	}
 
 	ScreenOptions::Update( fDelta );
diff --git a/stepmania/src/ScreenOptionsMaster.h b/stepmania/src/ScreenOptionsMaster.h
index 825c3c6878..4ad8a55686 100644
--- a/stepmania/src/ScreenOptionsMaster.h
+++ b/stepmania/src/ScreenOptionsMaster.h
@@ -32,6 +32,8 @@ protected:
 	virtual void GoToPrevScreen();
 
 	virtual void RefreshIcons();
+
+	ThemeMetric<bool> PLAY_MUSIC;
 };
 
 #endif