pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed #628: Removed obsolete "Hide idle led" option

Browse source
This commit is contained in:
Dimitris Panokostas 2020-05-03 12:51:40 +02:00
parent 1de27dec69
commit d870c6cea4
4 changed files with 2 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/include/options.h
View file

@ -821,7 +821,6 @@ struct uae_prefs {
int gfx_correct_aspect;
int scaling_method;
int hide_idle_led;
TCHAR open_gui[256];
TCHAR quit_amiberry[256];

3
src/osdep/amiberry.cpp
View file

@ -506,7 +506,6 @@ void target_default_options(struct uae_prefs* p, int type)
void target_save_options(struct zfile* f, struct uae_prefs* p)
{
cfgfile_write(f, "amiberry.hide_idle_led", "%d", p->hide_idle_led);
cfgfile_write(f, _T("amiberry.gfx_correct_aspect"), _T("%d"), p->gfx_correct_aspect);
cfgfile_write(f, _T("amiberry.kbd_led_num"), _T("%d"), p->kbd_led_num);
cfgfile_write(f, _T("amiberry.kbd_led_scr"), _T("%d"), p->kbd_led_scr);
@ -617,8 +616,6 @@ int target_parse_option(struct uae_prefs* p, const char* option, const char* val
return 1;
if (cfgfile_intval(option, value, "kbd_led_scr", &p->kbd_led_scr, 1))
return 1;
if (cfgfile_intval(option, value, "hide_idle_led", &p->hide_idle_led, 1))
return 1;
if (cfgfile_intval(option, value, "gfx_correct_aspect", &p->gfx_correct_aspect, 1))
return 1;
if (cfgfile_intval(option, value, "scaling_method", &p->scaling_method, 1))

4
src/osdep/amiberry_gfx.cpp
View file

@ -778,11 +778,9 @@ int check_prefs_changed_gfx()
return 1;
}
if (currprefs.leds_on_screen != changed_prefs.leds_on_screen ||
currprefs.hide_idle_led != changed_prefs.hide_idle_led)
if (currprefs.leds_on_screen != changed_prefs.leds_on_screen)
{
currprefs.leds_on_screen = changed_prefs.leds_on_screen;
currprefs.hide_idle_led = changed_prefs.hide_idle_led;
changed = 1;
}
if (currprefs.chipset_refreshrate != changed_prefs.chipset_refreshrate)

14
src/osdep/gui/PanelMisc.cpp
View file

@ -18,7 +18,6 @@ static gcn::UaeCheckBox* chkRetroArchReset;
//static gcn::UaeCheckBox* chkRetroArchSaveState;
static gcn::UaeCheckBox* chkStatusLine;
static gcn::UaeCheckBox* chkHideIdleLed;
static gcn::UaeCheckBox* chkShowGUI;
static gcn::UaeCheckBox* chkBSDSocket;
@ -79,9 +78,6 @@ public:
if (actionEvent.getSource() == chkStatusLine)
changed_prefs.leds_on_screen = chkStatusLine->isSelected();
else if (actionEvent.getSource() == chkHideIdleLed)
changed_prefs.hide_idle_led = chkHideIdleLed->isSelected();
else if (actionEvent.getSource() == chkShowGUI)
changed_prefs.start_gui = chkShowGUI->isSelected();
@ -175,10 +171,6 @@ void InitPanelMisc(const struct _ConfigCategory& category)
chkStatusLine->setId("StatusLine");
chkStatusLine->addActionListener(miscActionListener);
chkHideIdleLed = new gcn::UaeCheckBox("Hide idle led");
chkHideIdleLed->setId("HideIdle");
chkHideIdleLed->addActionListener(miscActionListener);
chkShowGUI = new gcn::UaeCheckBox("Show GUI on startup");
chkShowGUI->setId("ShowGUI");
chkShowGUI->addActionListener(miscActionListener);
@ -274,8 +266,6 @@ void InitPanelMisc(const struct _ConfigCategory& category)
auto posY = DISTANCE_BORDER;
category.panel->add(chkStatusLine, DISTANCE_BORDER, posY);
posY += chkStatusLine->getHeight() + DISTANCE_NEXT_Y;
category.panel->add(chkHideIdleLed, DISTANCE_BORDER, posY);
posY += chkHideIdleLed->getHeight() + DISTANCE_NEXT_Y;
category.panel->add(chkShowGUI, DISTANCE_BORDER, posY);
posY += chkShowGUI->getHeight() + DISTANCE_NEXT_Y;
@ -290,7 +280,7 @@ void InitPanelMisc(const struct _ConfigCategory& category)
//category.panel->add(chkRetroArchSavestate, posX + DISTANCE_BORDER, posY);
category.panel->add(chkBSDSocket, DISTANCE_BORDER, posY);
posY += chkBSDSocket->getHeight() + DISTANCE_NEXT_Y * 2;
posY += chkBSDSocket->getHeight() + DISTANCE_NEXT_Y;
category.panel->add(chkMasterWP, DISTANCE_BORDER, posY);
posY += chkMasterWP->getHeight() + DISTANCE_NEXT_Y * 2;
@ -328,7 +318,6 @@ void InitPanelMisc(const struct _ConfigCategory& category)
void ExitPanelMisc()
{
delete chkStatusLine;
delete chkHideIdleLed;
delete chkShowGUI;
delete chkRetroArchQuit;
@ -366,7 +355,6 @@ void ExitPanelMisc()
void RefreshPanelMisc()
{
chkStatusLine->setSelected(changed_prefs.leds_on_screen);
chkHideIdleLed->setSelected(changed_prefs.hide_idle_led);
chkShowGUI->setSelected(changed_prefs.start_gui);
chkRetroArchQuit->setSelected(changed_prefs.use_retroarch_quit);