From 4eda22a57b379b1262a4c6138372efe494baeb8e Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Wed, 30 Jun 2010 00:00:34 -0500
Subject: [PATCH] [CourseUtil] make the "All Songs" course use the current
 theme's Graphics/Banner all music file.

---
 Docs/Changelog_sm-ssc.txt |  8 ++++++++
 src/CourseUtil.cpp        | 17 ++++++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Docs/Changelog_sm-ssc.txt b/Docs/Changelog_sm-ssc.txt
index 3f6d3fff0f..4f3adc6496 100644
--- a/Docs/Changelog_sm-ssc.txt
+++ b/Docs/Changelog_sm-ssc.txt
@@ -9,6 +9,11 @@ Not all changes are documented, for various reasons.
 supported but exist anyways.)
 _____________________________________________________________________________
 
+================================================================================
+sm-ssc v1.0 Release Candidate 2 | 201007xx
+--------------------------------------------------------------------------------
+(work in progress, it's not out yet [hence the "xx" above].)
+
 20100629
 --------
 * Fix an issue involving setting a group via GameCommand and a metric ([MusicWheel]
@@ -18,10 +23,13 @@ _____________________________________________________________________________
 * If [MusicWheel] UseSectionsWithPreferredGroup=true and a song group is set
   via GameCommand, the wheel will now scroll to the first song in the desired
   group, instead of the very first wheel item.
+* [CourseUtil] make the "All Songs" course use the current theme's
+  Graphics/Banner all music file.
 
 ================================================================================
 sm-ssc v1.0 Release Candidate 1 | 20100627
 --------------------------------------------------------------------------------
+
 20100627
 --------
 * [NotesLoaderKSF] Support reading of #PLAYER and #MUSICINTRO/#INTRO tags in
diff --git a/src/CourseUtil.cpp b/src/CourseUtil.cpp
index ae1603ef16..38278bc31f 100644
--- a/src/CourseUtil.cpp
+++ b/src/CourseUtil.cpp
@@ -239,7 +239,8 @@ void CourseUtil::AutogenEndlessFromGroup( const RString &sGroupName, Difficulty
 	if( sGroupName == "" )
 	{
 		out.m_sMainTitle = "All Songs";
-		// m_sBannerPath = ""; // XXX
+		// this sounds reasonable... -aj
+		out.m_sBannerPath = THEME->GetPathG("Banner","all music");
 	}
 	else
 	{
@@ -288,23 +289,25 @@ void CourseUtil::AutogenOniFromArtist( const RString &sArtistName, RString sArti
 	ASSERT( sArtistName != "" );
 	ASSERT( aSongs.size() > 0 );
 
-	/* "Artist Oni" is a little repetitive; "by Artist" stands out less, and lowercasing
-	 * "by" puts more emphasis on the artist's name.  It also sorts them together. */
+	/* "Artist Oni" is a little repetitive; "by Artist" stands out less, and
+	 * lowercasing "by" puts more emphasis on the artist's name. It also sorts
+	 * them together. */
 	out.m_sMainTitle = "by " + sArtistName;
 	if( sArtistNameTranslit != sArtistName )
 		out.m_sMainTitleTranslit = "by " + sArtistNameTranslit;
 
-
+	// How would we handle Artist Oni course banners, anyways? -aj
 	// m_sBannerPath = ""; // XXX
 
-	/* Shuffle the list to determine which songs we'll use.  Shuffle it deterministically,
-	 * so we always get the same set of songs unless the song set changes. */
+	/* Shuffle the list to determine which songs we'll use. Shuffle it
+	 * deterministically, so we always get the same set of songs unless the
+	 * song set changes. */
 	{
 		RandomGen rng( GetHashForString( sArtistName ) + aSongs.size() );
 		random_shuffle( aSongs.begin(), aSongs.end(), rng );
 	}
 
-	/* Only use up to four songs. */
+	// Only use up to four songs.
 	if( aSongs.size() > 4 )
 		aSongs.erase( aSongs.begin()+4, aSongs.end() );