From 691771244fbd37e45f8ac75e6dbc689635fb82eb Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Wed, 5 Jun 2013 00:03:37 +0200 Subject: [PATCH] Hide the atrac3plusdecoder autoinstaller on platforms where it's not yet supported --- UI/MenuScreens.cpp | 5 +++++ UI/NativeApp.cpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/UI/MenuScreens.cpp b/UI/MenuScreens.cpp index e5d82120cb..73585fec2e 100644 --- a/UI/MenuScreens.cpp +++ b/UI/MenuScreens.cpp @@ -693,11 +693,16 @@ void AudioScreen::render() { UICheckBox(GEN_ID, x, y += stride, a->T("Enable Atrac3+"), ALIGN_TOPLEFT, &g_Config.bEnableAtrac3plus); } + +#if (defined(_WIN32) && (defined(_M_IX86) || defined(_M_X64))) || defined(ARMEABI) || defined(ARMEABI_V7A) + VLinear vlinear(30, 300, 20); if (UIButton(GEN_ID, vlinear, 400, 0, a->T("Download Atrac3+ plugin"), ALIGN_LEFT)) { screenManager()->push(new PluginScreen()); } +#endif + UIEnd(); } diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp index 31b11c4544..9ab09bbf3f 100644 --- a/UI/NativeApp.cpp +++ b/UI/NativeApp.cpp @@ -354,6 +354,7 @@ void NativeInitGraphics() { screenManager = new ScreenManager(); if (boot_filename.empty()) { +#if (defined(_WIN32) && (defined(_M_IX86) || defined(_M_X64))) || defined(ARMEABI) || defined(ARMEABI_V7A) if (Atrac3plus_Decoder::CanAutoInstall()) { Atrac3plus_Decoder::DoAutoInstall(); screenManager->switchScreen(new LogoScreen(boot_filename)); @@ -363,6 +364,9 @@ void NativeInitGraphics() { if (g_Config.bFirstRun && !Atrac3plus_Decoder::IsInstalled()) screenManager->push(new PluginScreen()); } +#else + screenManager->switchScreen(new LogoScreen(boot_filename)); +#endif } else { // Go directly into the game. screenManager->switchScreen(new EmuScreen(boot_filename));