fix msd sorts and add length sort back

etternagame · Jul 20, 2018 · 8c08e92 · 8c08e92
1 parent 9e23ad8
commit 8c08e92
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 4 deletions.
diff --git a/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/currentsort.lua b/Themes/Til Death/BGAnimations/ScreenSelectMusic overlay/currentsort.lua
@@ -25,7 +25,8 @@ local sortTable = {
 	SortOrder_Stamina				= 'Stamina',
 	SortOrder_JackSpeed				= 'JackSpeed',
 	SortOrder_Chordjack				= 'Chordjack',
-	SortOrder_Technical				= 'Technical'
+	SortOrder_Technical				= 'Technical',
+	SortOrder_Length				= 'Length',
 }
 
 t[#t+1] = Def.Quad{

diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
@@ -306,6 +306,7 @@ StaminaText=Stamina
 JackSpeedText=JackSpeed
 ChordjackText=Chordjack
 TechnicalText=Technical
+LengthText=Length
 TopGradesText=Top Grades
 
 [NetworkSyncManager]

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
@@ -904,7 +904,7 @@ RecentSongsToShow=30
 
 UseEasyMarkerFlag=false
 
-ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,Genre,Recent,Favorites,Overall,Stream,Jumpstream,Handstream,Stamina,JackSpeed,Chordjack,Technical"
+ModeMenuChoiceNames="Preferred,Group,Title,Bpm,Popularity,TopGrades,Artist,Genre,Recent,Favorites,Overall,Stream,Jumpstream,Handstream,Stamina,JackSpeed,Chordjack,Technical,Length"
 ChoicePreferred="sort,Preferred"
 ChoiceGroup="sort,Group"
 ChoiceTitle="sort,Title"
@@ -923,6 +923,7 @@ ChoiceStamina="sort,Stamina"
 ChoiceJackSpeed="sort,JackSpeed"
 ChoiceChordjack="sort,Chordjack"
 ChoiceTechnical="sort,Technical"
+ChoiceLength="sort,Length"
 
 CustomWheelItemNames=""
 

diff --git a/src/GameConstantsAndTypes.cpp b/src/GameConstantsAndTypes.cpp
@@ -142,7 +142,8 @@ static const char *SortOrderNames[] = {
 	"Stamina",
 	"JackSpeed",
 	"Chordjack",
-	"Technical"
+	"Technical",
+	"Length"
 };
 XToString( SortOrder );
 StringToX( SortOrder );

diff --git a/src/GameConstantsAndTypes.h b/src/GameConstantsAndTypes.h
@@ -180,6 +180,7 @@ enum SortOrder
 	SORT_JackSpeed,
 	SORT_Chordjack,
 	SORT_Technical,
+	SORT_LENGTH,
 	NUM_SortOrder,
 	SortOrder_Invalid
 };

diff --git a/src/MusicWheel.cpp b/src/MusicWheel.cpp
@@ -729,6 +729,9 @@ void MusicWheel::BuildWheelItemDatas( vector<MusicWheelItemData *> &arrayWheelIt
 			case SORT_Technical:
 				SongUtil::SortSongPointerArrayByGroupAndMSD(arraySongs, Skill_Technical);
 				break;
+			case SORT_LENGTH:
+				SongUtil::SortSongPointerArrayByLength(arraySongs);
+				break;
 			default:
 				FAIL_M("Unhandled sort order! Aborting...");
 		}

diff --git a/src/SongUtil.cpp b/src/SongUtil.cpp
@@ -529,7 +529,7 @@ static int CompareSongPointersByGroup(const Song *pSong1, const Song *pSong2)
 }
 std::function<int(const Song *pSong1, const Song *pSong2)> CompareSongPointersByGroupAndMSD(Skillset ss)
 {
-	return [&ss](const Song *pSong1, const Song *pSong2) {
+	return [ss](const Song *pSong1, const Song *pSong2) {
 		int g = CompareSongPointersByGroup(pSong1, pSong2);
 		if (g == 0)
 			/* Same group; compare by MSD. */
@@ -627,6 +627,14 @@ RString SongUtil::GetSectionNameFromSongAndSort( const Song* pSong, SortOrder so
 	case SORT_POPULARITY:
 	case SORT_RECENT:
 		return RString();
+	case SORT_LENGTH:
+		{
+			const int iSortLengthSize = 60;
+			int iMaxLength = static_cast<int>(pSong->m_fMusicLengthSeconds);
+			iMaxLength += (iSortLengthSize - (iMaxLength%iSortLengthSize) - 1);
+			int iMinLength = iMaxLength - (iSortLengthSize - 1);
+			return ssprintf("%s-%s", SecondsToMMSS(static_cast<float>(iMinLength)).c_str(), SecondsToMMSS(static_cast<float>(iMaxLength)).c_str());
+		}
 	case SORT_TOP_GRADES:
 		{
 			auto p = PROFILEMAN->GetProfile(PLAYER_1);