Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Use the new sceAtrac implementation by default

Browse source 
Inverts/renames the setting to allow going back to the old sceAtrac
implementation, to work around any compatibility issue.

Note that we can never delete the old implementation, old savestates
will still use it - can't convert an existing session.
This commit is contained in:
Henrik Rydgård 2025-03-20 23:10:21 +01:00
parent a68e4292f9
commit 249281366e
8 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Core/Config.cpp
View file

@ -792,7 +792,7 @@ static const ConfigSetting soundSettings[] = {
ConfigSetting("AutoAudioDevice", &g_Config.bAutoAudioDevice, true, CfgFlag::DEFAULT),
ConfigSetting("AudioMixWithOthers", &g_Config.bAudioMixWithOthers, true, CfgFlag::DEFAULT),
ConfigSetting("AudioRespectSilentMode", &g_Config.bAudioRespectSilentMode, false, CfgFlag::DEFAULT),
ConfigSetting("UseExperimentalAtrac", &g_Config.bUseExperimentalAtrac, false, CfgFlag::DEFAULT),
ConfigSetting("UseOldAtrac", &g_Config.bUseOldAtrac, false, CfgFlag::DEFAULT),
};
static bool DefaultShowTouchControls() {

2
Core/Config.h
View file

@ -298,7 +298,7 @@ public:
bool bExtraAudioBuffering; // For bluetooth
std::string sAudioDevice;
bool bAutoAudioDevice;
bool bUseExperimentalAtrac;
bool bUseOldAtrac;
// iOS only for now
bool bAudioMixWithOthers;

2
Core/HLE/sceAtrac.cpp
View file

@ -216,7 +216,7 @@ static AtracBase *getAtrac(int atracID) {
static int AllocAndRegisterAtrac(int codecType) {
for (int i = 0; i < g_atracMaxContexts; ++i) {
if (atracContextTypes[i] == codecType && atracContexts[i] == 0) {
if (g_Config.bUseExperimentalAtrac && g_atracBSS != 0) {
if (!g_Config.bUseOldAtrac && g_atracBSS != 0) {
atracContexts[i] = new Atrac2(GetAtracContextAddress(i), codecType);
} else {
atracContexts[i] = new Atrac(i, codecType);

4
UI/EmuScreen.cpp
View file

@ -416,10 +416,6 @@ void EmuScreen::bootComplete() {
}
#endif
if (g_Config.bUseExperimentalAtrac) {
g_OSD.Show(OSDType::MESSAGE_WARNING, dev->T("Use experimental sceAtrac"));
}
#if !PPSSPP_PLATFORM(UWP)
if (GetGPUBackend() == GPUBackend::OPENGL) {
const char *renderer = gl_extensions.model;

2
UI/GameSettingsScreen.cpp
View file

@ -1902,7 +1902,7 @@ void DeveloperToolsScreen::CreateViews() {
cpuTests->SetEnabled(TestsAvailable());
#endif
list->Add(new CheckBox(&g_Config.bUseExperimentalAtrac, dev->T("Use experimental sceAtrac")));
list->Add(new CheckBox(&g_Config.bUseOldAtrac, dev->T("Use the old sceAtrac implementation")));
AddOverlayList(list, screenManager());

1
UI/TabbedDialogScreen.cpp
View file

@ -54,6 +54,7 @@ void TabbedUIDialogScreenWithGameBackground::CreateViews() {
tabHolder_->AddBack(this);
root_->Add(tabHolder_);
}
tabHolder_->SetTag(tag()); // take the tag from the screen.
root_->SetDefaultFocusView(tabHolder_);
settingTabContents_.clear();

8
headless/Headless.cpp
View file

@ -351,7 +351,7 @@ int main(int argc, const char* argv[])
GPUCore gpuCore = GPUCORE_SOFTWARE;
CPUCore cpuCore = CPUCore::JIT;
int debuggerPort = -1;
bool newAtrac = false;
bool oldAtrac = false;
bool outputDebugStringLog = false;
std::vector<std::string> testFilenames;
@ -392,8 +392,8 @@ int main(int argc, const char* argv[])
testOptions.bench = true;
else if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--verbose"))
testOptions.verbose = true;
else if (!strcmp(argv[i], "--new-atrac"))
newAtrac = true;
else if (!strcmp(argv[i], "--old-atrac"))
oldAtrac = true;
else if (!strncmp(argv[i], "--graphics=", strlen("--graphics=")) && strlen(argv[i]) > strlen("--graphics="))
{
const char *gpuName = argv[i] + strlen("--graphics=");
@ -533,7 +533,7 @@ int main(int argc, const char* argv[])
g_Config.iGameVolume = VOLUMEHI_FULL;
g_Config.iReverbVolume = VOLUMEHI_FULL;
g_Config.internalDataDirectory.clear();
g_Config.bUseExperimentalAtrac = newAtrac;
g_Config.bUseOldAtrac = oldAtrac;
Path exePath = File::GetExeDirectory();
g_Config.flash0Directory = exePath / "assets/flash0";

2
test.py
View file

@ -553,7 +553,7 @@ def run_tests(test_list, args):
if len(test_filenames):
# TODO: Maybe --compare should detect --graphics?
cmdline = [PPSSPP_EXE, '--root', TEST_ROOT + '../', '--compare', '--new-atrac', '--timeout=' + str(TIMEOUT), '@-']
cmdline = [PPSSPP_EXE, '--root', TEST_ROOT + '../', '--compare', '--timeout=' + str(TIMEOUT), '@-']
cmdline.extend([i for i in args if i not in ['-g', '-m', '-b']])
c = Command(cmdline, '\n'.join(test_filenames))