Lead in time before recording starts in edit mode is now a preference.

Docs/Changelog_sm5.txt

@@ -4,6 +4,11 @@ The StepMania 5 Changelog covers all post-sm-ssc changes. For a list of changes
 from StepMania 4 alpha 5 to sm-ssc v1.2.5, see Changelog_sm-ssc.txt.
 ________________________________________________________________________________
 
+2015/01/31
+----------
+* [EditMode] Want more lead in time before recording starts?
+  It's a preference.  [kyzentun]
+
 2015/01/20
 ----------
 * [ScreenSelect] ChoiceNames can be a lua command that is evaluated to get a

Themes/_fallback/Languages/en.ini

@@ -397,6 +397,7 @@ Edit Courses/Mods=Edit Courses/Mods
 Edit Songs/Steps=Edit Songs/Steps
 Practice Songs/Steps=Practice Songs/Steps
 EditorShowBGChangesPlay=Choose whether to display song backgrounds while playing.
+EditRecordModeLeadIn=Set the amount of lead-in time before recording starts.
 Effect=Effect
 EffectsReceptor=Add alternative behaviors to the receptors and notes.
 EffectsArrow=Add alternative behaviors to the receptors and notes.
@@ -555,6 +556,38 @@ GamePrefDefaultFail=Immediate fail causes a player to die when their life bar re
 UserPrefScoringMode=Select the scoring mode to be used when not in a course.
 
 [OptionNames]
++0 s=+0 s
++1 s=+1 s
++2 s=+2 s
++3 s=+3 s
++4 s=+4 s
++5 s=+5 s
++6 s=+6 s
++7 s=+7 s
++8 s=+8 s
++9 s=+9 s
++10 s=+10 s
++11 s=+11 s
++12 s=+12 s
++13 s=+13 s
++14 s=+14 s
++15 s=+15 s
++16 s=+16 s
++17 s=+17 s
++18 s=+18 s
++19 s=+19 s
++20 s=+20 s
++21 s=+21 s
++22 s=+22 s
++23 s=+23 s
++24 s=+24 s
++25 s=+25 s
++26 s=+26 s
++27 s=+27 s
++28 s=+28 s
++29 s=+29 s
++30 s=+30 s
++31 s=+31 s
 0ms=0ms
 10ms=10ms
 20ms=20ms
@@ -1000,6 +1033,7 @@ Edit scrolling factor=Edit scrolling factor
 Edit fake=Edit fake segment
 Editor options=Options
 EditorShowBGChangesPlay=Show Backgrounds
+EditRecordModeLeadIn=Record Lead In
 Erase step timing=Erase step timing
 Effect=Effect
 EffectsReceptor=Effects

Themes/_fallback/metrics.ini

@@ -4132,7 +4132,7 @@ PlayMusic=false
 TimerSeconds=-1
 ShowStyleIcon=false
 
-LineNames="1,2,3,4,5,6,R1,R2,7,8,9,10,Attacks,11,12,13,14,15,16"
+LineNames="1,2,3,4,5,6,R1,R2,7,8,9,10,Attacks,11,12,13,14,15,16,lead_in"
 # uses legacy speed line
 Line1="list,Speed"
 Line2="list,Accel"
@@ -4153,6 +4153,7 @@ Line13="list,Assist"
 Line14="list,Rate"
 Line15="list,AutoAdjust"
 Line16="conf,EditorShowBGChangesPlay"
+Linelead_in="conf,EditRecordModeLeadIn"
 OutCancelCommand=
 
 [StepsDisplayEdit]

Themes/default/metrics.ini

@@ -2062,7 +2062,7 @@ TimerOnCommand=visible,false
 [ScreenPractice]
 
 [ScreenEditOptions]
