Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/Config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion Core/Config.h
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ struct Config {
bool bExtraAudioBuffering; // For bluetooth
std::string sAudioDevice;
bool bAutoAudioDevice;
bool bUseExperimentalAtrac;
bool bUseOldAtrac;

// iOS only for now
bool bAudioMixWithOthers;
Expand Down
2 changes: 1 addition & 1 deletion Core/HLE/sceAtrac.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
28 changes: 14 additions & 14 deletions Tools/langtool/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions UI/EmuScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion UI/GameSettingsScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());

Expand Down
1 change: 1 addition & 0 deletions UI/TabbedDialogScreen.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion assets/lang/ar_AE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ Control Debug = تصحيح التحكم
Toggle Freeze = ‎تفعيل الإيقاف
Touchscreen Test = إختبار لمس الشاشة
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/az_AZ.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Toggle freeze
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/bg_BG.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Toggle freeze
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/ca_ES.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Commuta la imatge
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/cz_CZ.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Přepnout zamrznutí
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/da_DK.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Skift freeze
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/de_DE.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Bild einfrieren an/aus
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/dr_ID.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Toggle freeze
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/en_US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ Texture Replacement = Texture replacement
Toggle Freeze = Toggle freeze
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/es_ES.ini
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ Texture Replacement = Texturas de repuesto
Toggle Freeze = Parar/Reanudar imagen
Touchscreen Test = Test de pantalla táctil
Ubershaders = Ubershaders
Use experimental sceAtrac = Usar sceAtrac experimental
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/es_LA.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Parar/Reanudar imagen
Touchscreen Test = Probar pantalla táctil
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/fa_IR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Toggle freeze
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/fi_FI.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Toggle freeze
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/fr_FR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Geler/Dégeler l'image
Touchscreen Test = Test de l'écran tactile
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/gl_ES.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Parar/Reanudar imaxe
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/gr_EL.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Πάγωμα Εναλαγής
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/he_IL.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Toggle freeze
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/he_IL_invert.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Toggle freeze
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/hr_HR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Uključi zamrzavanje
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/hu_HU.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Irányítás hibakeresés
Toggle Freeze = Fagyasztás ki/bekapcsolása
Touchscreen Test = Érintőképernyő teszt
Ubershaders = Ubershaderek
Use experimental sceAtrac = Kísérleti sceAtrac használata
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/id_ID.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Kontrol Awakutu
Toggle Freeze = Alihkan pembekuan
Touchscreen Test = Tes layar sentuh
Ubershaders = Ubershaders
Use experimental sceAtrac = Gunakan sceAtrac eksperimental
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/it_IT.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Debug Controlli
Toggle Freeze = Attiva/Disattiva Congelamento
Touchscreen Test = Test del Touchscreen
Ubershaders = Ubershader
Use experimental sceAtrac = Usa sceAtrac sperimentale
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/ja_JP.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = フリーズを切り替える
Touchscreen Test = タッチスクリーンのテスト
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = 頂点
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/jv_ID.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Pilian Beku
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/ko_KR.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Texture Replacement = 텍스쳐 교체
Toggle Freeze = 프리징 토글
Touchscreen Test = 터치화면 테스트
Ubershaders = 우버셰이더
Use experimental sceAtrac = 실험적인 sceAtrac 사용
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = 꼭짓점
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/ku_SO.ini
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ Texture Replacement = Texture replacement
Toggle Freeze = Toggle freeze
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/lo_LA.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = ປຸ່ມແຊ່ແຂງ
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/lt-LT.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Toggle freeze
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
2 changes: 1 addition & 1 deletion assets/lang/ms_MY.ini
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ Control Debug = Control Debug
Toggle Freeze = Toggle freeze
Touchscreen Test = Touchscreen test
Ubershaders = Ubershaders
Use experimental sceAtrac = Use experimental sceAtrac
Use the old sceAtrac implementation = Use the old sceAtrac implementation
Vertex = Vertex
VFPU = VFPU

Expand Down
Loading
Loading