ScrollingBannerList should now load up no matter how many songs you have in a folder. Including < 5 and 0 songs.

stepmania/src/MusicBannerWheel.cpp

@@ -28,6 +28,7 @@ MusicBannerWheel::MusicBannerWheel()
 	currentPos=0;
 	scrlistPos=0;
 	SongsExist=0;
+	SingleLoad=0;
 
 	m_ScrollingList.UseSpriteType(BANNERTYPE);
 	m_ScrollingList.SetXY( 0, 0 );
@@ -97,6 +98,29 @@ void MusicBannerWheel::LoadSongData()
 {
 	Song* pSong;
 	CStringArray asGraphicPaths;
+
+	if(MAXSONGSINBUFFER >= arraySongs.size() && SingleLoad != 1)  // less than the MAXSONGSINBUFFER means we can get away with loading the lot in one go
+	{
+		SingleLoad=2;
+		int difference=0;
+		// find out just how short of a full buffer we are =)
+		difference = MAXSONGSINBUFFER - arraySongs.size();
+		for(int i=0; i<=difference; i++)
+		{
+			for(int c=0; c<arraySongs.size(); c++)
+			{
+				pSong = arraySongs[c];
+
+				if( pSong == NULL ) asGraphicPaths.push_back(THEME->GetPathTo("Graphics","fallback banner"));
+				else if (pSong->HasBanner()) asGraphicPaths.push_back(pSong->GetBannerPath());
+				else if (PREFSMAN->m_bUseBGIfNoBanner && pSong->HasBackground() ) asGraphicPaths.push_back(pSong->GetBannerPath());
+				else asGraphicPaths.push_back(THEME->GetPathTo("Graphics","fallback banner"));	
+			}
+		}
+	}
+	
+	if(SingleLoad==0)
+	{
 		for(int count=0; count<MAXSONGSINBUFFER; count++)
 		{
 			/* In essence, this element is the central one so we want the scrolling list
@@ -144,7 +168,11 @@ void MusicBannerWheel::LoadSongData()
 			else if (PREFSMAN->m_bUseBGIfNoBanner && pSong->HasBackground() ) asGraphicPaths.push_back(pSong->GetBannerPath());
 			else asGraphicPaths.push_back(THEME->GetPathTo("Graphics","fallback banner"));
 		}
+	}
+	if(SingleLoad != 1)
 		m_ScrollingList.Load( asGraphicPaths );
+	if(SingleLoad == 2)
+		SingleLoad = 1;
 	PlayMusicSample();
 }
 
@@ -175,10 +203,14 @@ void MusicBannerWheel::BannersLeft()
 		currentPos--;
 
 	if(scrlistPos==0)
+		if(SingleLoad == 0)
 			scrlistPos = MAXSONGSINBUFFER-1;
+		else
+			scrlistPos = arraySongs.size()-1;
 	else
 		scrlistPos--;
 
+	if(SingleLoad == 0)
 		m_ScrollingList.Unload();
 	LoadSongData();
 	m_debugtext.SetText(ssprintf("currentPos: %d scrlistPos: %d",currentPos,scrlistPos));
@@ -198,6 +230,7 @@ void MusicBannerWheel::BannersRight()
 	else
 		scrlistPos++;
 
+	if(SingleLoad == 0)
 		m_ScrollingList.Unload();
 	LoadSongData();
 	m_debugtext.SetText(ssprintf("currentPos: %d scrlistPos: %d",currentPos,scrlistPos));

stepmania/src/MusicBannerWheel.h

@@ -44,6 +44,7 @@ private:
 	int scrlistPos;
 	
 	int SongsExist;
+	int SingleLoad;
 
 	CArray<Song*, Song*> arraySongs;
 };