-LineNames="1,2,3,4,5,6,R1,R2,7,8,9,10,Attacks,11,12,13,14,15,16,SF"
+LineNames="1,2,3,4,5,6,R1,R2,7,8,9,10,Attacks,11,12,13,14,15,16,SF,lead_in"
 Line1="lua,ArbitrarySpeedMods()"
 LineSF="lua,OptionRowScreenFilter()"
 

src/PrefsManager.cpp

@@ -258,6 +258,7 @@ PrefsManager::PrefsManager() :
 	m_fDebounceCoinInputTime	( "DebounceCoinInputTime",		0 ),
 
 	m_fPadStickSeconds		( "PadStickSeconds",			0 ),
+	m_EditRecordModeLeadIn("EditRecordModeLeadIn", 1.0f),
 	m_bForceMipMaps			( "ForceMipMaps",			false ),
 	m_bTrilinearFiltering		( "TrilinearFiltering",			false ),
 	m_bAnisotropicFiltering		( "AnisotropicFiltering",		false ),

src/PrefsManager.h

@@ -253,6 +253,9 @@ public:
 	// after pressed.
 	Preference<float>	m_fPadStickSeconds;
 
+	// Lead in time before recording starts in edit mode.
+	Preference<float> m_EditRecordModeLeadIn;
+
 	// Useful for non 4:3 displays and resolutions < 640x480 where texels don't
 	// map directly to pixels.
 	Preference<bool>	m_bForceMipMaps;

src/ScreenEdit.cpp

@@ -3200,9 +3200,9 @@ void ScreenEdit::TransitionEditState( EditState em )
 		if( bStateChanging )
 			AdjustSync::ResetOriginalSyncData();
 
-		/* Give a 1 second lead-in.  If we're loading Player, this must be done first.
+		/* Give a lead-in.  If we're loading Player, this must be done first.
 		 * Also be sure to get the right timing. */
-		float fSeconds = GetAppropriateTiming().GetElapsedTimeFromBeat( NoteRowToBeat(m_iStartPlayingAt) ) - 1;
+		float fSeconds = GetAppropriateTiming().GetElapsedTimeFromBeat( NoteRowToBeat(m_iStartPlayingAt) ) - PREFSMAN->m_EditRecordModeLeadIn;
 		GAMESTATE->UpdateSongPosition( fSeconds, GetAppropriateTiming(), RageZeroTimer );
 
 		GAMESTATE->m_bGameplayLeadIn.Set( false );

src/ScreenOptionsMasterPrefs.cpp

@@ -680,6 +680,16 @@ static void GlobalOffsetSeconds( int &sel, bool ToSel, const ConfOption *pConfOp
 	MoveMap( sel, pConfOption, ToSel, mapping, ARRAYLEN(mapping) );
 }
 
+static void EditRecordModeLeadIn(int &sel, bool to_sel, const ConfOption* conf_option)
+{
+	float mapping[32];
+	for(int i= 0; i < 32; ++i)
+	{
+		mapping[i]= static_cast<float>(i);
+	}
+	MoveMap(sel, conf_option, to_sel, mapping, ARRAYLEN(mapping));
+}
+
 static vector<ConfOption> g_ConfOptions;
 static void InitializeConfOptions()
 {
@@ -725,6 +735,14 @@ static void InitializeConfOptions()
 	ADD( ConfOption( "AutogenGroupCourses",		MovePref<bool>,		"Off","On" ) );
 	ADD( ConfOption( "FastLoad",			MovePref<bool>,		"Off","On" ) );
 	ADD( ConfOption( "FastLoadAdditionalSongs",			MovePref<bool>,		"Off","On" ) );
+	{
+		ConfOption c("EditRecordModeLeadIn", EditRecordModeLeadIn);
+		for(int i= 0; i < 32; ++i)
+		{
+			c.AddOption(ssprintf("%+i s", i));
+		}
+		ADD(c);
+	}
 
 	// Background options
 	ADD( ConfOption( "RandomBackgroundMode",	MovePref<RandomBackgroundMode>, "Off","Animations","Random Movies" ) );