Rename DefaultSyncBias --> DefaultSyncOffset

src/Group.cpp

@@ -49,7 +49,7 @@ Group::Group(const RString& sDir, const RString& sGroupDirName) {
     m_sSortTitle = m_sGroupName;
     m_sTranslitTitle = m_sGroupName;
     m_sSeries = "";
-    m_fSyncOffset = PREFSMAN->m_DefaultSyncBias == SyncBias_NULL ? 0 : -0.009;
+    m_fSyncOffset = PREFSMAN->m_DefaultSyncOffset == SyncOffset_NULL ? 0 : -0.009;
     m_bHasPackIni = false;
     m_iYearReleased = 0;
     m_sBannerPath = "";

src/Group.h

@@ -71,7 +71,7 @@ public:
 
 
     /**
-     * @brief The sync bias offset of this group
+     * @brief The sync offset of this group
      * 
      * @return float 
      */
@@ -131,7 +131,7 @@ public:
         /** @brief The series the group belongs to */
         RString m_sSeries;
 
-        /** @brief The sync bias offset of the group */
+        /** @brief The sync offset of the group */
         float m_fSyncOffset;
 
         /** @brief Whether the group has a Pack.ini file. */

src/PrefsManager.cpp

@@ -134,13 +134,13 @@ XToString(ProfileSortOrder);
 StringToX(ProfileSortOrder);
 LuaXType(ProfileSortOrder);
 
-static const char* SyncBiasNames[] = {
+static const char* SyncOffsetNames[] = {
     "NULL",
     "ITG"
 };
-XToString(SyncBias);
-StringToX(SyncBias);
-LuaXType(SyncBias);
+XToString(SyncOffset);
+StringToX(SyncOffset);
+LuaXType(SyncOffset);
 
 bool g_bAutoRestart = false;
 #ifdef DEBUG
@@ -245,7 +245,7 @@ PrefsManager::PrefsManager() :
 	m_ShowDancingCharacters		( "ShowDancingCharacters",		SDC_Random ),
 	m_bUseUnlockSystem		( "UseUnlockSystem",			false ),
 	m_fGlobalOffsetSeconds		( "GlobalOffsetSeconds",		-0.008f ),
-	m_DefaultSyncBias	( "DefaultSyncBias",		SyncBias_ITG ),
+	m_DefaultSyncOffset	( "DefaultSyncOffset",		SyncOffset_ITG ),
 	m_iProgressiveLifebar		( "ProgressiveLifebar",			0 ),
 	m_iProgressiveStageLifebar	( "ProgressiveStageLifebar",		0 ),
 	m_iProgressiveNonstopLifebar	( "ProgressiveNonstopLifebar",		0 ),

src/PrefsManager.h

@@ -124,12 +124,12 @@ enum ProfileSortOrder
 	ProfileSortOrder_Invalid
 };
 
-enum SyncBias
+enum SyncOffset
 {
-	SyncBias_NULL,
-	SyncBias_ITG,
-	NUM_SyncBias,
-	SyncBias_Invalid
+	SyncOffset_NULL,
+	SyncOffset_ITG,
+	NUM_SyncOffset,
+	SyncOffset_Invalid
 };
 
 /** @brief Holds user-chosen preferences that are saved between sessions. */
@@ -248,7 +248,7 @@ public:
 	Preference<ShowDancingCharacters>		m_ShowDancingCharacters;
 	Preference<bool>	m_bUseUnlockSystem;
 	Preference<float>	m_fGlobalOffsetSeconds;
-	Preference<SyncBias>	m_DefaultSyncBias;
+	Preference<SyncOffset>	m_DefaultSyncOffset;
 	Preference<int>	m_iProgressiveLifebar;
 	Preference<int>	m_iProgressiveStageLifebar;
 	Preference<int>	m_iProgressiveNonstopLifebar;

src/ScreenOptionsMasterPrefs.cpp

@@ -941,7 +941,7 @@ static void InitializeConfOptions()
 			c.AddOption( ssprintf("%+i ms", i) );
 		ADD( c );
 	}
-	ADD( ConfOption( "DefaultSyncBias",			MovePref<SyncBias>,		"NULL","|ITG" ) );
+	ADD( ConfOption( "DefaultSyncOffset",			MovePref<SyncOffset>,		"NULL","|ITG" ) );
 	g_ConfOptions.back().m_iEffects = OPT_RELOAD_SONGS;
 
 	ADD( ConfOption( "EnableAttackSounds",		MovePref<bool>,		"No","Yes" ) );

src/Song.cpp

@@ -481,8 +481,8 @@ bool Song::ReloadFromSongDir( RString sDir )
 	if (SONGMAN->GetGroup(this) != nullptr) {
 		m_SongTiming.m_fBeat0GroupOffsetInSeconds = SONGMAN->GetGroup(this)->GetSyncOffset();
 	} else {
-		m_SongTiming.m_fBeat0GroupOffsetInSeconds = PREFSMAN->m_DefaultSyncBias == SyncBias_NULL ? 0 : -0.009;
-		LOG->Warn("Song %s has no group, using machine sync bias.", m_sMainTitle.c_str());
+		m_SongTiming.m_fBeat0GroupOffsetInSeconds = PREFSMAN->m_DefaultSyncOffset == SyncOffset_NULL ? 0 : -0.009;
+		LOG->Warn("Song %s has no group, using default sync offset.", m_sMainTitle.c_str());
 	}
 
 	/* Go through the steps, first setting their Song pointer to this song
@@ -507,8 +507,8 @@ bool Song::ReloadFromSongDir( RString sDir )
 		}
 		else
 		{
-			m_SongTiming.m_fBeat0GroupOffsetInSeconds = PREFSMAN->m_DefaultSyncBias == SyncBias_NULL ? 0 : -0.009;
-			LOG->Warn("Song %s has no group, using machine sync bias.", m_sMainTitle.c_str());
+			m_SongTiming.m_fBeat0GroupOffsetInSeconds = PREFSMAN->m_DefaultSyncOffset == SyncOffset_NULL ? 0 : -0.009;
+			LOG->Warn("Song %s has no group, using default sync offset.", m_sMainTitle.c_str());
 		}
 	}
 
@@ -672,7 +672,7 @@ void Song::TidyUpData( bool from_cache, bool /* duringCache */ )
 	m_SongTiming.TidyUpData(false);
 
 	// Apply the group offset to the song timing before we do anything else.
-	float fOffset = PREFSMAN->m_DefaultSyncBias == SyncBias_NULL ? 0 : -0.009;
+	float fOffset = PREFSMAN->m_DefaultSyncOffset == SyncOffset_NULL ? 0 : -0.009;
 	if (SONGMAN->GetGroupFromName(m_sGroupName) != nullptr)
 	{
 		fOffset = SONGMAN->GetGroupFromName(m_sGroupName)->GetSyncOffset();

src/TimingData.h

@@ -460,7 +460,7 @@ public:
 	/** @brief The initial offset of a song. */
 	float	m_fBeat0OffsetInSeconds;
 
-	/** @brief The sync bias offset of this group */
+	/** @brief The sync offset of this group */
 	float	m_fBeat0GroupOffsetInSeconds;
 
 	// XXX: this breaks encapsulation. get rid of it ASAP