From c1c438936030eef6e260673882541a368ad3f9b3 Mon Sep 17 00:00:00 2001 From: svenhoefer Date: Fri, 21 Sep 2018 21:41:34 +0200 Subject: [PATCH] - webtv-setup: move LIVESTREAM_RESOLUTION_OPTIONS to CWebTVResolution code Signed-off-by: Thilo Graf --- src/gui/webtv_setup.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/src/gui/webtv_setup.cpp b/src/gui/webtv_setup.cpp index 104061f03..1bcaae9a1 100644 --- a/src/gui/webtv_setup.cpp +++ b/src/gui/webtv_setup.cpp @@ -50,17 +50,6 @@ CWebTVSetup::CWebTVSetup() changed = false; } -const CMenuOptionChooser::keyval_ext LIVESTREAM_RESOLUTION_OPTIONS[] = -{ - { 1920, NONEXISTANT_LOCALE, "1920x1080" }, - { 1280, NONEXISTANT_LOCALE, "1280x720" }, - { 854, NONEXISTANT_LOCALE, "854x480" }, - { 640, NONEXISTANT_LOCALE, "640x360" }, - { 426, NONEXISTANT_LOCALE, "426x240" }, - { 128, NONEXISTANT_LOCALE, "128x72" } -}; -#define LIVESTREAM_RESOLUTION_OPTION_COUNT (sizeof(LIVESTREAM_RESOLUTION_OPTIONS)/sizeof(CMenuOptionChooser::keyval_ext)) - #define CWebTVSetupFooterButtonCount 4 static const struct button_label CWebTVSetupFooterButtons[CWebTVSetupFooterButtonCount] = { @@ -322,7 +311,6 @@ void CWebTVSetup::webtv_xml_auto() } } - bool CWebTVSetup::webtv_xml_autodir(std::string directory) { if ( @@ -350,6 +338,17 @@ CWebTVResolution::CWebTVResolution() width = 40; } +const CMenuOptionChooser::keyval_ext LIVESTREAM_RESOLUTION_OPTIONS[] = +{ + { 1920, NONEXISTANT_LOCALE, "1920x1080" }, + { 1280, NONEXISTANT_LOCALE, "1280x720" }, + { 854, NONEXISTANT_LOCALE, "854x480" }, + { 640, NONEXISTANT_LOCALE, "640x360" }, + { 426, NONEXISTANT_LOCALE, "426x240" }, + { 128, NONEXISTANT_LOCALE, "128x72" } +}; +#define LIVESTREAM_RESOLUTION_OPTION_COUNT (sizeof(LIVESTREAM_RESOLUTION_OPTIONS)/sizeof(CMenuOptionChooser::keyval_ext)) + int CWebTVResolution::exec(CMenuTarget *parent, const std::string & /*actionKey*/) { if (parent)