From 87fe097f85e743b57d6c3c3e05127ba692d49831 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sat, 9 Aug 2008 22:47:58 +0000
Subject: [PATCH] allow disabling pmp.bAlignBeat.  This isn't needed with menu
 music that already loop seemlessly, and it makes the music take longer to
 start playing and can make some effects goofy.

---
 stepmania/src/ScreenWithMenuElements.cpp | 2 ++
 stepmania/src/ScreenWithMenuElements.h   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp
index dc3a1ebc1b..3a0eea9620 100644
--- a/stepmania/src/ScreenWithMenuElements.cpp
+++ b/stepmania/src/ScreenWithMenuElements.cpp
@@ -29,6 +29,7 @@ ScreenWithMenuElements::ScreenWithMenuElements()
 void ScreenWithMenuElements::Init()
 {
 	PLAY_MUSIC.Load( m_sName, "PlayMusic" );
+	MUSIC_ALIGN_BEAT.Load( m_sName, "MusicAlignBeat" );
 	CANCEL_TRANSITIONS_OUT.Load( m_sName, "CancelTransitionsOut" );
 	TIMER_SECONDS.Load( m_sName, "TimerSeconds" );
 	TIMER_METRICS_GROUP.Load( m_sName, "TimerMetricsGroup" );
@@ -195,6 +196,7 @@ void ScreenWithMenuElements::StartPlayingMusic()
 	{
 		GameSoundManager::PlayMusicParams pmp;
 		pmp.sFile = m_sPathToMusic;
+		pmp.bAlignBeat = MUSIC_ALIGN_BEAT;
 		SOUND->PlayMusic( pmp );
 	}
 }
diff --git a/stepmania/src/ScreenWithMenuElements.h b/stepmania/src/ScreenWithMenuElements.h
index 6ee5da76fb..3edfc6e34a 100644
--- a/stepmania/src/ScreenWithMenuElements.h
+++ b/stepmania/src/ScreenWithMenuElements.h
@@ -54,6 +54,7 @@ protected:
 	Transition			m_Cancel;
 
 	ThemeMetric<bool>		PLAY_MUSIC;
+	ThemeMetric<bool>		MUSIC_ALIGN_BEAT;
 	ThemeMetric<bool>		CANCEL_TRANSITIONS_OUT;
 	ThemeMetric<float>		TIMER_SECONDS;
 	ThemeMetric<RString>		TIMER_METRICS_GROUP;