- mediaplayer-setup: formatting code using astyle

Conflicts:
	src/gui/mediaplayer_setup.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-10-20 19:31:13 +02:00
committed by Thilo Graf
parent 24897213a0
commit c45b8cd274
2 changed files with 13 additions and 12 deletions

View File

@@ -63,24 +63,23 @@ CMediaPlayerSetup::~CMediaPlayerSetup()
{ {
} }
int CMediaPlayerSetup::exec(CMenuTarget* parent, const std::string & /*actionKey*/) int CMediaPlayerSetup::exec(CMenuTarget *parent, const std::string & /*actionKey*/)
{ {
dprintf(DEBUG_DEBUG, "init mediaplayer setup menu\n"); dprintf(DEBUG_DEBUG, "init mediaplayer setup menu\n");
int res = menu_return::RETURN_REPAINT; int res = menu_return::RETURN_REPAINT;
if (parent) if (parent)
parent->hide(); parent->hide();
res = showMediaPlayerSetup(); res = showMediaPlayerSetup();
return res; return res;
} }
/*shows media setup menue entries*/ // shows media setup menue entries
int CMediaPlayerSetup::showMediaPlayerSetup() int CMediaPlayerSetup::showMediaPlayerSetup()
{ {
CMenuWidget* mediaSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width); CMenuWidget *mediaSetup = new CMenuWidget(LOCALE_MAINMENU_SETTINGS, NEUTRINO_ICON_SETTINGS, width);
mediaSetup->setSelected(selected); mediaSetup->setSelected(selected);
// intros // intros
@@ -133,8 +132,12 @@ int CMediaPlayerSetup::showMediaPlayerSetup()
mc = new CMenuOptionChooser(LOCALE_MOVIEPLAYER_DISPLAY_PLAYTIME, &g_settings.movieplayer_display_playtime, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_info.hw_caps->display_xres >= 8); mc = new CMenuOptionChooser(LOCALE_MOVIEPLAYER_DISPLAY_PLAYTIME, &g_settings.movieplayer_display_playtime, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, g_info.hw_caps->display_xres >= 8);
mc->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_DISPLAY_PLAYTIME); mc->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_DISPLAY_PLAYTIME);
mediaSetup->addItem(mc); mediaSetup->addItem(mc);
#if 0
int res = mediaSetup->exec (NULL, ""); mc = new CMenuOptionChooser(LOCALE_MOVIEPLAYER_TIMEOSD_WHILE_SEARCHING, &g_settings.movieplayer_timeosd_while_searching, OPTIONS_OFF0_ON1_OPTIONS, OPTIONS_OFF0_ON1_OPTION_COUNT, true);
mc->setHint("", LOCALE_MENU_HINT_MOVIEPLAYER_TIMEOSD_WHILE_SEARCHING);
mediaSetup->addItem(mc);
#endif
int res = mediaSetup->exec(NULL, "");
selected = mediaSetup->getSelected(); selected = mediaSetup->getSelected();
delete mediaSetup; delete mediaSetup;
return res; return res;

View File

@@ -44,12 +44,10 @@ class CMediaPlayerSetup : public CMenuTarget
int showMediaPlayerSetup(); int showMediaPlayerSetup();
public:
public:
CMediaPlayerSetup(); CMediaPlayerSetup();
~CMediaPlayerSetup(); ~CMediaPlayerSetup();
int exec(CMenuTarget* parent, const std::string & actionKey); int exec(CMenuTarget *parent, const std::string &actionKey);
}; };
#endif #endif