osd-setup: allow to enable/disable event logos

Origin commit data
------------------
Commit: 7115402334
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-25 (Tue, 25 Dec 2018)

Origin message was:
------------------
- osd-setup: allow to enable/disable event logos
This commit is contained in:
vanhofen
2018-12-25 01:12:16 +01:00
parent 39f1e56cd2
commit d1b7cd74da
9 changed files with 32 additions and 1 deletions

View File

@@ -69,6 +69,10 @@
#include <hardware/video.h>
// lcd4l-support
#include "driver/lcd4l.h"
extern CLCD4l *LCD4l;
extern CRemoteControl * g_RemoteControl;
extern const char * locale_real_names[];
@@ -83,6 +87,7 @@ COsdSetup::COsdSetup(int wizard_mode)
colorInfoclockNotifier = NULL;
screensaverNotifier = NULL;
channellistNotifier = NULL;
channellogoNotifier = NULL;
infobarHddNotifier = NULL;
osd_menu = NULL;
submenu_menus = NULL;
@@ -771,6 +776,7 @@ int COsdSetup::showOsdSetup()
delete colorInfoclockNotifier;
delete screensaverNotifier;
delete channellistNotifier;
delete channellogoNotifier;
delete infobarHddNotifier;
delete osd_menu;
return res;
@@ -1218,6 +1224,7 @@ void COsdSetup::showOsdChannellogosSetup(CMenuWidget *menu_channellogos)
{
menu_channellogos->addIntroItems(LOCALE_MISCSETTINGS_CHANNELLOGOS);
channellogoNotifier = new COnOffNotifier();
CMenuOptionChooser * mc;
CMenuForwarder * mf;
@@ -1229,9 +1236,15 @@ void COsdSetup::showOsdChannellogosSetup(CMenuWidget *menu_channellogos)
menu_channellogos->addItem(GenericMenuSeparatorLine);
// show channellogos
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, channellogoNotifier);
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO);
menu_channellogos->addItem(mc);
// show eventlogos
mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_EVENTLOGO, &g_settings.channellist_show_eventlogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this);
mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_EVENTLOGO);
menu_channellogos->addItem(mc);
channellogoNotifier->addItem(mc);
}
//infobar
@@ -1628,6 +1641,10 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
g_settings.show_ecm = 1;
}
else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CHANNELLIST_SHOW_EVENTLOGO))
{
LCD4l->ResetParseID();
}
else if ((ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_INFOCLOCK)) ||
(ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SIZE_HEIGHT)) ||
(ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SECONDS))) {