Added Title/Subtitle/Artist texts to ez2 music select

stepmania/Themes/default/metrics.ini

@@ -711,6 +711,12 @@ InfoFrameX=999
 InfoFrameY=999
 GroupNameX=320
 GroupNameY=55
+TitleX=320
+TitleY=80
+SubTitleX=999
+SubTitleY=999
+ArtistX=999
+ArtistY=999
 DifficultyRatingX=999
 DifficultyRatingY=999
 DifficultyRatingOrientation=0
@@ -1805,10 +1811,14 @@ Dark=
 CancelAll=Left,Right,Left,Right,Left,Right,Left,Right
 NextTheme=Left,Left,Left,Right,Right,Right,Left,Right
 NextAnnouncer=Left,Left,Right,Right,Left,Left,Right,Right
+NextBannerGroup=MenuUp,MenuRight,MenuRight
+NextBannerGroup2=MenuUp,MenuDown,MenuUp,MenuDown
 Hidden=
 RandomVanish=
-NextBannerGroup=
+NextBannerGroup=MenuUp,MenuRight,MenuRight
-NextBannerGroup2=
+NextBannerGroup2=MenuUp,MenuDown,MenuUp,MenuDown
+// next banner group is used only in the banner song select, doesnt interfere
+// with other song select.
 
 [GrooveRadar]
 Label1OffsetX=0		// stream
@@ -1873,6 +1883,9 @@ OutCommand=linear,0.20;zoomy,0;diffusealpha,1
 [ScoreKeeperRave]
 AttackDurationSeconds=10
 
+[ScreenSelectMaster]
+TimerSeconds=20
+
 [ScreenInputOptions]
 HelpText=&UP; &DOWN; to change line   &LEFT; &RIGHT; to select between options::START to accept changes   BACK to discard changes
 AutoMapJoysticks=&oq;ON&cq; will cause StepMania automatically create::mappings for the joysticks attached to your computer::at the time the program starts.  This will::override any manually defined mappings.

stepmania/src/ScreenEz2SelectMusic.cpp

@@ -58,6 +58,14 @@
 #define INFOFRAME_X		THEME->GetMetricF("ScreenEz2SelectMusic","InfoFrameX")
 #define INFOFRAME_Y		THEME->GetMetricF("ScreenEz2SelectMusic","InfoFrameY")
 
+#define ARTIST_X				THEME->GetMetricF("ScreenEz2SelectMusic","ArtistX")
+#define ARTIST_Y				THEME->GetMetricF("ScreenEz2SelectMusic","ArtistY")
+#define TITLE_X				THEME->GetMetricF("ScreenEz2SelectMusic","TitleX")
+#define TITLE_Y				THEME->GetMetricF("ScreenEz2SelectMusic","TitleY")
+#define SUBTITLE_X				THEME->GetMetricF("ScreenEz2SelectMusic","SubTitleX")
+#define SUBTITLE_Y				THEME->GetMetricF("ScreenEz2SelectMusic","SubTitleY")
+
+
 #define USE_MODE_SWITCHER THEME->GetMetricI("ScreenEz2SelectMusic","UseModeSwitcher")
 
 const float TWEEN_TIME		= 0.5f;
@@ -176,6 +184,19 @@ ScreenEz2SelectMusic::ScreenEz2SelectMusic() : Screen("ScreenEz2SelectMusic")
 		m_CurrentGroup.SetXY( GROUPNAME_X, GROUPNAME_Y );
 		this->AddChild(&m_CurrentGroup );
 
+		m_CurrentTitle.LoadFromFont( THEME->GetPathToF("ScreenEz2SelectMusic GroupName") );
+		m_CurrentTitle.SetXY( TITLE_X, TITLE_Y );
+		this->AddChild(&m_CurrentTitle );
+
+		m_CurrentSubTitle.LoadFromFont( THEME->GetPathToF("ScreenEz2SelectMusic GroupName") );
+		m_CurrentSubTitle.SetXY( SUBTITLE_X, SUBTITLE_Y );
+		m_CurrentSubTitle.SetZoom(0.8f);
+		this->AddChild(&m_CurrentTitle );
+
+		m_CurrentArtist.LoadFromFont( THEME->GetPathToF("ScreenEz2SelectMusic GroupName") );
+		m_CurrentArtist.SetXY( ARTIST_X, ARTIST_Y );
+		this->AddChild(&m_CurrentArtist );
+
 		m_DifficultyRating.SetOrientation(DIFFICULTYRATING_ORIENTATION);
 		m_DifficultyRating.SetX(DIFFICULTYRATING_X);
 		m_DifficultyRating.SetY(DIFFICULTYRATING_Y);
@@ -583,6 +604,10 @@ void ScreenEz2SelectMusic::MusicChanged()
 	m_CurrentGroup.SetText( SONGMAN->ShortenGroupName( pSong->m_sGroupName ) , "");
 	m_CurrentGroup.SetDiffuse( SONGMAN->GetGroupColor(pSong->m_sGroupName) );
 
+	m_CurrentTitle.SetText( pSong->m_sMainTitle, "");
+	m_CurrentSubTitle.SetText( pSong->m_sSubTitle, "");
+	m_CurrentArtist.SetText( pSong->m_sArtist, "");
+
 	if( pSong->m_fMusicLengthSeconds > PREFSMAN->m_fMarathonVerSongSeconds )
 	{
 		m_sprBalloon.StopTweening();

stepmania/src/ScreenEz2SelectMusic.h

@@ -65,6 +65,10 @@ protected:
 	Sprite				m_sprBalloon;
 	BitmapText	m_PumpDifficultyRating;
 	BitmapText  m_CurrentGroup;
+	BitmapText  m_CurrentTitle;
+	BitmapText  m_CurrentSubTitle;
+	BitmapText  m_CurrentArtist;
+
 
 	RageSound			m_soundOptionsChange;
 	RageSound			m_soundMusicChange;