Added Elements to Ez2MusicSelect so that it looks similar to pump, added the "Guide" Graphic to Pump's Select Mode, Returning from Gameplay now goes to the correct SongSelect Screen based upon theme metrics.

stepmania/src/MusicBannerWheel.cpp

@@ -17,6 +17,7 @@
 #include "SongManager.h"
 #include "ThemeManager.h"
 #include "RageMusic.h"
+#include "StyleDef.h"
 
 #define BANNERSPACING 200
 #define MAXSONGSINBUFFER 5
@@ -34,6 +35,24 @@ MusicBannerWheel::MusicBannerWheel()
 	
 	arraySongs = SONGMAN->m_pSongs;
 
+	// If there is no currently selected song, select one.
+	if( GAMESTATE->m_pCurSong == NULL )
+	{
+		currentPos=0;
+	}
+	else // theres a song already selected (i.e. they came back from gameplay)...
+	{
+		// find our song and change the currentPos to wherever it may be.
+		for(int i=0; i<arraySongs.size(); i++)
+		{
+			if( GAMESTATE->m_pCurSong == arraySongs[i])
+			{
+				currentPos=i;
+				i=(arraySongs.size()-1); // get us out of the loop by moving i ahead to the end
+			}
+		}
+	}
+
 	LoadSongData();
 
 	m_debugtext.LoadFromFont( THEME->GetPathTo("Fonts","small titles") );
@@ -123,7 +142,6 @@ void MusicBannerWheel::BannersLeft()
 	else
 		currentPos--;
 
-
 	if(scrlistPos==0)
 		scrlistPos = MAXSONGSINBUFFER-1;
 	else
@@ -133,6 +151,7 @@ void MusicBannerWheel::BannersLeft()
 	LoadSongData();
 	m_debugtext.SetText(ssprintf("currentPos: %d scrlistPos: %d",currentPos,scrlistPos));
 	m_ScrollingList.Left();
+	ChangeNotes();
 }
 
 void MusicBannerWheel::BannersRight()
@@ -151,8 +170,14 @@ void MusicBannerWheel::BannersRight()
 	LoadSongData();
 	m_debugtext.SetText(ssprintf("currentPos: %d scrlistPos: %d",currentPos,scrlistPos));
 	m_ScrollingList.Right();
+	ChangeNotes();
 }
 
+void MusicBannerWheel::ChangeNotes()
+{
+}
+
+
 MusicBannerWheel::~MusicBannerWheel()
 {
 }