Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small fixes and add notifications feature #222

Merged
merged 5 commits into from
Sep 22, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ EE_ASM_DIR = asm/
MAPFILE = opl.map
EE_LDFLAGS += -Wl,-Map,$(MAPFILE)

EE_LIBS = -L$(PS2SDK)/ports/lib -L$(GSKIT)/lib -L./lib -lgskit -ldmakit -lgskit_toolkit -lpoweroff -lfileXio -lpatches -ljpeg -lpng -lz -ldebug -lm -lmc -lfreetype -lvux -lcdvd -lnetman -lps2ips -laudsrv -lc
EE_LIBS = -L$(PS2SDK)/ports/lib -L$(GSKIT)/lib -L./lib -lgskit -ldmakit -lgskit_toolkit -lpoweroff -lfileXio -lpatches -ljpeg -lpng -lz -ldebug -lm -lmc -lfreetype -lvux -lcdvd -lnetman -lps2ips -laudsrv
EE_INCS += -I$(PS2SDK)/ports/include -I$(GSKIT)/include -I$(GSKIT)/ee/dma/include -I$(GSKIT)/ee/gs/include -I$(GSKIT)/ee/toolkit/include -Imodules/iopcore/common -Imodules/network/common -Imodules/hdd/common -Iinclude

BIN2C = $(PS2SDK)/bin/bin2c
Expand Down
4 changes: 4 additions & 0 deletions include/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ enum CONFIG_INDEX {
#define CONFIG_OPL_UI_TEXTCOLOR "ui_text_color"
#define CONFIG_OPL_SEL_TEXTCOLOR "sel_text_color"
#define CONFIG_OPL_USE_INFOSCREEN "use_info_screen"
#define CONFIG_OPL_ENABLE_NOTIFICATIONS "enable_notifications"
#define CONFIG_OPL_ENABLE_COVERART "enable_coverart"
#define CONFIG_OPL_WIDESCREEN "wide_screen"
#define CONFIG_OPL_VMODE "vmode"
Expand Down Expand Up @@ -158,4 +159,7 @@ void configGetVMC(config_set_t *configSet, char *vmc, int length, int slot);
void configSetVMC(config_set_t *configSet, const char *vmc, int slot);
void configRemoveVMC(config_set_t *configSet, int slot);

char *configGetDir(void);
void configPrepareNotifications(char *prefix);

#endif
3 changes: 2 additions & 1 deletion include/dialogs.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ enum UI_ITEMS {
UICFG_YOFF,
UICFG_OVERSCAN,
UICFG_INFOPAGE,
UICFG_NOTIFICATIONS,

CFG_DEBUG,
CFG_PS2LOGO,
Expand All @@ -47,7 +48,7 @@ enum UI_ITEMS {
ABOUT_BUILD_DETAILS,

CFG_PARENLOCK_PASSWORD,

CFG_SFX,
CFG_BOOT_SND,
CFG_SFX_VOLUME,
Expand Down
7 changes: 5 additions & 2 deletions include/lang.h
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,8 @@ enum _STR_IDS {
_STR_BOOT_SND_VOLUME,
_STR_CFM_VMODE_CHG,
_STR_CACHE_HDD_GAME_LIST,
_STR_ENABLE_NOTIFICATIONS,
_STR_NOTIFICATIONS,

LANG_STR_COUNT
};
Expand All @@ -283,15 +285,16 @@ typedef struct
char *name;
} language_t;

int lngAddLanguages(char *path, const char *separator);
int lngAddLanguages(char *path, const char *separator, int mode);
void lngInit(void);
char *lngGetValue(void);
void lngEnd(void);

// Indices are shifted in GUI, as we add the internal english language at 0
void lngSetGuiValue(int langGuiId);
int lngSetGuiValue(int langID);
int lngGetGuiValue(void);
int lngFindGuiID(const char *lang);
char **lngGetGuiList(void);
char *lngGetFilePath(int langID);

#endif
8 changes: 7 additions & 1 deletion include/opl.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ int loadConfig(int types);
int saveConfig(int types, int showUI);
void applyConfig(int themeID, int langID);
void menuDeferredUpdate(void *data);
void moduleUpdateMenu(int mode, int themeChanged);
void moduleUpdateMenu(int mode, int themeChanged, int langChanged);
void handleHdlSrv();
void deinit(int exception, int modeSelected);

Expand Down Expand Up @@ -119,6 +119,7 @@ int gAPPStartMode;
int gAutosort;
int gAutoRefresh;
int gUseInfoScreen;
int gEnableNotifications;
int gEnableArt;
int gWideScreen;
int gVMode; // 0 - Auto, 1 - PAL, 2 - NTSC
Expand All @@ -136,6 +137,11 @@ int gBootSndVolume;
int gFadeDelay;
int toggleSfx;

int showCfgPopup;
int showThmPopup;
int showLngPopup;
int popupSfxPlayed;

#ifdef IGS
#define IGS_VERSION "0.1"
#endif
Expand Down
2 changes: 0 additions & 2 deletions include/sound.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,4 @@ int sfxInit(int bootSnd);
void sfxVolume(void);
void sfxPlay(int id);

int thmSfxEnabled;

#endif
1 change: 1 addition & 0 deletions include/themes.h
Original file line number Diff line number Diff line change
Expand Up @@ -136,5 +136,6 @@ int thmSetGuiValue(int themeID, int reload);
int thmGetGuiValue(void);
int thmFindGuiID(const char *theme);
const char **thmGetGuiList(void);
char *thmGetFilePath(int themeID);

#endif
1 change: 1 addition & 0 deletions include/util.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include <gsToolkit.h>

int getmcID(void);
int getFileSize(int fd);
int openFile(char *path, int mode);
void *readFile(char *path, int align, int *size);
Expand Down