more TickEarlySeconds into CommonMetrics

stepmania/src/CommonMetrics.cpp

@@ -16,6 +16,7 @@ ThemeMetric<CString>	WINDOW_TITLE						("Common","WindowTitle");
 ThemeMetric<bool>		HOME_EDIT_MODE						("Common","HomeEditMode");
 ThemeMetric<int>		MAX_STEPS_LOADED_FROM_PROFILE		("Common","MaxStepsLoadedFromProfile");
 ThemeMetric<int>		MAX_COURSE_ENTRIES_BEFORE_VARIOUS	("Common","MaxCourseEntriesBeforeShowVarious");
+ThemeMetric<float>		TICK_EARLY_SECONDS					("ScreenGameplay","TickEarlySeconds");
 
 
 class ThemeMetricDifficultiesToShow : ThemeMetric<CString>

stepmania/src/CommonMetrics.h

@@ -17,6 +17,7 @@ extern ThemeMetric<CString>		WINDOW_TITLE;
 extern ThemeMetric<bool>		HOME_EDIT_MODE;
 extern ThemeMetric<int>			MAX_STEPS_LOADED_FROM_PROFILE;
 extern ThemeMetric<int>			MAX_COURSE_ENTRIES_BEFORE_VARIOUS;
+extern ThemeMetric<float>		TICK_EARLY_SECONDS;
 
 namespace CommonMetrics
 {

stepmania/src/ScreenEdit.cpp

@@ -31,12 +31,10 @@
 #include "ScreenPrompt.h"
 #include "CommonMetrics.h"
 
-const float RECORD_HOLD_SECONDS = 0.3f;
-
-
 //
 // Defines specific to ScreenEdit
 //
+const float RECORD_HOLD_SECONDS = 0.3f;
 
 #define EDIT_X			(SCREEN_CENTER_X)
 
@@ -45,8 +43,6 @@ const float RECORD_HOLD_SECONDS = 0.3f;
 #define PLAYER_HEIGHT		(360)
 #define PLAYER_Y_STANDARD	(PLAYER_Y-PLAYER_HEIGHT/2)
 
-ThemeMetric<float>	 TICK_EARLY_SECONDS		("ScreenGameplay","TickEarlySeconds");
-
 
 const ScreenMessage SM_BackFromMainMenu				= (ScreenMessage)(SM_User+1);
 const ScreenMessage SM_BackFromAreaMenu				= (ScreenMessage)(SM_User+2);
@@ -713,6 +709,7 @@ void ScreenEdit::UpdateTextInfo()
 
 	int iNumTapNotes = m_NoteDataEdit.GetNumTapNotes();
 	int iNumHoldNotes = m_NoteDataEdit.GetNumHoldNotes();
+	int iNumMines = m_NoteDataEdit.GetNumMines();
 
 	CString sNoteType = NoteTypeToString(m_SnapDisplay.GetNoteType()) + " notes";
 
@@ -722,14 +719,26 @@ void ScreenEdit::UpdateTextInfo()
 	sText += ssprintf( "Snap to:\n     %s\n",				sNoteType.c_str() );
 	sText += ssprintf( "Selection begin:\n     %s\n",		m_NoteFieldEdit.m_iBeginMarker==-1 ? "not set" : ssprintf("%.2f",NoteRowToBeat(m_NoteFieldEdit.m_iBeginMarker)).c_str() );
 	sText += ssprintf( "Selection end:\n     %s\n",			m_NoteFieldEdit.m_iEndMarker==-1 ? "not set" : ssprintf("%.2f",NoteRowToBeat(m_NoteFieldEdit.m_iEndMarker)).c_str() );
+	if( HOME_EDIT_MODE )
 		sText += ssprintf( "Difficulty:\n     %s\n",		DifficultyToString( m_pSteps->GetDifficulty() ).c_str() );
 	sText += ssprintf( "Description:\n     %s\n",			GAMESTATE->m_pCurSteps[PLAYER_1] ? GAMESTATE->m_pCurSteps[PLAYER_1]->GetDescription().c_str() : "no description" );
+	if( HOME_EDIT_MODE )
+	{
 		sText += ssprintf( "Main title:\n     %s\n", m_pSong->m_sMainTitle.c_str() );
 		sText += ssprintf( "Sub title:\n     %s\n", m_pSong->m_sSubTitle.c_str() );
+	}
+	else
+	{
+		sText += ssprintf( "Title:\n     %s\n", m_pSong->GetFullTranslitTitle() );
+	}
 	sText += ssprintf( "Tap Steps:\n     %d\n", iNumTapNotes );
 	sText += ssprintf( "Hold Steps:\n     %d\n", iNumHoldNotes );
+	sText += ssprintf( "Mines:\n     %d\n", iNumMines );
+	if( HOME_EDIT_MODE )
 		sText += ssprintf( "Beat 0 Offset:\n     %.3f secs\n",	m_pSong->m_Timing.m_fBeat0OffsetInSeconds );
+	if( HOME_EDIT_MODE )
 		sText += ssprintf( "Preview Start:\n     %.2f secs\n",	m_pSong->m_fMusicSampleStartSeconds );
+	if( HOME_EDIT_MODE )
 		sText += ssprintf( "Preview Length:\n     %.2f secs\n",m_pSong->m_fMusicSampleLengthSeconds );
 
 	m_textInfo.SetText( sText );

stepmania/src/ScreenGameplay.cpp

@@ -47,6 +47,7 @@
 #include "Style.h"
 #include "LuaManager.h"
 #include "MemoryCardManager.h"
+#include "CommonMetrics.h"
 
 //
 // Defines
@@ -61,7 +62,6 @@
 
 static ThemeMetric<float> INITIAL_BACKGROUND_BRIGHTNESS	("ScreenGameplay","InitialBackgroundBrightness");
 static ThemeMetric<float> SECONDS_BETWEEN_COMMENTS	("ScreenGameplay","SecondsBetweenComments");
-static ThemeMetric<float> TICK_EARLY_SECONDS		("ScreenGameplay","TickEarlySeconds");
 
 /* Global, so it's accessible from ShowSavePrompt: */
 static float g_fOldOffset;  // used on offset screen to calculate difference