From 0fc49d9da996d59cefe5557abd146ac7a34d2e7d Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Sat, 14 May 2011 19:27:25 -0500
Subject: [PATCH] [MusicWheel] Added ShowSectionsInBPMSort and
 ShowSectionsInLengthSort metrics.

---
 Docs/Changelog_sm5.txt       |  4 ++++
 Themes/_fallback/metrics.ini |  2 ++
 src/SongUtil.cpp             | 34 +++++++++++++++++++++++-----------
 3 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/Docs/Changelog_sm5.txt b/Docs/Changelog_sm5.txt
index cba431e5b8..0ad0e45592 100644
--- a/Docs/Changelog_sm5.txt
+++ b/Docs/Changelog_sm5.txt
@@ -8,6 +8,10 @@ ________________________________________________________________________________
 StepMania 5.0 $NEXT | 20110xyy
 --------------------------------------------------------------------------------
 
+2011/05/14
+----------
+* [MusicWheel] Added ShowSectionsInBPMSort and ShowSectionsInLengthSort metrics. [AJ]
+
 2011/05/11
 ----------
 * [GameSoundManager] Added PlayAnnouncer Lua binding. [AJ]
diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
index 668d96827b..cd36f351cc 100644
--- a/Themes/_fallback/metrics.ini
+++ b/Themes/_fallback/metrics.ini
@@ -857,7 +857,9 @@ ShowRoulette=true
 ShowRandom=false
 ShowPortal=false
 
+ShowSectionsInBPMSort=true
 SortBPMDivision=20
+ShowSectionsInLengthSort=true
 SortLengthDivision=5
 
 MostPlayedSongsToShow=30
diff --git a/src/SongUtil.cpp b/src/SongUtil.cpp
index 2641f860f0..3d83420167 100644
--- a/src/SongUtil.cpp
+++ b/src/SongUtil.cpp
@@ -21,6 +21,8 @@
 
 ThemeMetric<int> SORT_BPM_DIVISION ( "MusicWheel", "SortBPMDivision" );
 ThemeMetric<int> SORT_LENGTH_DIVISION ( "MusicWheel", "SortLengthDivision" );
+ThemeMetric<bool> SHOW_SECTIONS_IN_BPM_SORT ( "MusicWheel", "ShowSectionsInBPMSort" );
+ThemeMetric<bool> SHOW_SECTIONS_IN_LENGTH_SORT ( "MusicWheel", "ShowSectionsInLengthSort" );
 
 bool SongCriteria::Matches( const Song *pSong ) const
 {
@@ -598,20 +600,30 @@ RString SongUtil::GetSectionNameFromSongAndSort( const Song* pSong, SortOrder so
 		return SORT_NOT_AVAILABLE.GetValue();
 	case SORT_BPM:
 		{
-			const int iBPMGroupSize = SORT_BPM_DIVISION;
-			DisplayBpms bpms;
-			pSong->GetDisplayBpms( bpms );
-			int iMaxBPM = (int)bpms.GetMax();
-			iMaxBPM += iBPMGroupSize - (iMaxBPM%iBPMGroupSize) - 1;
-			return ssprintf("%03d-%03d",iMaxBPM-(iBPMGroupSize-1), iMaxBPM);
+			if( SHOW_SECTIONS_IN_BPM_SORT )
+			{
+				const int iBPMGroupSize = SORT_BPM_DIVISION;
+				DisplayBpms bpms;
+				pSong->GetDisplayBpms( bpms );
+				int iMaxBPM = (int)bpms.GetMax();
+				iMaxBPM += iBPMGroupSize - (iMaxBPM%iBPMGroupSize) - 1;
+				return ssprintf("%03d-%03d",iMaxBPM-(iBPMGroupSize-1), iMaxBPM);
+			}
+			else
+				return RString();
 		}
 	case SORT_LENGTH:
 		{
-			const int iSortLengthSize = SORT_LENGTH_DIVISION;
-			int iMaxLength = (int)pSong->m_fMusicLengthSeconds;
-			iMaxLength += (iSortLengthSize - (iMaxLength%iSortLengthSize) - 1);
-			int iMinLength = iMaxLength - (iSortLengthSize-1);
-			return ssprintf( "%s-%s", SecondsToMMSS(iMinLength).c_str(), SecondsToMMSS(iMaxLength).c_str() );
+			if( SHOW_SECTIONS_IN_LENGTH_SORT )
+			{
+				const int iSortLengthSize = SORT_LENGTH_DIVISION;
+				int iMaxLength = (int)pSong->m_fMusicLengthSeconds;
+				iMaxLength += (iSortLengthSize - (iMaxLength%iSortLengthSize) - 1);
+				int iMinLength = iMaxLength - (iSortLengthSize-1);
+				return ssprintf( "%s-%s", SecondsToMMSS(iMinLength).c_str(), SecondsToMMSS(iMaxLength).c_str() );
+			}
+			else
+				return RString();
 		}
 	case SORT_POPULARITY:
 	case SORT_RECENT: