mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 08:21:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

- user_menue.cpp: whitespace cleanup

Browse Source
This commit is contained in:
svenhoefer
2014-03-06 12:56:24 +01:00
parent 7c19f53e4b
commit a05121d9b7
1 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/gui/user_menue.cpp
View File

@@ -108,14 +108,14 @@ bool CUserMenu::showUserMenu(int button)
int menu_prev = -1; int menu_prev = -1;
// define classes // define classes
CFavorites* tmpFavorites = NULL; CFavorites* tmpFavorites = NULL;
CAudioSelectMenuHandler* tmpAudioSelectMenuHandler = NULL; CAudioSelectMenuHandler* tmpAudioSelectMenuHandler = NULL;
CMenuWidget* tmpNVODSelector = NULL; CMenuWidget* tmpNVODSelector = NULL;
CSubChannelSelectMenu subchanselect; CSubChannelSelectMenu subchanselect;
CStreamInfo2 * streamInfo = NULL; CStreamInfo2 * streamInfo = NULL;
CEventListHandler* tmpEventListHandler = NULL; CEventListHandler* tmpEventListHandler = NULL;
CEPGplusHandler* tmpEPGplusHandler = NULL; CEPGplusHandler* tmpEPGplusHandler = NULL;
CEPGDataHandler* tmpEPGDataHandler = NULL; CEPGDataHandler* tmpEPGDataHandler = NULL;
CTimerList* Timerlist = NULL; CTimerList* Timerlist = NULL;
CRCLock *rcLock = NULL; CRCLock *rcLock = NULL;
CStreamFeaturesChangeExec *StreamFeaturesChanger = NULL; CStreamFeaturesChangeExec *StreamFeaturesChanger = NULL;
@@ -140,7 +140,7 @@ bool CUserMenu::showUserMenu(int button)
if ( txt.empty() ) if ( txt.empty() )
txt = g_Locale->getText(caption); txt = g_Locale->getText(caption);
CMenuWidget *menu = new CMenuWidget(txt.c_str() , user_menu[button].menu_icon_def, width); CMenuWidget *menu = new CMenuWidget(txt.c_str(), user_menu[button].menu_icon_def, width);
if (menu == NULL) if (menu == NULL)
return 0; return 0;
@@ -211,7 +211,7 @@ bool CUserMenu::showUserMenu(int button)
menu_prev = SNeutrinoSettings::ITEM_REMOTE; menu_prev = SNeutrinoSettings::ITEM_REMOTE;
keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_RC_LOCK]].key); //CRCInput::RC_nokey); keyhelper.get(&key,&icon,feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_RC_LOCK]].key); //CRCInput::RC_nokey);
rcLock = new CRCLock(); rcLock = new CRCLock();
menu_item = new CMenuForwarder(LOCALE_RCLOCK_MENUEADD, true, NULL, rcLock, "-1" , key, icon ); menu_item = new CMenuForwarder(LOCALE_RCLOCK_MENUEADD, true, NULL, rcLock, "-1", key, icon );
menu->addItem(menu_item, false); menu->addItem(menu_item, false);
break; break;
@@ -220,7 +220,7 @@ bool CUserMenu::showUserMenu(int button)
menu_prev = SNeutrinoSettings::ITEM_EPG_SUPER; menu_prev = SNeutrinoSettings::ITEM_EPG_SUPER;
tmpEPGplusHandler = new CEPGplusHandler(); tmpEPGplusHandler = new CEPGplusHandler();
keyhelper.get(&key,&icon,CRCInput::RC_green); keyhelper.get(&key,&icon,CRCInput::RC_green);
menu_item = new CMenuForwarder(LOCALE_EPGMENU_EPGPLUS , true, NULL, tmpEPGplusHandler , "-1", key, icon); menu_item = new CMenuForwarder(LOCALE_EPGMENU_EPGPLUS, true, NULL, tmpEPGplusHandler, "-1", key, icon);
menu->addItem(menu_item, false); menu->addItem(menu_item, false);
break; break;
@@ -229,7 +229,7 @@ bool CUserMenu::showUserMenu(int button)
menu_prev = SNeutrinoSettings::ITEM_EPG_LIST; menu_prev = SNeutrinoSettings::ITEM_EPG_LIST;
tmpEventListHandler = new CEventListHandler(); tmpEventListHandler = new CEventListHandler();
keyhelper.get(&key,&icon,CRCInput::RC_red); keyhelper.get(&key,&icon,CRCInput::RC_red);
menu_item = new CMenuForwarder(LOCALE_EPGMENU_EVENTLIST , true, NULL, tmpEventListHandler, "-1", key, icon); menu_item = new CMenuForwarder(LOCALE_EPGMENU_EVENTLIST, true, NULL, tmpEventListHandler, "-1", key, icon);
menu->addItem(menu_item, false); menu->addItem(menu_item, false);
break; break;
@@ -238,7 +238,7 @@ bool CUserMenu::showUserMenu(int button)
menu_prev = SNeutrinoSettings::ITEM_EPG_INFO; menu_prev = SNeutrinoSettings::ITEM_EPG_INFO;
tmpEPGDataHandler = new CEPGDataHandler(); tmpEPGDataHandler = new CEPGDataHandler();
keyhelper.get(&key,&icon,CRCInput::RC_yellow); keyhelper.get(&key,&icon,CRCInput::RC_yellow);
menu_item = new CMenuForwarder(LOCALE_EPGMENU_EVENTINFO , true, NULL, tmpEPGDataHandler , "-1", key, icon); menu_item = new CMenuForwarder(LOCALE_EPGMENU_EVENTINFO, true, NULL, tmpEPGDataHandler, "-1", key, icon);
menu->addItem(menu_item, false); menu->addItem(menu_item, false);
break; break;
@@ -248,7 +248,7 @@ bool CUserMenu::showUserMenu(int button)
dummy = g_Sectionsd->getIsScanningActive(); dummy = g_Sectionsd->getIsScanningActive();
//dummy = sectionsd_scanning; //dummy = sectionsd_scanning;
keyhelper.get(&key,&icon); keyhelper.get(&key,&icon);
menu_item = new CMenuOptionChooser(LOCALE_MAINMENU_PAUSESECTIONSD, &dummy, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this , key, icon ); menu_item = new CMenuOptionChooser(LOCALE_MAINMENU_PAUSESECTIONSD, &dummy, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, this, key, icon );
menu->addItem(menu_item, false); menu->addItem(menu_item, false);
menu_items++; menu_items++;
keyhelper.get(&key,&icon); keyhelper.get(&key,&icon);
@@ -349,7 +349,7 @@ bool CUserMenu::showUserMenu(int button)
menu_prev = SNeutrinoSettings::ITEM_PLUGIN_TYPES; menu_prev = SNeutrinoSettings::ITEM_PLUGIN_TYPES;
neutrino_msg_t d_key = g_PluginList->getKey(count); neutrino_msg_t d_key = g_PluginList->getKey(count);
//printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_PluginList->getKey(count)); //printf("[neutrino usermenu] plugin %d, set key %d...\n", count, g_PluginList->getKey(count));
StreamFeaturesChanger = new CStreamFeaturesChangeExec(); StreamFeaturesChanger = new CStreamFeaturesChangeExec();
keyhelper.get(&key,&icon, d_key); keyhelper.get(&key,&icon, d_key);
menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, StreamFeaturesChanger, id, key, icon); menu_item = new CMenuForwarder(g_PluginList->getName(count), true, NULL, StreamFeaturesChanger, id, key, icon);
menu->addItem(menu_item, 0); menu->addItem(menu_item, 0);
@@ -363,7 +363,7 @@ bool CUserMenu::showUserMenu(int button)
menu_items++; menu_items++;
menu_prev = SNeutrinoSettings::ITEM_VTXT; menu_prev = SNeutrinoSettings::ITEM_VTXT;
keyhelper.get(&key,&icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_VTXT]].key); //CRCInput::RC_blue keyhelper.get(&key,&icon, feat_key[g_settings.personalize[SNeutrinoSettings::P_FEAT_KEY_VTXT]].key); //CRCInput::RC_blue
StreamFeaturesChanger = new CStreamFeaturesChangeExec(); StreamFeaturesChanger = new CStreamFeaturesChangeExec();
menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, StreamFeaturesChanger, "teletext", key, icon); menu_item = new CMenuForwarder(LOCALE_USERMENU_ITEM_VTXT, true, NULL, StreamFeaturesChanger, "teletext", key, icon);
menu->addItem(menu_item, 0); menu->addItem(menu_item, 0);
break; break;
@@ -372,7 +372,7 @@ bool CUserMenu::showUserMenu(int button)
menu_prev = SNeutrinoSettings::ITEM_IMAGEINFO; menu_prev = SNeutrinoSettings::ITEM_IMAGEINFO;
imageinfo = new CImageInfo(); imageinfo = new CImageInfo();
keyhelper.get(&key,&icon); keyhelper.get(&key,&icon);
menu->addItem(new CMenuForwarder(LOCALE_SERVICEMENU_IMAGEINFO, true, NULL, imageinfo, NULL, key, icon ), false); menu->addItem(new CMenuForwarder(LOCALE_SERVICEMENU_IMAGEINFO, true, NULL, imageinfo, NULL, key, icon ), false);
break; break;
case SNeutrinoSettings::ITEM_BOXINFO: case SNeutrinoSettings::ITEM_BOXINFO:
menu_items++; menu_items++;
@@ -449,23 +449,23 @@ bool CUserMenu::showUserMenu(int button)
user_menu[button].selected = menu->getSelected(); user_menu[button].selected = menu->getSelected();
// clear the heap // clear the heap
if (tmpFavorites) delete tmpFavorites; if (tmpFavorites) delete tmpFavorites;
if (tmpAudioSelectMenuHandler) delete tmpAudioSelectMenuHandler; if (tmpAudioSelectMenuHandler) delete tmpAudioSelectMenuHandler;
if (tmpNVODSelector) delete tmpNVODSelector; if (tmpNVODSelector) delete tmpNVODSelector;
if (streamInfo) delete streamInfo; if (streamInfo) delete streamInfo;
if (tmpEventListHandler) delete tmpEventListHandler; if (tmpEventListHandler) delete tmpEventListHandler;
if (tmpEPGplusHandler) delete tmpEPGplusHandler; if (tmpEPGplusHandler) delete tmpEPGplusHandler;
if (tmpEPGDataHandler) delete tmpEPGDataHandler; if (tmpEPGDataHandler) delete tmpEPGDataHandler;
if (Timerlist) delete Timerlist; if (Timerlist) delete Timerlist;
if (rcLock) delete rcLock; if (rcLock) delete rcLock;
if (StreamFeaturesChanger) delete StreamFeaturesChanger; if (StreamFeaturesChanger) delete StreamFeaturesChanger;
if (imageinfo) delete imageinfo; if (imageinfo) delete imageinfo;
if (boxinfo) delete boxinfo; if (boxinfo) delete boxinfo;
if (games) delete games; if (games) delete games;
if (tools) delete tools; if (tools) delete tools;
if (scripts) delete scripts; if (scripts) delete scripts;
if (lua) delete lua; if (lua) delete lua;
if (menu) delete menu; if (menu) delete menu;
InfoClock->enableInfoClock(true); InfoClock->enableInfoClock(true);