Merge pull request #157 from KrahJohlito/gui-final

GUI: add sound effects
ps2homebrew · Dec 16, 2018 · 0f0c57b · 0f0c57b
2 parents 11b796b + 311249f
commit 0f0c57b
Show file tree

Hide file tree

Showing 25 changed files with 681 additions and 46 deletions.
diff --git a/Makefile b/Makefile
@@ -57,22 +57,24 @@ OPL_VERSION = $(VERSION).$(SUBVERSION).$(PATCHLEVEL).$(REVISION)$(if $(EXTRAVERS
 
 FRONTEND_OBJS = pad.o fntsys.o renderman.o menusys.o OSDHistory.o system.o lang.o config.o hdd.o dialogs.o \
 		dia.o ioman.o texcache.o themes.o supportbase.o usbsupport.o ethsupport.o hddsupport.o \
-		appsupport.o gui.o textures.o opl.o atlas.o nbns.o httpclient.o gsm.o cheatman.o
+		appsupport.o gui.o textures.o opl.o atlas.o nbns.o httpclient.o gsm.o cheatman.o sound.o
 
 GFX_OBJS =	usb_icon.o hdd_icon.o eth_icon.o app_icon.o \
 		cross_icon.o triangle_icon.o circle_icon.o square_icon.o select_icon.o start_icon.o \
 		left_icon.o right_icon.o up_icon.o down_icon.o L1_icon.o L2_icon.o R1_icon.o R2_icon.o \
 		load0.o load1.o load2.o load3.o load4.o load5.o load6.o load7.o logo.o bg_overlay.o freesans.o \
 		icon_sys.o icon_icn.o
 
-MISC_OBJS =	icon_sys_A.o icon_sys_J.o icon_sys_C.o conf_theme_OPL.o
+MISC_OBJS =	icon_sys_A.o icon_sys_J.o icon_sys_C.o conf_theme_OPL.o \
+		boot.o cancel.o confirm.o cursor.o message.o transition.o
 
 IOP_OBJS =	iomanx.o filexio.o ps2fs.o usbd.o usbhdfsd.o usbhdfsdfsv.o \
 		ps2atad.o hdpro_atad.o poweroff.o ps2hdd.o xhdd.o genvmc.o hdldsvr.o \
 		ps2dev9.o smsutils.o ps2ip.o smap.o isofs.o nbns-iop.o \
 		httpclient-iop.o netman.o ps2ips.o \
 		usb_mcemu.o hdd_mcemu.o smb_mcemu.o \
-		iremsndpatch.o apemodpatch.o
+		iremsndpatch.o apemodpatch.o \
+		libsd.o audsrv.o
 
 EECORE_OBJS = ee_core.o ioprp.o util.o \
 		elfldr.o udnl.o imgdrv.o eesync.o \
@@ -91,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
+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_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
@@ -427,6 +429,12 @@ $(EE_ASM_DIR)isofs.s: modules/isofs/isofs.irx | $(EE_ASM_DIR)
 $(EE_ASM_DIR)usbd.s: $(PS2SDK)/iop/irx/usbd.irx | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ usbd_irx
 
+$(EE_ASM_DIR)libsd.s: $(PS2SDK)/iop/irx/libsd.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ libsd_irx
+
+$(EE_ASM_DIR)audsrv.s: $(PS2SDK)/iop/irx/audsrv.irx | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ audsrv_irx
+
 $(EE_OBJS_DIR)libds34bt.a: modules/ds34bt/ee/libds34bt.a
 	cp $< $@
 
@@ -720,6 +728,24 @@ $(EE_ASM_DIR)icon_sys_C.s: misc/icon_C.sys | $(EE_ASM_DIR)
 $(EE_ASM_DIR)conf_theme_OPL.s: misc/conf_theme_OPL.cfg | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ conf_theme_OPL_cfg
 
+$(EE_ASM_DIR)boot.s: misc/boot.adp | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ boot_adp
+
+$(EE_ASM_DIR)cancel.s: misc/cancel.adp | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ cancel_adp
+
+$(EE_ASM_DIR)confirm.s: misc/confirm.adp | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ confirm_adp
+
+$(EE_ASM_DIR)cursor.s: misc/cursor.adp | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ cursor_adp
+
+$(EE_ASM_DIR)message.s: misc/message.adp | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ message_adp
+
+$(EE_ASM_DIR)transition.s: misc/transition.adp | $(EE_ASM_DIR)
+	$(BIN2S) $< $@ transition_adp
+
 $(EE_ASM_DIR)IOPRP_img.s: modules/iopcore/IOPRP.img | $(EE_ASM_DIR)
 	$(BIN2S) $< $@ IOPRP_img
 

diff --git a/include/config.h b/include/config.h
@@ -84,6 +84,10 @@ enum CONFIG_INDEX {
 #define CONFIG_OPL_APP_MODE "app_mode"
 #define CONFIG_OPL_SWAP_SEL_BUTTON "swap_select_btn"
 #define CONFIG_OPL_PARENTAL_LOCK_PWD "parental_lock_password"
+#define CONFIG_OPL_SFX "enable_sfx"
+#define CONFIG_OPL_BOOT_SND "enable_boot_snd"
+#define CONFIG_OPL_SFX_VOLUME "sfx_volume"
+#define CONFIG_OPL_BOOT_SND_VOLUME "boot_snd_volume"
 
 //Network config keys
 #define CONFIG_NET_ETH_LINKM "eth_linkmode"

diff --git a/include/dialogs.h b/include/dialogs.h
@@ -46,6 +46,11 @@ enum UI_ITEMS {
     ABOUT_BUILD_DETAILS,
 
     CFG_PARENLOCK_PASSWORD,
+
+    CFG_SFX,
+    CFG_BOOT_SND,
+    CFG_SFX_VOLUME,
+    CFG_BOOT_SND_VOLUME,
 
     NETCFG_SHOW_ADVANCED_OPTS,
     NETCFG_PS2_IP_ADDR_TYPE,
@@ -179,6 +184,7 @@ extern struct UIItem diaPadEmuInfo[];
 extern struct UIItem diaNetConfig[];
 extern struct UIItem diaCompatConfig[];
 extern struct UIItem diaUIConfig[];
+extern struct UIItem diaAudioConfig[];
 extern struct UIItem diaGSConfig[];
 extern struct UIItem diaCheatConfig[];
 

diff --git a/include/extern_irx.h b/include/extern_irx.h
@@ -7,6 +7,9 @@
 extern void *apemodpatch_irx;
 extern int size_apemodpatch_irx;
 
+extern void *audsrv_irx;
+extern int size_audsrv_irx;
+
 extern void *bt_pademu_irx;
 extern int size_bt_pademu_irx;
 
@@ -64,6 +67,9 @@ extern int size_isofs_irx;
 extern void *iremsndpatch_irx;
 extern int size_iremsndpatch_irx;
 
+extern void *libsd_irx;
+extern int size_libsd_irx;
+
 extern void *mcman_irx;
 extern int size_mcman_irx;
 

diff --git a/include/gui.h b/include/gui.h
@@ -127,9 +127,12 @@ void guiShowNetCompatUpdate(void);
 void guiShowAbout();
 void guiShowConfig();
 void guiShowUIConfig();
+void guiShowAudioConfig();
 void guiShowNetConfig();
 void guiShowParentalLockConfig();
 
+void guiDelay(int milliSeconds);
+
 /** Renders the given string on screen for the given function until it's io finishes 
 * @note The ptr pointer is watched for it's value. The IO is considered finished when the value becomes zero. 
 * @param ptr The finished state pointer (1 unfinished, 0 finished)

diff --git a/include/lang.h b/include/lang.h
@@ -260,6 +260,11 @@ enum _STR_IDS {
     _STR_BUILD_DETAILS,
     _STR_PARENLOCK_INVALID_PASSWORD,
     _STR_ERR_VMC_FRAGMENTED_CONTINUE,
+    _STR_AUDIO_SETTINGS,
+    _STR_SFX,
+    _STR_BOOT_SND,
+    _STR_SFX_VOLUME,
+    _STR_BOOT_SND_VOLUME,
 
     LANG_STR_COUNT
 };

diff --git a/include/opl.h b/include/opl.h
@@ -114,6 +114,14 @@ int gYOff;
 int gOverscan;
 int gSelectButton;
 
+int gEnableSFX;
+int gEnableBootSND;
+int gSFXVolume;
+int gBootSndVolume;
+
+int gFadeDelay;
+int toggleSfx;
+
 #ifdef IGS
 #define IGS_VERSION "0.1"
 #endif

diff --git a/include/sound.h b/include/sound.h
@@ -0,0 +1,13 @@
+#ifndef __SOUND_H
+#define __SOUND_H
+
+#define NUM_SFX_FILES 6
+
+extern struct audsrv_adpcm_t sfx[NUM_SFX_FILES];
+
+int sfxInit(int bootSnd);
+void sfxVolume(void);
+
+int thmSfxEnabled;
+
+#endif
diff --git a/include/themes.h b/include/themes.h
@@ -132,7 +132,7 @@ GSTEXTURE *thmGetTexture(unsigned int id);
 void thmEnd(void);
 
 // Indices are shifted in GUI, as we add the internal default theme at 0
-int thmSetGuiValue(int themeGuiId, int reload);
+int thmSetGuiValue(int themeID, int reload);
 int thmGetGuiValue(void);
 int thmFindGuiID(const char *theme);
 const char **thmGetGuiList(void);

diff --git a/misc/boot.adp b/misc/boot.adp
diff --git a/misc/cancel.adp b/misc/cancel.adp
diff --git a/misc/conf_theme_OPL.cfg b/misc/conf_theme_OPL.cfg
@@ -2,30 +2,23 @@ main0:
 	type=Background
 	pattern=BG
 main1:
-	type=StaticImage
-	default=bg_overlay
-	aligned=0
-	scaled=0
-	width=DIM_INF
-	height=DIM_INF
-main2:
 	type=MenuIcon
-main3:
+main2:
 	type=MenuText
-main4:
+main3:
 	type=ItemsList
-main5:
+main4:
 	type=ItemIcon
-main6:
+main5:
 #	DVD cover size: 129x184mm
 	type=ItemCover
 	width=140
 	height=200
-main7:
+main6:
 	type=ItemText
-main8:
+main7:
 	type=HintText
-main9:
+main8:
 	type=LoadingIcon
 info0:
 	type=Background

diff --git a/misc/confirm.adp b/misc/confirm.adp
diff --git a/misc/cursor.adp b/misc/cursor.adp
diff --git a/misc/message.adp b/misc/message.adp
diff --git a/misc/transition.adp b/misc/transition.adp