actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename DefaultSyncBias --> DefaultSyncOffset

Browse Source
This commit is contained in:
Crash Cringle
2025-03-16 21:25:40 -04:00
committed by teejusb
parent 9933271eac
commit 4f0febb57c
19 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Docs/Luadoc/Lua.xml
+3 -3
View File
@@ -2902,9 +2902,9 @@
<EnumValue name='&apos;StyleType_OnePlayerTwoSides&apos;' value='2'/>
<EnumValue name='&apos;StyleType_TwoPlayersSharedSides&apos;' value='3'/>
</Enum>
<Enum name='SyncBias'>
<EnumValue name='&apos;SyncBias_Null&apos;' value='1'/>
<EnumValue name='&apos;SyncBias_ITG&apos;' value='2'/>
<Enum name='SyncOffset'>
<EnumValue name='&apos;SyncOffset_Null&apos;' value='1'/>
<EnumValue name='&apos;SyncOffset_ITG&apos;' value='2'/>
</Enum>
<Enum name='TapNoteScore'>
<EnumValue name='&apos;TapNoteScore_None&apos;' value='0'/>
Docs/Luadoc/LuaDocumentation.xml
+2 -2
View File
@@ -3435,8 +3435,8 @@ end
If this is not set in the <code>Pack.ini</code>, returns an empty string.
</Function>
<Function name='GetSyncOffset' return='float' arguments='' since='ITGmania 1.0.0'>
Returns the sync bias offset to be applied to this group. Returns -0.0009 if <code>ITG</code> or 0 (0ms) if <code>NULL</code>
If this is not set in the <code>Pack.ini</code>, the <code>fDefaultSyncBias</code> preference is used instead.
Returns the sync offset to be applied to this group. Returns -0.0009 if <code>ITG</code> or 0 (0ms) if <code>NULL</code>
If this is not set in the <code>Pack.ini</code>, the <code>DefaultSyncOffset</code> preference is used instead.
</Function>
<Function name='HasPackIni' return='bool' arguments='' since='ITGmania 1.0.0'>
Returns <code>true</code> if the group has a Pack.ini file, <code>false</code> otherwise.
Themes/_fallback/Languages/en.ini
+2 -2
View File
@@ -535,7 +535,7 @@ Transfer Edits to USB=Transfer Edits to USB
Transfer Edits from USB=Transfer Edits from USB
UseUnlockSystem=Enable or disable the unlock system.
VisualDelaySeconds=Calibrate display lag.
DefaultSyncBias=Set the default Sync Bias for content on this machine.\n\nNOTE: Changing this setting will trigger a Song Reload \n\nITG = +9ms.\n NULL = 0ms.
DefaultSyncOffset=Set the default Sync Offset for content on this machine.\n\nNOTE: Changing this setting will trigger a Song Reload \n\nITG = +9ms.\n NULL = 0ms.
Vsync=Cap your frame rate your display's refresh rate. This option only has an effect when the Display Mode is set to &oq;Full Screen&cq;.
WideScreen16_9=Enable widescreen display.
WideScreen16_10=Enable widescreen display.
@@ -1315,7 +1315,7 @@ Undo=Undo
UseUnlockSystem=Unlock System
View steps data=View Steps Data
VisualDelaySeconds=Visual Delay
DefaultSyncBias=Default Sync Bias
DefaultSyncOffset=Default Sync Offset
Voltage=Voltage
Vsync=Wait For Vsync
Warps=Warps
Themes/_fallback/Languages/es.ini
+2 -2
View File
@@ -1214,8 +1214,8 @@ Undo=Deshacer
UseUnlockSystem=Sistema de desbloqueo
View steps data=Ver datos de pasos
VisualDelaySeconds=Latencia visual
DefaultSyncBias=Default Sync Bias
DefaultSyncBias=Establezca el sesgo de sincronización predeterminado para el contenido en esta máquina.\nNOTA: Cambiar esta configuración activará una recarga de canción.\n\nITG = +9ms.\n Null = 0ms.
DefaultSyncOffset=Default Sync Offset
DefaultSyncOffset=Establezca el sesgo de sincronización predeterminado para el contenido en esta máquina.\nNOTA: Cambiar esta configuración activará una recarga de canción.\n\nITG = +9ms.\n Null = 0ms.
Voltage=Voltaje
Vsync=Esperar a VSync
WideScreen16_9=Panorámica 16:9
Themes/_fallback/Languages/fr.ini
+2 -2
View File
@@ -517,7 +517,7 @@ Transfer Edits to USB=Transfère les Modifications vers une clé USB
Transfer Edits from USB=Transfère les Modifications depuis une clé USB
UseUnlockSystem=Active ou non le système de déblocage de chansons.
VisualDelaySeconds=Calibre le délai d'affichage.
DefaultSyncBias=Définissez le biais de synchronisation par défaut pour le contenu sur cette machine.\n\nREMARQUE : la modification de ce paramètre déclenchera un rechargement de morceau\n\nITG = +9 ms.\n Null = 0 ms.
DefaultSyncOffset=Définissez le biais de synchronisation par défaut pour le contenu sur cette machine.\n\nREMARQUE : la modification de ce paramètre déclenchera un rechargement de morceau\n\nITG = +9 ms.\n Null = 0 ms.
Vsync=Limite le taux de rafraîchissement à celui de votre écran. Cette option affecte seulement le mode &oq;Plein Écran&cq;.
WideScreen16_9=Enable widescreen display.
WideScreen16_10=Enable widescreen display.
@@ -989,7 +989,7 @@ SoundVolume=Volume du Son
EnableAttackSounds=Sons D'Attaque
EnableMineHitSound=Son des Mines
VisualDelaySeconds=Délai&nbsp;Visuel
DefaultSyncBias=Default&nbsp;Sync Bias
DefaultSyncOffset=Default&nbsp;Sync Offset
# Profiles
Profile=Profile
Create New Profile=Créer un Profile
Themes/_fallback/Languages/ja.ini
+2 -2
View File
@@ -506,7 +506,7 @@ SmoothLines=グルーブレーダーの線を滑らかにするかどうかを
SoundVolume=ゲーム中の音量を変更します。
TextureColorDepth=テクスチャの色深度を選択します。\n32bitにするとメモリ消費が激しくなりますが、表示が綺麗になります。
VisualDelaySeconds=画面の表示遅れを調整します。
DefaultSyncBias=このマシン上のコンテンツのデフォルトの同期バイアスを設定します。\n注意: この設定を変更すると、曲の再読み込みがトリガーされます\n\nITG = +9ms。\n Null = 0ms。
DefaultSyncOffset=このマシン上のコンテンツのデフォルトの同期バイアスを設定します。\n注意: この設定を変更すると、曲の再読み込みがトリガーされます\n\nITG = +9ms。\n Null = 0ms。
Vsync=フレームレートを使用するディスプレイのリフレッシュレートまでに制限します。\nこのオプションはフルスクリーンモードでのみ有効です。
Windowed=ウインドウモード、またはフルスクリーンモードの\nどちらで起動するかを設定します。
@@ -1342,7 +1342,7 @@ Undo=やり直し
UseUnlockSystem=Unlock System
View steps data=譜面情報の確認
VisualDelaySeconds=Visual Delay
DefaultSyncBias=Default Sync Bias
DefaultSyncOffset=Default Sync Offset
Voltage=Voltage
Vsync=Wait For Vsync
Warps=Warps
Themes/_fallback/Languages/ko.ini
+1 -1
View File
@@ -144,7 +144,7 @@ FlashyCombo=50련타마다 련타수를 번쩍일지 결정합니다。
GameplayFooter=게임속점수틀을 표시할지 설정합니다
FancyUIBG=화려한 바탕을 켰다껐다합니다。사양낮은 옛날콤퓨터에는 끄는것을 추천합니다。\n바뀜은 제목화면에 적용될것입니다。
TimingDisplay=게임속노래재생시간을 경과표에 번쩍입니다。
DefaultSyncBias=이 컴퓨터의 콘텐츠에 대한 기본 동기화 바이어스를 설정합니다.\n\n참고: 이 설정을 변경하면 노래 다시 로드가 트리거됩니다.\n\nITG = +9ms.\n Null = 0ms.
DefaultSyncOffset=이 컴퓨터의 콘텐츠에 대한 기본 동기화 바이어스를 설정합니다.\n\n참고: 이 설정을 변경하면 노래 다시 로드가 트리거됩니다.\n\nITG = +9ms.\n Null = 0ms.
ScoringType=득점방식을 설정합니다。\n『특별』을 고르면, 주제선택지에서 특별득점모드를 고르실수 있습니다。
Themes/_fallback/Languages/nl.ini
+2 -2
View File
@@ -516,7 +516,7 @@ Transfer Edits to USB=Verplaats Wijzigingen naar de USB
Turn=Draai
UseUnlockSystem=Zet het vrijspeelsysteem aan of uit.
VisualDelaySeconds=Kalibreer schermvertraging.
DefaultSyncBias=Stel de standaard synchronisatie-bias in voor inhoud op deze machine. \n\nLET OP: Als u deze instelling wijzigt, wordt het nummer opnieuw geladen\n\nITG = +9ms.\nNull = 0ms.
DefaultSyncOffset=Stel de standaard synchronisatie-bias in voor inhoud op deze machine. \n\nLET OP: Als u deze instelling wijzigt, wordt het nummer opnieuw geladen\n\nITG = +9ms.\nNull = 0ms.
Vsync=Limiteer je FPS aan je beeldvernieuwingssnelheid. Deze optie heeft alleen effect als het spel in oq;Volledig Scherm&cq; mode staat.
WideScreen16_10=Laat breedbeeld toe.
WideScreen16_9=Laat breedbeeld toe.
@@ -1241,7 +1241,7 @@ Undo=Ongedaan Maken
UseUnlockSystem=Vrijspeelsysteem
View steps data=Laat Stapdata Zien
VisualDelaySeconds=Visuele Vertraging
DefaultSyncBias=Default Sync Bias
DefaultSyncOffset=Default Sync Offset
Voltage=Voltage
Vsync=Wacht Voor Vsync
WideScreen16_10=Breedbeeld
Themes/_fallback/Languages/pl.ini
+2 -2
View File
@@ -512,7 +512,7 @@ Transfer Edits to USB=Transfer Zmodyfikowanych Układów Kroków do pamięci USB
Transfer Edits from USB=Transfer Zmodyfikowanych Układów Kroków z pamięci USB
UseUnlockSystem=Włączenie systemu odblokowywania piosenek.
VisualDelaySeconds=Kalibracja opóźnienia ekranu.
DefaultSyncBias=Ustaw domyślne odchylenie synchronizacji dla zawartości na tym komputerze. \nUWAGA: Zmiana tego ustawienia spowoduje ponowne wczytanie utworu\n\nITG = +9 ms.\n Null = 0 ms.
DefaultSyncOffset=Ustaw domyślne odchylenie synchronizacji dla zawartości na tym komputerze. \nUWAGA: Zmiana tego ustawienia spowoduje ponowne wczytanie utworu\n\nITG = +9 ms.\n Null = 0 ms.
Vsync=Blokowanie klatek do czasu odświeżania ekranu, w celu uzyskania płynniejszego obrazu. Działa tylko w trybie pełnoekranowym.
WideScreen16_9=Włączenie obsługi ekranów panoramicznych.
WideScreen16_10=Włączenie obsługi ekranów panoramicznych.
@@ -1236,7 +1236,7 @@ Undo=Cofnij
UseUnlockSystem=System Odblokowania
View steps data=Pokaż dane kroków
VisualDelaySeconds=Opóźnienie Obrazu
DefaultSyncBias=Default Sync Bias
DefaultSyncOffset=Default Sync Offset
Voltage=Woltaż
Vsync=Synchronizacja Pionowa
WideScreen16_9=Ekran Panoramiczny
Themes/_fallback/Languages/sk.ini
+2 -2
View File
@@ -522,7 +522,7 @@ Transfer Edits to USB=Preniesť úpravy na USB
Transfer Edits from USB=Preniesť úpravy z USB
UseUnlockSystem=Povoliť alebo zakázať systém odomykania skladieb.
VisualDelaySeconds=Kalibrovať oneskorenie zobrazenia.
DefaultSyncBias=Nastavte predvolené nastavenie synchronizácie pre obsah na tomto počítači. \n\nPOZNÁMKA: Zmena tohto nastavenia spustí opätovné načítanie skladby\nITG = +9 ms.\n Null = 0 ms.
DefaultSyncOffset=Nastavte predvolené nastavenie synchronizácie pre obsah na tomto počítači. \n\nPOZNÁMKA: Zmena tohto nastavenia spustí opätovné načítanie skladby\nITG = +9 ms.\n Null = 0 ms.
Vsync=Prispôsobiť frekvenciu snímok obnovovacej frekvencii Vášho monitora. Táto voľba je aktívna pri v režime zobrazenia na &oq;celú obrazovku&cq;.
WideScreen16_9=Zapnúť zobrazenie na širokouhlú obrazovku.
WideScreen16_10=Zapnúť zobrazenie na širokouhlú obrazovku.
@@ -1278,7 +1278,7 @@ Undo=Vrátiť
UseUnlockSystem=Odomknúť systém
View steps data=Zobraziť údaje o krokoch
VisualDelaySeconds=Oneskorenie zobrazenia
DefaultSyncBias=Default Sync Bias
DefaultSyncOffset=Default Sync Offset
Voltage=Napätie
Vsync=Čakať na Vsync
Warps=Warps
Themes/_fallback/Languages/zh-Hant.ini
+1 -1
View File
@@ -522,7 +522,7 @@ Transfer Edits to USB=轉移自定義譜面到USB
Transfer Edits from USB=從USB轉移自定義譜面
UseUnlockSystem=使用解禁系統, 一般情況為關.
VisualDelaySeconds=校準畫面顯示延遲.
DefaultSyncBias=设置此机器上内容的默认同步偏差。\n注意：更改此設定將觸發歌曲重新加載 \nITG = +9ms。\n Null = 0ms。
DefaultSyncOffset=设置此机器上内容的默认同步偏差。\n注意：更改此設定將觸發歌曲重新加載 \nITG = +9ms。\n Null = 0ms。
Vsync=選擇是否垂直同步, 只在全螢幕模式有效.
WideScreen16_9=16:9寬螢幕顯示.
WideScreen16_10=16:10寬螢幕顯示.
Themes/_fallback/metrics.ini
+1 -1
View File
@@ -3096,7 +3096,7 @@ Line17="conf,SoundVolume"
Line18="conf,EnableAttackSounds"
Line19="conf,EnableMineHitSound"
Line20="conf,VisualDelaySeconds"
Line21="conf,DefaultSyncBias"
Line21="conf,DefaultSyncOffset"
Line22="conf,RateModPreservesPitch",
[ScreenOptionsAdvanced]
src/Group.cpp
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+5 -5
View File
@@ -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
+6 -6
View File
@@ -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
+1 -1
View File
@@ -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
+5 -5
View File
@@ -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
+1 -1
View File
@@ -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