diff --git a/Config/Audio.rdb b/Config/Audio.rdb index c06ae045b..a47333dde 100644 --- a/Config/Audio.rdb +++ b/Config/Audio.rdb @@ -1,4 +1,65 @@ // ============ Audio RDB for Project64 ==================================== +[5326696F-FE9A99C3-C:45] +FPSBuffer=0 +Fixed Audio=0 +Good Name=Body Harvest (U) + +[07861842-A12EBC9F-C:45] +Fixed Audio=0 +Good Name=Excitebike 64 (U) (V1.0) +Sync Audio=0 + +[776646F6-06B9AC2B-C:50] +Fixed Audio=0 +Good Name=F-ZERO X (E) + +[4D3E622E-9B828B4E-C:4A] +Fixed Audio=0 +Good Name=F-ZERO X (J) + +[B30ED978-3003C9F9-C:45] +Fixed Audio=0 +Good Name=F-ZERO X (U) + +[BBFDEC37-D93B9EC0-C:4A] +Fixed Audio=0 +Good Name=F-ZERO X + Expansion Kit (J) [CART HACK] + +[C6E39C0A-D2726676-C:45] +Fixed Audio=0 +Good Name=F-ZERO X + Expansion Kit (U) [CART HACK] + [AA18B1A5-07DB6AEB-C:45] Good Name=Resident Evil 2 (U) (V1.1) Sync Audio=0 + +[9510D8D7-35100DD2-C:45] +Fixed Audio=0 +Good Name=Stunt Racer 64 (U) +Sync Audio=0 + +[7F43E701-536328D1-C:50] +Good Name=Top Gear Rally (E) +Sync Audio=0 + +[62269B3D-FE11B1E8-C:45] +Good Name=Top Gear Rally (U) +Sync Audio=0 + +[AC062778-DFADFCB8-C:50] +Fixed Audio=0 +Good Name=World Driver Championship (E) (M5) +Sync Audio=0 + +[308DFEC8-CE2EB5F6-C:45] +Fixed Audio=0 +Good Name=World Driver Championship (U) +Sync Audio=0 + +[00000000-00000000-C:4A] +Fixed Audio=0 +Good Name=64DD IPL (JPN) + +[00000000-00000000-C:45] +Fixed Audio=0 +Good Name=64DD IPL (USA) diff --git a/Config/Project64.rdb b/Config/Project64.rdb index ffbda9974..0551d1889 100644 --- a/Config/Project64.rdb +++ b/Config/Project64.rdb @@ -1850,7 +1850,6 @@ Status=Compatible Plugin Note=[Glide64] missing menu effects 32bit=No Culling=1 -Fixed Audio=0 [B30ED978-3003C9F9-C:45] Good Name=F-ZERO X (U) @@ -5562,7 +5561,6 @@ Plugin Note=[video] HLE not supported [audio] needs audio plugin 32bit=No AudioResetOnLoad=Yes HLE GFX=No -Fixed Audio=0 RDRAM Size=8 RSP-Mfc0Count=10 @@ -6871,7 +6869,6 @@ Status=Issues (plugin) Plugin Note=[video] HLE not supported [audio] needs audio plugin 32bit=No AudioResetOnLoad=Yes -Fixed Audio=0 HLE GFX=No RSP-Mfc0Count=10 @@ -6882,7 +6879,6 @@ Status=Issues (plugin) Plugin Note=[video] HLE not supported [audio] needs audio plugin 32bit=No AudioResetOnLoad=Yes -Fixed Audio=0 HLE GFX=No RSP-Mfc0Count=10 @@ -8207,14 +8203,12 @@ Status=Unsupported [00000000-00000000-C:4A] 32bit=No -Fixed Audio=0 Good Name=64DD IPL (JPN) RDRAM Size=8 Status=Compatible [00000000-00000000-C:45] 32bit=No -Fixed Audio=0 Good Name=64DD IPL (USA) RDRAM Size=8 Status=Compatible diff --git a/Source/Project64-audio/AudioSettings.cpp b/Source/Project64-audio/AudioSettings.cpp index 0d05f9721..a2ac8c26a 100644 --- a/Source/Project64-audio/AudioSettings.cpp +++ b/Source/Project64-audio/AudioSettings.cpp @@ -17,6 +17,7 @@ CSettings * g_settings = NULL; CSettings::CSettings() : m_Set_EnableAudio(0), + m_Set_FixedAudio(0), m_Set_SyncAudio(0), m_Set_FullSpeed(0), m_Set_LimitFPS(0), @@ -31,6 +32,7 @@ CSettings::CSettings() : m_Volume(100), m_TinyBuffer(true), m_FPSBuffer(true), + m_FixedAudio(false), m_SyncAudio(false), m_FullSpeed(true) { @@ -42,6 +44,7 @@ CSettings::CSettings() : if (m_Set_basic_mode != 0) { SettingsRegisterChange(true, m_Set_basic_mode, this, stSettingsChanged); } if (m_Set_debugger != 0) { SettingsRegisterChange(true, m_Set_debugger, this, stSettingsChanged); } if (m_Set_log_flush != 0) { SettingsRegisterChange(true, m_Set_log_flush, this, stSettingsChanged); } + if (m_Set_FixedAudio != 0) { SettingsRegisterChange(true, m_Set_FixedAudio, this, stSettingsChanged); } if (m_Set_SyncAudio != 0) { SettingsRegisterChange(true, m_Set_SyncAudio, this, stSettingsChanged); } if (m_Set_FullSpeed != 0) { SettingsRegisterChange(true, m_Set_FullSpeed, this, stSettingsChanged); } if (m_Set_LimitFPS != 0) { SettingsRegisterChange(true, m_Set_LimitFPS, this, stSettingsChanged); } @@ -61,6 +64,7 @@ CSettings::~CSettings() if (m_Set_basic_mode != 0) { SettingsUnregisterChange(true, m_Set_basic_mode, this, stSettingsChanged); } if (m_Set_debugger != 0) { SettingsUnregisterChange(true, m_Set_debugger, this, stSettingsChanged); } if (m_Set_log_flush != 0) { SettingsUnregisterChange(true, m_Set_log_flush, this, stSettingsChanged); } + if (m_Set_FixedAudio != 0) { SettingsUnregisterChange(true, m_Set_FixedAudio, this, stSettingsChanged); } if (m_Set_SyncAudio != 0) { SettingsUnregisterChange(true, m_Set_SyncAudio, this, stSettingsChanged); } if (m_Set_FullSpeed != 0) { SettingsUnregisterChange(true, m_Set_FullSpeed, this, stSettingsChanged); } if (m_Set_LimitFPS != 0) { SettingsUnregisterChange(true, m_Set_LimitFPS, this, stSettingsChanged); } @@ -78,6 +82,7 @@ void CSettings::RegisterSettings(void) { SetModuleName("default"); m_Set_EnableAudio = FindSystemSettingId("Enable Audio"); + m_Set_FixedAudio = FindSystemSettingId("Fixed Audio"); m_Set_SyncAudio = FindSystemSettingId("Sync Audio"); m_Set_FullSpeed = FindSystemSettingId("Full Speed"); m_Set_LimitFPS = FindSystemSettingId("Limit FPS"); diff --git a/Source/Project64-audio/AudioSettings.h b/Source/Project64-audio/AudioSettings.h index 1632c3e65..2e3d254f5 100644 --- a/Source/Project64-audio/AudioSettings.h +++ b/Source/Project64-audio/AudioSettings.h @@ -46,6 +46,7 @@ private: void LogLevelChanged(void); short m_Set_EnableAudio; + short m_Set_FixedAudio; short m_Set_SyncAudio; short m_Set_FullSpeed; short m_Set_LimitFPS; @@ -61,6 +62,7 @@ private: uint32_t m_Volume; bool m_TinyBuffer; bool m_FPSBuffer; + bool m_FixedAudio; bool m_SyncAudio; bool m_FullSpeed; }; diff --git a/Source/Project64-core/Settings.cpp b/Source/Project64-core/Settings.cpp index 7b6a3d539..25b2efd54 100644 --- a/Source/Project64-core/Settings.cpp +++ b/Source/Project64-core/Settings.cpp @@ -136,7 +136,7 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory) AddHandler(Default_CounterFactor, new CSettingTypeApplication("Defaults", "Counter Factor", 2u)); AddHandler(Default_32Bit, new CSettingTypeApplication("Defaults", "32bit", true)); AddHandler(Default_SyncViaAudio, new CSettingTypeApplication("Defaults", "Audio-Sync Audio", true)); - AddHandler(Default_FixedAudio, new CSettingTypeApplication("Defaults", "Fixed Audio", true)); + AddHandler(Default_FixedAudio, new CSettingTypeApplication("Defaults", "Audio-Fixed Audio", true)); AddHandler(Rdb_GoodName, new CSettingTypeRomDatabase("Good Name", Game_GameName)); AddHandler(Rdb_SaveChip, new CSettingTypeRDBSaveChip("Save Type", (uint32_t)SaveChip_Auto)); @@ -152,7 +152,7 @@ void CSettings::AddHowToHandleSetting(const char * BaseDirectory) AddHandler(Rdb_DelaySi, new CSettingTypeRDBYesNo("Delay SI", false)); AddHandler(Rdb_32Bit, new CSettingTypeRDBYesNo("32bit", Default_32Bit)); AddHandler(Rdb_FastSP, new CSettingTypeRDBYesNo("Fast SP", true)); - AddHandler(Rdb_FixedAudio, new CSettingTypeRomDatabase("Fixed Audio", Default_FixedAudio)); + AddHandler(Rdb_FixedAudio, new CSettingTypeRomDatabase("Audio-Fixed Audio", Default_FixedAudio)); AddHandler(Rdb_SyncViaAudio, new CSettingTypeRomDatabase("Audio-Sync Audio", Default_SyncViaAudio)); AddHandler(Rdb_RspAudioSignal, new CSettingTypeRDBYesNo("Audio Signal", false)); AddHandler(Rdb_TLB_VAddrStart, new CSettingTypeRomDatabase("TLB: Vaddr Start", (uint32_t)0)); @@ -1311,4 +1311,4 @@ void CSettings::UnregisterChangeCB(SettingID Type, void * Data, SettingChangedFu { g_Notify->BreakPoint(__FILE__, __LINE__); } -} \ No newline at end of file +}