From 047cbdf6585f1e7447b049aa9cc05c309371e232 Mon Sep 17 00:00:00 2001
From: Marc Cannon <vyhdycokio@gmail.com>
Date: Wed, 2 Jan 2013 06:06:15 +0000
Subject: [PATCH] Also remove 'CustomsLoadMax' pref; it's unhelpful and the
 load timeout is what matters, not how many songs load before the timeout is
 hit.

---
 src/PrefsManager.cpp             |  2 --
 src/PrefsManager.h               |  1 -
 src/ScreenOptionsMasterPrefs.cpp |  8 --------
 src/SongManager.cpp              | 16 ++++------------
 4 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/src/PrefsManager.cpp b/src/PrefsManager.cpp
index 837261d8..51d19e7b 100755
--- a/src/PrefsManager.cpp
+++ b/src/PrefsManager.cpp
@@ -199,9 +199,7 @@ PrefsManager::PrefsManager() :
 	m_bCustomSongs			( "SongEdits", false ),
 	m_bCustomSongPreviews		( "CustomSongPreviews", false ),
 
-	m_iCustomsLoadMax		( "CustomsLoadMax", 50 ),
 	m_fCustomsLoadTimeout	( "CustomsLoadTimeout", 5.0f ),
-
 	m_iCustomMaxSeconds	( "CustomMaxSeconds", 120 ),
 
 	m_bCustomCourses	( "CourseEdits", false ),
diff --git a/src/PrefsManager.h b/src/PrefsManager.h
index 33ec2020..bbb6bfbf 100755
--- a/src/PrefsManager.h
+++ b/src/PrefsManager.h
@@ -179,7 +179,6 @@ public:
 	// Player songs options
 	Preference<bool>	m_bCustomSongs;
 	Preference<bool>	m_bCustomSongPreviews;
-	Preference<int>		m_iCustomsLoadMax;
 	Preference<float>	m_fCustomsLoadTimeout;
 	Preference<int>		m_iCustomMaxSeconds;
 
diff --git a/src/ScreenOptionsMasterPrefs.cpp b/src/ScreenOptionsMasterPrefs.cpp
index 40a11a0d..b8704e1f 100755
--- a/src/ScreenOptionsMasterPrefs.cpp
+++ b/src/ScreenOptionsMasterPrefs.cpp
@@ -326,12 +326,6 @@ static void CustomsLoadTimeout( int &sel, bool ToSel, const ConfOption *pConfOpt
 	MoveMap( sel, PREFSMAN->m_fCustomsLoadTimeout, ToSel, mapping, ARRAYLEN(mapping) );
 }
 
-static void CustomsLoadMax( int &sel, bool ToSel, const ConfOption *pConfOption )
-{
-	const int mapping[] = { 10, 20, 30, 40, 50, 60, 70, 0 };
-	MoveMap( sel, PREFSMAN->m_iCustomsLoadMax, ToSel, mapping, ARRAYLEN(mapping) );
-}
-
 static void MarvelousTiming( int &sel, bool ToSel, const ConfOption *pConfOption )
 {
 	const PrefsManager::MarvelousTiming mapping[] = { PrefsManager::MARVELOUS_NEVER, PrefsManager::MARVELOUS_COURSES_ONLY, PrefsManager::MARVELOUS_EVERYWHERE };
@@ -600,8 +594,6 @@ static void InitializeConfOptions()
 													"3:30", "4:00", "4:30", "5:00", "5:30",
 													"6:00", "7:00", "10:00", "UNLIMITED" ) );
 	ADD( ConfOption( "CustomsLoadTimeout",				CustomsLoadTimeout,	"5s", "10s", "15s", "20s", "25s", "30s", "45s", "1m" ) );
-	ADD( ConfOption( "CustomsLoadMax",				CustomsLoadMax,		"10", "20", "30", "40", "50", "60", "UNLIMITED" ) );
-
 	ADD( ConfOption( "CustomSongPreviews",				CustomSongPreviews,	"OFF", "ON" ) );
 
 	/* Machine options */
diff --git a/src/SongManager.cpp b/src/SongManager.cpp
index c9662d0e..bfd7e4ab 100755
--- a/src/SongManager.cpp
+++ b/src/SongManager.cpp
@@ -315,7 +315,7 @@ void SongManager::LoadPlayerCourses( PlayerNumber pn )
 			delete crs;
 			continue;
 		}
-		
+
 		// TODO: softcode this to a settable preference
 		if ( crs->GetEstimatedNumStages() > 5 )
 		{
@@ -407,17 +407,9 @@ void SongManager::LoadPlayerSongs( PlayerNumber pn )
 			break;
 		}
 
-		// we want to stop right on the number, not after. "Greater than" is added as a safeguard.
-		if( PREFSMAN->m_iCustomsLoadMax > 0 && iSongsLoaded >= PREFSMAN->m_iCustomsLoadMax )
-		{
-			LOG->Warn( "Loading interrupted. Limit of %i songs was reached, after %f seconds.",
-			(int)PREFSMAN->m_iCustomsLoadMax, LoadTimer.Ago() );
-			break;
-		}
-
 		CString sSongDirName = arraySongDirs[j];
 		Song* pNewSong = new Song;
-		
+
 		// we need a custom loader for these songs.
 		if( !pNewSong->LoadFromCustomSongDir( sSongDirName, sGroupName, pn ) )
 		{
@@ -426,9 +418,9 @@ void SongManager::LoadPlayerSongs( PlayerNumber pn )
 			delete pNewSong;
 			continue;
 		}
-		
+
 		LOG->Trace( "Loading custom song '%s'...", pNewSong->m_sMainTitle.c_str() );
-		
+
 		// TODO: load everything into m_pCustomSongs, then insert() into m_pSongs,
 		// instead of manually inserting the song into both arrays.
 		m_pCustomSongs.push_back( pNewSong );
-- 
2.11.0