Skip to content

Commit

Permalink
(*) Aaaand after a half-assed busted GUI staring me dead in the face …
Browse files Browse the repository at this point in the history
…for over

    week, the new "GSM Settings" on Main Menu item and "Reveal GSM On Main Menu"
    toggle in "Settings" is LIVE! (and boy am I'm tired of looking at it! ;)
    Once enabled, press Start twice on Main Menu to refresh the GUI ...
(*) Repository frozen; ready for merge into Ifcaro ...
  • Loading branch information
BatRastard committed Oct 11, 2013
1 parent 76623a4 commit 36a96f5
Show file tree
Hide file tree
Showing 10 changed files with 100 additions and 67 deletions.
30 changes: 16 additions & 14 deletions include/dialogs.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,21 +45,22 @@
#define UICFG_VSYNC 22
#define UICFG_INFOPAGE 23

#define UICFG_GSM 24
#define UICFG_GSMVMODE 25
#define UICFG_GSMXOFFSET 26
#define UICFG_GSMYOFFSET 27
#define UICFG_GSMSKIPVIDEOS 28
#define GSCFG_GSM 24
#define GSCFG_GSMVMODE 25
#define GSCFG_GSMXOFFSET 26
#define GSCFG_GSMYOFFSET 27
#define GSCFG_GSMSKIPVIDEOS 28

#define CFG_EXITTO 30
#define CFG_DEFDEVICE 31
#define CFG_DEBUG 32
#define CFG_USBMODE 33
#define CFG_HDDMODE 34
#define CFG_ETHMODE 35
#define CFG_APPMODE 36
#define CFG_CHECKUSBFRAG 37
#define CFG_LASTPLAYED 38
#define CFG_EXITTO 29
#define CFG_DEFDEVICE 30
#define CFG_DEBUG 31
#define CFG_USBMODE 32
#define CFG_HDDMODE 33
#define CFG_ETHMODE 34
#define CFG_APPMODE 35
#define CFG_CHECKUSBFRAG 36
#define CFG_LASTPLAYED 37
#define CFG_SHOWGSM 38
#define CFG_DANDROP 39
#define CFG_USBDELAY 40
#define CFG_USBPREFIX 41
Expand All @@ -73,6 +74,7 @@
extern struct UIItem diaIPConfig[];
extern struct UIItem diaCompatConfig[];
extern struct UIItem diaUIConfig[];
extern struct UIItem diaGSConfig[];
extern struct UIItem diaConfig[];
extern struct UIItem diaAbout[];
#ifdef VMC
Expand Down
1 change: 1 addition & 0 deletions include/gui.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ int guiDrawIconAndText(int iconId, int textId, int font, int x, int y, u64 color
void guiShowAbout();
void guiShowConfig();
void guiShowUIConfig();
void guiShowGSConfig();
void guiShowIPConfig();

/** Renders the given string on screen for the given function until it's io finishes
Expand Down
2 changes: 2 additions & 0 deletions include/lang.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ enum _STR_IDS{
_STR_DANDROP,
_STR_CHECKUSBFRAG,
_STR_LASTPLAYED,
_STR_SHOWGSM,
_STR_ERR_FRAGMENTED,
_STR_ERR_FILE_INVALID,
_STR_TEST,
Expand Down Expand Up @@ -150,6 +151,7 @@ enum _STR_IDS{
_STR_ETH_100MHDX,
_STR_ETH_10MFDX,
_STR_ETH_10MHDX,
_STR_GSM_SETTINGS,
_STR_GSM,
_STR_HINT_GSM,
_STR_GSMVMODE,
Expand Down
4 changes: 3 additions & 1 deletion include/usbld.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ typedef struct predef_vmode_struct {
u64 syncv;
} predef_vmode_struct;

int gGSM; // 0 - Off, 1 - On
int gGSM; // Enables GSM - 0 for Off, 1 for On
int gGSMVMode; // See the related predef_vmode
int gGSMXOffset; // 0 - Off, Any other positive or negative value - Relative position for X Offset
int gGSMYOffset; // 0 - Off, Any other positive or negative value - Relative position for Y Offset
Expand All @@ -147,6 +147,8 @@ char gETHPrefix[32];

int gRememberLastPlayed;

int gShowGSM; // Toggle to reveal "GSM Settings" on Main Menu

char *infotxt;

unsigned char gDefaultBgColor[3];
Expand Down
13 changes: 12 additions & 1 deletion lng/lang_English.lng
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ Display settings
Enable Delete and Rename actions
Check USB game fragmentation
Remember last played game
Reveal GSM on Main Menu
Error, the game is fragmented
Error, could not run the item
Test
Expand Down Expand Up @@ -170,4 +171,14 @@ Mode 8
Mode 9
Callback timer
Apply a delay to CDVD functions (0 is default)
Ethernet speed and duplex settings
Ethernet speed and duplex settings
GSM Settings
Force a video mode
Video mode
Video mode to be forced
Horizontal Adjust
Sets Horizontal Offset
Vertical Adjust
Sets Vertical Offset
FMV skip
Skips Full Motion Videos
46 changes: 25 additions & 21 deletions src/dialogs.c
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,8 @@ struct UIItem diaConfig[] = {
{UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_DEBUG}}}, {UI_SPACER}, {UI_BOOL, CFG_DEBUG, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK},
{UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_EXITTO}}}, {UI_SPACER}, {UI_STRING, CFG_EXITTO, 1, _STR_HINT_EXITPATH, 0, 0, {.stringvalue = {"", "", NULL}}}, {UI_BREAK},
{UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_DANDROP}}}, {UI_SPACER}, {UI_BOOL, CFG_DANDROP, 1, -1, 0, 0, {.intvalue = {0, 0}}}, {UI_BREAK},
{UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_LASTPLAYED}}}, {UI_SPACER}, {UI_BOOL, CFG_LASTPLAYED, 1, -1, 0, 0, {.intvalue = {0, 0}}},
{UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_LASTPLAYED}}}, {UI_SPACER}, {UI_BOOL, CFG_LASTPLAYED, 1, -1, 0, 0, {.intvalue = {0, 0}}},{UI_BREAK},
{UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_SHOWGSM}}}, {UI_SPACER}, {UI_BOOL, CFG_SHOWGSM, 1, -1, 0, 0, {.intvalue = {0, 0}}},{UI_BREAK},

{UI_SPLITTER},

Expand Down Expand Up @@ -201,16 +202,25 @@ struct UIItem diaUIConfig[] = {
{UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_WIDE_SCREEN}}}, {UI_SPACER}, {UI_BOOL, UICFG_WIDESCREEN, 1, -1, 0, 0, {.intvalue = {0, 0}}},
{UI_BREAK},

// GSM Section
{UI_SPLITTER},

{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_GSM}}}, {UI_SPACER}, {UI_BOOL, UICFG_GSM, 1, _STR_HINT_GSM, 0, 0, {.intvalue = {1, 1}}},
{UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_GSMVMODE}}}, {UI_SPACER}, {UI_ENUM, UICFG_GSMVMODE, 1, _STR_HINT_GSMVMODE, 0, 0, {.intvalue = {0, 0}}},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_GSMSKIPVIDEOS}}}, {UI_SPACER}, {UI_BOOL, UICFG_GSMSKIPVIDEOS, 1, _STR_HINT_GSMSKIPVIDEOS, 0, 0, {.intvalue = {1, 1}}},
{UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_XOFFSET}}}, {UI_SPACER}, {UI_INT, UICFG_GSMXOFFSET, 1, _STR_HINT_XOFFSET, -5, 0, {.intvalue = {0, 0, -100, 100}}},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_YOFFSET}}}, {UI_SPACER}, {UI_INT, UICFG_GSMYOFFSET, 1, _STR_HINT_YOFFSET, -5, 0, {.intvalue = {0, 0, -100, 100}}},
{UI_OK, 0, 1, -1, 0, 0, {.label = {NULL, _STR_OK}}},

// end of dialog
{UI_TERMINATOR}
};

// GSM Menu
struct UIItem diaGSConfig[] = {
{UI_LABEL, 0, 1, -1, 0, 0, {.label = {NULL, _STR_GSM_SETTINGS}}},

{UI_SPLITTER},

{UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_GSM}}}, {UI_SPACER}, {UI_BOOL, GSCFG_GSM, 1, _STR_HINT_GSM, 0, 0, {.intvalue = {1, 1}}},{UI_BREAK},
{UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_GSMVMODE}}}, {UI_SPACER}, {UI_ENUM, GSCFG_GSMVMODE, 1, _STR_HINT_GSMVMODE, 0, 0, {.intvalue = {0, 0}}},{UI_BREAK},
{UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_GSMSKIPVIDEOS}}}, {UI_SPACER}, {UI_BOOL, GSCFG_GSMSKIPVIDEOS, 1, _STR_HINT_GSMSKIPVIDEOS, 0, 0, {.intvalue = {1, 1}}},{UI_BREAK},
{UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_XOFFSET}}}, {UI_SPACER}, {UI_INT, GSCFG_GSMXOFFSET, 1, _STR_HINT_XOFFSET, -5, 0, {.intvalue = {0, 0, -100, 100}}},{UI_BREAK},
{UI_LABEL, 0, 1, -1, -45, 0, {.label = {NULL, _STR_YOFFSET}}}, {UI_SPACER}, {UI_INT, GSCFG_GSMYOFFSET, 1, _STR_HINT_YOFFSET, -5, 0, {.intvalue = {0, 0, -100, 100}}},{UI_BREAK},
{UI_SPLITTER},

{UI_OK, 0, 1, -1, 0, 0, {.label = {NULL, _STR_OK}}},
Expand All @@ -228,18 +238,12 @@ struct UIItem diaAbout[] = {

{UI_BREAK},

{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"crazyc", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"dlanor", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"doctorxyz", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"hominem.te.esse", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"ifcaro", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"izdubar", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"jimmikaelkael", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"Polo35", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"reprep", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"SP193", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"volca", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"BatRastard", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"crazyc - dlanor - SP193", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"doctorxyz - hominem.te.esse", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"ifcaro - Polo35 - reprep", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"izdubar - jimmikaelkael", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"volca - BatRastard", -1}}}, {UI_BREAK},
{UI_SPACER}, {UI_LABEL, 0, 1, -1, 0, 15, {.label = {"...and the anonymous ...", -1}}}, {UI_BREAK},
{UI_SPLITTER},

{UI_OK, 0, 1, -1, 0, 0, {.label = {NULL, _STR_OK}}},
Expand Down
51 changes: 26 additions & 25 deletions src/gui.c
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,7 @@ void guiShowConfig() {
diaSetString(diaConfig, CFG_USBPREFIX, gUSBPrefix);
diaSetString(diaConfig, CFG_ETHPREFIX, gETHPrefix);
diaSetInt(diaConfig, CFG_LASTPLAYED, gRememberLastPlayed);
diaSetInt(diaConfig, CFG_SHOWGSM, gShowGSM);
diaSetInt(diaConfig, CFG_DEFDEVICE, gDefaultDevice);
diaSetInt(diaConfig, CFG_USBMODE, gUSBStartMode);
diaSetInt(diaConfig, CFG_HDDMODE, gHDDStartMode);
Expand All @@ -243,6 +244,7 @@ void guiShowConfig() {
diaGetString(diaConfig, CFG_USBPREFIX, gUSBPrefix);
diaGetString(diaConfig, CFG_ETHPREFIX, gETHPrefix);
diaGetInt(diaConfig, CFG_LASTPLAYED, &gRememberLastPlayed);
diaGetInt(diaConfig, CFG_SHOWGSM, &gShowGSM);
diaGetInt(diaConfig, CFG_DEFDEVICE, &gDefaultDevice);
diaGetInt(diaConfig, CFG_USBMODE, &gUSBStartMode);
diaGetInt(diaConfig, CFG_HDDMODE, &gHDDStartMode);
Expand Down Expand Up @@ -303,23 +305,11 @@ void guiShowUIConfig() {
// configure the enumerations
const char* scrollSpeeds[] = { _l(_STR_SLOW), _l(_STR_MEDIUM), _l(_STR_FAST), NULL };
const char* vmodeNames[] = { _l(_STR_AUTO), "PAL", "NTSC", "HDTV 480p @60Hz", "HDTV 576p @50Hz", "VGA 640x480p @60Hz", NULL };
const char* gsmvmodeNames[] = \
{"NTSC","NTSC Non Interlaced", \
"PAL","PAL Non Interlaced","PAL @60Hz","PAL @60Hz Non Interlaced", \
"PS1 NTSC (HDTV 480p @60Hz)","PS1 PAL (HDTV 576p @50Hz)", \
"HDTV 480p @60Hz","HDTV 576p @50Hz","HDTV 720p @60Hz","HDTV 1080i @60Hz","HDTV 1080i @60Hz Non Interlaced", "HDTV 1080p @60Hz", \
"VGA 640x480p @60Hz","VGA 640x960i @60Hz","VGA 640x480p @72Hz","VGA 640x480p @75Hz","VGA 640x480p @85Hz", \
"VGA 800x600p @56Hz","VGA 800x600p @60Hz","VGA 800x600p @72Hz","VGA 800x600p @75Hz","VGA 800x600p @85Hz", \
"VGA 1024x768p @60Hz","VGA 1024x768p @70Hz","VGA 1024x768p @75Hz","VGA 1024x768p @85Hz", \
"VGA 1280x1024p @60Hz","VGA 1280x1024p @75Hz", \
NULL };


diaSetEnum(diaUIConfig, UICFG_SCROLL, scrollSpeeds);
diaSetEnum(diaUIConfig, UICFG_THEME, (const char **) thmGetGuiList());
diaSetEnum(diaUIConfig, UICFG_LANG, (const char **) lngGetGuiList());
diaSetEnum(diaUIConfig, UICFG_VMODE, vmodeNames);
diaSetEnum(diaUIConfig, UICFG_GSMVMODE, gsmvmodeNames);

diaSetInt(diaUIConfig, UICFG_SCROLL, gScrollSpeed);
diaSetInt(diaUIConfig, UICFG_THEME, thmGetGuiValue());
diaSetInt(diaUIConfig, UICFG_LANG, lngGetGuiValue());
Expand All @@ -332,12 +322,6 @@ void guiShowUIConfig() {
diaSetInt(diaUIConfig, UICFG_VMODE, gVMode);
diaSetInt(diaUIConfig, UICFG_VSYNC, gVSync);

diaSetInt(diaUIConfig, UICFG_GSM, gGSM);
diaSetInt(diaUIConfig, UICFG_GSMVMODE, gGSMVMode);
diaSetInt(diaUIConfig, UICFG_GSMXOFFSET, gGSMXOffset);
diaSetInt(diaUIConfig, UICFG_GSMYOFFSET, gGSMYOffset);
diaSetInt(diaUIConfig, UICFG_GSMSKIPVIDEOS, gGSMSkipVideos);

int ret = diaExecuteDialog(diaUIConfig, -1, 1, guiUIUpdater);
if (ret) {
int themeID = -1, langID = -1;
Expand All @@ -358,16 +342,33 @@ void guiShowUIConfig() {
diaGetInt(diaUIConfig, UICFG_VMODE, &gVMode);
diaGetInt(diaUIConfig, UICFG_VSYNC, &gVSync);

diaGetInt(diaUIConfig, UICFG_GSM, &gGSM);
diaGetInt(diaUIConfig, UICFG_GSMVMODE, &gGSMVMode);
diaGetInt(diaUIConfig, UICFG_GSMXOFFSET, &gGSMXOffset);
diaGetInt(diaUIConfig, UICFG_GSMYOFFSET, &gGSMYOffset);
diaGetInt(diaUIConfig, UICFG_GSMSKIPVIDEOS, &gGSMSkipVideos);

applyConfig(themeID, langID);
}
}

void guiShowGSConfig() {
// configure the enumerations
const char* gsmvmodeNames[] = { "NTSC", "NTSC Non Interlaced", "PAL", "PAL Non Interlaced", "PAL @60Hz", "PAL @60Hz Non Interlaced", "PS1 NTSC (HDTV 480p @60Hz)", "PS1 PAL (HDTV 576p @50Hz)", "HDTV 480p @60Hz", "HDTV 576p @50Hz", "HDTV 720p @60Hz", "HDTV 1080i @60Hz", "HDTV 1080i @60Hz Non Interlaced", "HDTV 1080p @60Hz", "VGA 640x480p @60Hz", "VGA 640x960i @60Hz", "VGA 640x480p @72Hz", "VGA 640x480p @75Hz", "VGA 640x480p @85Hz", "VGA 800x600p @56Hz", "VGA 800x600p @60Hz", "VGA 800x600p @72Hz", "VGA 800x600p @75Hz", "VGA 800x600p @85Hz", "VGA 1024x768p @60Hz", "VGA 1024x768p @70Hz", "VGA 1024x768p @75Hz", "VGA 1024x768p @85Hz", "VGA 1280x1024p @60Hz", "VGA 1280x1024p @75Hz", NULL };

diaSetEnum(diaGSConfig, GSCFG_GSMVMODE, gsmvmodeNames);
diaSetInt(diaGSConfig, GSCFG_GSM, gGSM);
diaSetInt(diaGSConfig, GSCFG_GSMVMODE, gGSMVMode);
diaSetInt(diaGSConfig, GSCFG_GSMXOFFSET, gGSMXOffset);
diaSetInt(diaGSConfig, GSCFG_GSMYOFFSET, gGSMYOffset);
diaSetInt(diaGSConfig, GSCFG_GSMSKIPVIDEOS, gGSMSkipVideos);

int ret = diaExecuteDialog(diaGSConfig, -1, 1, NULL);
if (ret) {
diaGetInt(diaGSConfig, GSCFG_GSM, &gGSM);
diaGetInt(diaGSConfig, GSCFG_GSMVMODE, &gGSMVMode);
diaGetInt(diaGSConfig, GSCFG_GSMXOFFSET, &gGSMXOffset);
diaGetInt(diaGSConfig, GSCFG_GSMYOFFSET, &gGSMYOffset);
diaGetInt(diaGSConfig, GSCFG_GSMSKIPVIDEOS, &gGSMSkipVideos);

applyConfig(-1, -1);
}
}

void guiShowIPConfig() {
size_t i;
const char *ethOpModes[]={_l(_STR_AUTO), _l(_STR_ETH_100MFDX), _l(_STR_ETH_100MHDX), _l(_STR_ETH_10MFDX), _l(_STR_ETH_10MHDX), NULL};
Expand Down
4 changes: 3 additions & 1 deletion src/lang.c
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ static char *internalEnglish[LANG_STR_COUNT] = {
"Enable Delete and Rename actions",
"Check USB game fragmentation",
"Remember last played game",
"Reveal GSM Settings on Main Menu",
"Error, the game is fragmented",
"Error, could not run the item",
"Test",
Expand Down Expand Up @@ -153,7 +154,8 @@ static char *internalEnglish[LANG_STR_COUNT] = {
"100Mbit half-duplex",
"10Mbit full-duplex",
"10Mbit half-duplex",
"GSM (Graphics Synthesizer Mode Selector)",
"GSM Settings",
"GSM (0.38)",
"Force a video mode",
"Video mode",
"Video mode to be forced",
Expand Down
11 changes: 8 additions & 3 deletions src/menusys.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,10 @@
#define MENU_IP_CONFIG 2
#define MENU_SAVE_CHANGES 3
#define MENU_START_HDL 4
#define MENU_ABOUT 5
#define MENU_EXIT 6
#define MENU_POWER_OFF 7
#define MENU_GSM_SETTINGS 5
#define MENU_ABOUT 6
#define MENU_EXIT 7
#define MENU_POWER_OFF 8

// global menu variables
static menu_list_t* menu;
Expand Down Expand Up @@ -101,6 +102,8 @@ static void menuInitMainMenu() {
submenuAppendItem(&mainMenu, -1, NULL, MENU_SAVE_CHANGES, _STR_SAVE_CHANGES);
if (gHDDStartMode && gEnableDandR) // enabled at all?
submenuAppendItem(&mainMenu, -1, NULL, MENU_START_HDL, _STR_STARTHDL);
if (gShowGSM) // Reveals GSM Menu - Default is No
submenuAppendItem(&mainMenu, -1, NULL, MENU_GSM_SETTINGS, _STR_GSM_SETTINGS);
#endif
submenuAppendItem(&mainMenu, -1, NULL, MENU_ABOUT, _STR_ABOUT);
submenuAppendItem(&mainMenu, -1, NULL, MENU_EXIT, _STR_EXIT);
Expand Down Expand Up @@ -553,6 +556,8 @@ void menuHandleInputMenu() {
guiShowConfig();
} else if (id == MENU_GFX_SETTINGS) {
guiShowUIConfig();
} else if (id == MENU_GSM_SETTINGS) {
guiShowGSConfig();
} else if (id == MENU_IP_CONFIG) {
guiShowIPConfig();
} else if (id == MENU_SAVE_CHANGES) {
Expand Down
5 changes: 4 additions & 1 deletion src/opl.c
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ static void _loadConfig() {
configGetInt(configOPL, "wide_screen", &gWideScreen);
configGetInt(configOPL, "vsync", &gVSync);
configGetInt(configOPL, "vmode", &gVMode);

configGetInt(configOPL, "gsm", &gGSM);
configGetInt(configOPL, "gsmvmode", &gGSMVMode);
configGetInt(configOPL, "gsm_x_offset", &gGSMXOffset);
Expand Down Expand Up @@ -521,6 +521,7 @@ static void _loadConfig() {
if (configGetStr(configOPL, "eth_prefix", &temp))
strncpy(gETHPrefix, temp, 32);
configGetInt(configOPL, "remember_last", &gRememberLastPlayed);
configGetInt(configOPL, "reveal GSM on main menu", &gShowGSM);
configGetInt(configOPL, "usb_mode", &gUSBStartMode);
configGetInt(configOPL, "hdd_mode", &gHDDStartMode);
configGetInt(configOPL, "eth_mode", &gETHStartMode);
Expand Down Expand Up @@ -576,6 +577,7 @@ static void _saveConfig() {
configSetStr(configOPL, "usb_prefix", gUSBPrefix);
configSetStr(configOPL, "eth_prefix", gETHPrefix);
configSetInt(configOPL, "remember_last", gRememberLastPlayed);
configSetInt(configOPL, "reveal GSM on main menu", gShowGSM);
configSetInt(configOPL, "usb_mode", gUSBStartMode);
configSetInt(configOPL, "hdd_mode", gHDDStartMode);
configSetInt(configOPL, "eth_mode", gETHStartMode);
Expand Down Expand Up @@ -847,6 +849,7 @@ static void setDefaults(void) {
gDisableDebug = 0;
gEnableDandR = 0;
gRememberLastPlayed = 0;
gShowGSM = 0;
gCheckUSBFragmentation = 1;
gUSBDelay = 3;
strncpy(gUSBPrefix, "", 32);
Expand Down

0 comments on commit 36a96f5

Please sign in to comment.