From b83c9e4c45635df0cd76871f07481e3358b7a367 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 1 Jan 2019 22:21:11 +0100 Subject: [PATCH] osd-setup: cleanup from commented code Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/c82c50f324060d8347861dcf3418069e7172b620 Author: vanhofen Date: 2019-01-01 (Tue, 01 Jan 2019) Origin message was: ------------------ - osd-setup: cleanup from commented code ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/osd_setup.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp index 2a09d2973..57f537a7c 100644 --- a/src/gui/osd_setup.cpp +++ b/src/gui/osd_setup.cpp @@ -1256,7 +1256,6 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) sigc::slot0 slot_ibar = sigc::mem_fun(g_InfoViewer, &CInfoViewer::ResetModules); CMenuOptionChooser * mc; - //NI CMenuForwarder * mf; // show on epg change mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SHOW, &g_settings.infobar_show, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); @@ -1286,14 +1285,6 @@ void COsdSetup::showOsdInfobarSetup(CMenuWidget *menu_infobar) mc->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO); menu_infobar->addItem(mc); -//NI -#if 0 - // logo directory - mf = new CMenuForwarder(LOCALE_MISCSETTINGS_INFOBAR_LOGO_HDD_DIR, true, g_settings.logo_hdd_dir, this, "logo_dir"); - mf->setHint("", LOCALE_MENU_HINT_INFOBAR_LOGO_DIR); - menu_infobar->addItem(mf); -#endif - // satellite/cable provider mc = new CMenuOptionChooser(LOCALE_MISCSETTINGS_INFOBAR_SAT_DISPLAY, &g_settings.infobar_sat_display, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc->OnAfterChangeOption.connect(slot_ibar); @@ -1414,14 +1405,6 @@ void COsdSetup::showOsdChanlistSetup(CMenuWidget *menu_chanlist) menu_chanlist->addItem(mc); channellistNotifier->addItem(mc); -//NI -#if 0 - //show channel logo - mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELLOGO, &g_settings.channellist_show_channellogo, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); - mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELLOGO); - menu_chanlist->addItem(mc); -#endif - //show numbers mc = new CMenuOptionChooser(LOCALE_CHANNELLIST_SHOW_CHANNELNUMBER, &g_settings.channellist_show_numbers, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true); mc->setHint("", LOCALE_MENU_HINT_CHANNELLIST_SHOW_CHANNELNUMBER);