From 0d9d992a3cfe60efe0a74d5572893fe6f00dc54a Mon Sep 17 00:00:00 2001 From: BPanther Date: Fri, 15 Oct 2021 20:00:18 +0200 Subject: [PATCH] fix unused variables --- src/gui/keybind_setup.cpp | 2 ++ src/neutrino.cpp | 1 + src/system/settings.cpp | 2 ++ src/system/settings.h | 4 ++++ 4 files changed, 9 insertions(+) diff --git a/src/gui/keybind_setup.cpp b/src/gui/keybind_setup.cpp index 4b3114b34..e1112e453 100644 --- a/src/gui/keybind_setup.cpp +++ b/src/gui/keybind_setup.cpp @@ -211,10 +211,12 @@ const key_settings_struct_t key_settings[CKeybindSetup::KEYBINDS_COUNT] = {LOCALE_EXTRA_KEY_NEXT43MODE, &g_settings.key_next43mode, NONEXISTANT_LOCALE}, {LOCALE_EXTRA_KEY_SWITCHFORMAT, &g_settings.key_switchformat, NONEXISTANT_LOCALE}, {LOCALE_EXTRA_KEY_SCREENSHOT, &g_settings.key_screenshot, LOCALE_MENU_HINT_KEY_SCREENSHOT }, +#if ENABLE_PIP {LOCALE_EXTRA_KEY_PIP_CLOSE, &g_settings.key_pip_close, LOCALE_MENU_HINT_KEY_PIP_CLOSE }, {LOCALE_EXTRA_KEY_PIP_CLOSE_AVINPUT, &g_settings.key_pip_close_avinput, NONEXISTANT_LOCALE /*LOCALE_MENU_HINT_KEY_PIP_CLOSE_AVINPUT*/ }, {LOCALE_EXTRA_KEY_PIP_SETUP, &g_settings.key_pip_setup, LOCALE_MENU_HINT_KEY_PIP_SETUP }, {LOCALE_EXTRA_KEY_PIP_SWAP, &g_settings.key_pip_swap, LOCALE_MENU_HINT_KEY_PIP_CLOSE }, +#endif {LOCALE_EXTRA_KEY_FORMAT_MODE, &g_settings.key_format_mode_active, LOCALE_MENU_HINT_KEY_FORMAT_MODE_ACTIVE }, {LOCALE_EXTRA_KEY_PIC_MODE, &g_settings.key_pic_mode_active, LOCALE_MENU_HINT_KEY_PIC_MODE_ACTIVE }, {LOCALE_EXTRA_KEY_PIC_SIZE, &g_settings.key_pic_size_active, LOCALE_MENU_HINT_KEY_PIC_SIZE_ACTIVE }, diff --git a/src/neutrino.cpp b/src/neutrino.cpp index c1aeb9b6f..1df646ac9 100644 --- a/src/neutrino.cpp +++ b/src/neutrino.cpp @@ -5105,6 +5105,7 @@ void CNeutrinoApp::standbyMode( bool bOnOff, bool fromDeepStandby ) CEpgScan::getInstance()->Start(true); + bool alive = recordingstatus || CEpgScan::getInstance()->Running() || CStreamManager::getInstance()->StreamStatus(); if (!alive && cpuFreq) cpuFreq->SetCpuFreq(g_settings.standby_cpufreq * 1000 * 1000); diff --git a/src/system/settings.cpp b/src/system/settings.cpp index 0c29ea102..5ba4746f9 100644 --- a/src/system/settings.cpp +++ b/src/system/settings.cpp @@ -50,7 +50,9 @@ const struct personalize_settings_t personalize_settings[SNeutrinoSettings::P_SE {"personalize_games" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE}, {"personalize_tools" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE}, {"personalize_avinput" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, +#if ENABLE_PIP {"personalize_avinput_pip" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, +#endif {"personalize_scripts" , CPersonalizeGui::PERSONALIZE_MODE_NOTVISIBLE}, {"personalize_lua" , CPersonalizeGui::PERSONALIZE_MODE_VISIBLE}, {"personalize_settings" , CPersonalizeGui::PERSONALIZE_PROTECT_MODE_NOT_PROTECTED}, diff --git a/src/system/settings.h b/src/system/settings.h index f10b03090..46f3057dc 100644 --- a/src/system/settings.h +++ b/src/system/settings.h @@ -660,7 +660,9 @@ struct SNeutrinoSettings P_MAIN_GAMES, P_MAIN_TOOLS, P_MAIN_AVINPUT, +#if ENABLE_PIP P_MAIN_AVINPUT_PIP, +#endif P_MAIN_SCRIPTS, P_MAIN_LUA, P_MAIN_SETTINGS, @@ -1198,10 +1200,12 @@ struct SNeutrinoSettings int key_pageup; int key_pic_mode_active; int key_pic_size_active; +#if ENABLE_PIP int key_pip_close; int key_pip_close_avinput; int key_pip_setup; int key_pip_swap; +#endif int key_power_off; int key_quickzap_down; int key_quickzap_up;