subchannel-select: formatting code using astyle; some manual code nicenings

Origin commit data
------------------
Commit: 36dea14ea0
Author: vanhofen <vanhofen@gmx.de>
Date: 2021-12-04 (Sat, 04 Dec 2021)

Origin message was:
------------------
- subchannel-select: formatting code using astyle; some manual code nicenings
This commit is contained in:
vanhofen
2021-12-04 23:22:35 +01:00
parent e4f10f570d
commit c4eba4cff4
2 changed files with 38 additions and 50 deletions

View File

@@ -33,7 +33,6 @@
#include <config.h> #include <config.h>
#endif #endif
#include <global.h> #include <global.h>
#include <neutrino.h> #include <neutrino.h>
#include <mymenu.h> #include <mymenu.h>
@@ -45,12 +44,10 @@ extern CRemoteControl * g_RemoteControl;
CSubChannelSelectMenu::CSubChannelSelectMenu() CSubChannelSelectMenu::CSubChannelSelectMenu()
{ {
} }
CSubChannelSelectMenu::~CSubChannelSelectMenu() CSubChannelSelectMenu::~CSubChannelSelectMenu()
{ {
} }
int CSubChannelSelectMenu::getNVODMenu(CMenuWidget *menu) int CSubChannelSelectMenu::getNVODMenu(CMenuWidget *menu)
@@ -112,14 +109,11 @@ int CSubChannelSelectMenu::getNVODMenu(CMenuWidget* menu)
break; break;
} }
if ( g_RemoteControl->are_subchannels ) { if (g_RemoteControl->are_subchannels)
{
menu->addItem(GenericMenuSeparatorLine); menu->addItem(GenericMenuSeparatorLine);
CMenuOptionChooser *oj = new CMenuOptionChooser(LOCALE_NVODSELECTOR_DIRECTORMODE, &g_RemoteControl->director_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW); CMenuOptionChooser *oj = new CMenuOptionChooser(LOCALE_NVODSELECTOR_DIRECTORMODE, &g_RemoteControl->director_mode, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true, NULL, CRCInput::RC_yellow, NEUTRINO_ICON_BUTTON_YELLOW);
menu->addItem(oj); menu->addItem(oj);
} }
return true; return true;
} }

View File

@@ -29,15 +29,11 @@
Otherwise ask the copyright owners, anything else would be theft! Otherwise ask the copyright owners, anything else would be theft!
*/ */
#ifndef __subchannel_selector__ #ifndef __subchannel_selector__
#define __subchannel_selector__ #define __subchannel_selector__
#include "widget/menue.h" #include "widget/menue.h"
class CSubChannelSelectMenu class CSubChannelSelectMenu
{ {
private: private:
@@ -48,9 +44,7 @@ class CSubChannelSelectMenu
~CSubChannelSelectMenu(); ~CSubChannelSelectMenu();
int getNVODMenu(CMenuWidget *menu); int getNVODMenu(CMenuWidget *menu);
}; };
#endif #endif