- miscsettings-menu: formatting code using astyle

Conflicts:
	src/gui/miscsettings_menu.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 f489052af5
commit 45cf7e0698
2 changed files with 122 additions and 116 deletions

View File

@@ -513,9 +513,7 @@ void CMiscMenue::showMiscSettingsMenuEpg(CMenuWidget *ms_epg)
CMenuForwarder *mf3 = new CMenuDForwarder(LOCALE_MISCSETTINGS_EPG_MAX_EVENTS, true, epg_max_events, miscSettings_epg_max_events);
mf3->setHint("", LOCALE_MENU_HINT_EPG_MAX_EVENTS);
epg_scan = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SCAN_BOUQUETS, &g_settings.epg_scan, EPG_SCAN_OPTIONS, EPG_SCAN_OPTION_COUNT,
true);
//(g_settings.epg_scan_mode != CEpgScan::MODE_OFF && g_settings.epg_save_mode == 0);
epg_scan = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SCAN_BOUQUETS, &g_settings.epg_scan, EPG_SCAN_OPTIONS, EPG_SCAN_OPTION_COUNT, true);
epg_scan->setHint("", LOCALE_MENU_HINT_EPG_SCAN);
CMenuOptionChooser *mc3 = new CMenuOptionChooser(LOCALE_MISCSETTINGS_EPG_SCAN, &g_settings.epg_scan_mode, EPG_SCAN_MODE_OPTIONS,
@@ -756,10 +754,13 @@ int CMiscMenue::showMiscSettingsSelectWeatherLocation()
int location_option_count = 0;
const struct weather_loc *location = NULL;
if (g_settings.weather_country == DEUTSCHLAND) {
if (g_settings.weather_country == DEUTSCHLAND)
{
location_option_count = WEATHER_DEUTSCHLAND_LOCATION_OPTION_COUNT;
location = WEATHER_DEUTSCHLAND_LOCATION_OPTIONS;
} else if (g_settings.weather_country == NORWAY) {
}
else if (g_settings.weather_country == NORWAY)
{
location_option_count = WEATHER_NORWAY_LOCATION_OPTION_COUNT;
location = WEATHER_NORWAY_LOCATION_OPTIONS;
}
@@ -811,7 +812,8 @@ bool CMiscMenue::changeNotify(const neutrino_locale_t OptionName, void * /*data*
printf("[neutrino CEC Settings] %s set CEC settings...\n", __FUNCTION__);
g_settings.hdmi_cec_standby = 0;
g_settings.hdmi_cec_view_on = 0;
if (g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF) {
if (g_settings.hdmi_cec_mode != VIDEO_HDMI_CEC_MODE_OFF)
{
g_settings.hdmi_cec_standby = 1;
g_settings.hdmi_cec_view_on = 1;
g_settings.hdmi_cec_mode = VIDEO_HDMI_CEC_MODE_TUNER;

View File

@@ -36,10 +36,12 @@
class CMiscMenue : public CMenuTarget, CChangeObserver
{
private:
enum {
enum
{
DEUTSCHLAND = 0,
NORWAY = 1,
};
CFanControlNotifier *fanNotifier;
CCpuFreqNotifier *cpuNotifier;
CSectionsdConfigNotifier *sectionsdConfigNotifier;
@@ -57,7 +59,9 @@ class CMiscMenue : public CMenuTarget, CChangeObserver
CMenuOptionChooser *shoutcast_onoff;
CMenuForwarder *epg_dir;
CMenuForwarder *epg_read_now;
int width;
std::string epg_cache;
std::string epg_extendedcache;
std::string epg_old_events;