mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 08:21:07 +02:00
webchannels-setup: always allow g_settings.livestreamResolution selection
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e6e0b7888
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-10-12 (Tue, 12 Oct 2021)
Origin message was:
------------------
- webchannels-setup: always allow g_settings.livestreamResolution selection
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -215,10 +215,10 @@ int CWebChannelsSetup::Show()
|
|||||||
|
|
||||||
int shortcut = 1;
|
int shortcut = 1;
|
||||||
|
|
||||||
|
#if 0
|
||||||
bool _mode_webtv = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv) &&
|
bool _mode_webtv = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webtv) &&
|
||||||
(!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty());
|
(!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty());
|
||||||
|
|
||||||
#if 0
|
|
||||||
bool _mode_webradio = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio) &&
|
bool _mode_webradio = (CNeutrinoApp::getInstance()->getMode() == NeutrinoModes::mode_webradio) &&
|
||||||
(!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty());
|
(!CZapit::getInstance()->GetCurrentChannel()->getScriptName().empty());
|
||||||
|
|
||||||
@@ -233,7 +233,7 @@ int CWebChannelsSetup::Show()
|
|||||||
if (!webradio)
|
if (!webradio)
|
||||||
{
|
{
|
||||||
livestreamResolution = g_settings.livestreamResolution;
|
livestreamResolution = g_settings.livestreamResolution;
|
||||||
oc = new CMenuOptionChooser(LOCALE_LIVESTREAM_RESOLUTION, &livestreamResolution, LIVESTREAM_RESOLUTION_OPTIONS, LIVESTREAM_RESOLUTION_OPTION_COUNT, _mode_webtv, this, CRCInput::convertDigitToKey(shortcut++), "", true);
|
oc = new CMenuOptionChooser(LOCALE_LIVESTREAM_RESOLUTION, &livestreamResolution, LIVESTREAM_RESOLUTION_OPTIONS, LIVESTREAM_RESOLUTION_OPTION_COUNT, true, this, CRCInput::convertDigitToKey(shortcut++), "", true);
|
||||||
// FIXME oc->setHint(NEUTRINO_ICON_HINT_DEFAULT, NONEXISTANT_LOCALE);
|
// FIXME oc->setHint(NEUTRINO_ICON_HINT_DEFAULT, NONEXISTANT_LOCALE);
|
||||||
m->addItem(oc);
|
m->addItem(oc);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user