Polprzewodnikowy · Polprzewodnikowy · Jun 5, 2024 · May 25, 2024 · May 25, 2024 · May 26, 2024
diff --git a/Makefile b/Makefile
@@ -77,24 +77,38 @@ SRCS = \
 FONTS = \
 	FiraMonoBold.ttf
 
+SOUNDS = \
+	cursorsound.wav \
+	back.wav \
+	enter.wav \
+	error.wav \
+	settings.wav
+
 OBJS = $(addprefix $(BUILD_DIR)/, $(addsuffix .o,$(basename $(SRCS))))
 MINIZ_OBJS = $(filter $(BUILD_DIR)/libs/miniz/%.o,$(OBJS))
 SPNG_OBJS = $(filter $(BUILD_DIR)/libs/libspng/%.o,$(OBJS))
 DEPS = $(OBJS:.o=.d)
 
 FILESYSTEM = \
-	$(addprefix $(FILESYSTEM_DIR)/, $(notdir $(FONTS:%.ttf=%.font64)))
+	$(addprefix $(FILESYSTEM_DIR)/, $(notdir $(FONTS:%.ttf=%.font64))) \
+	$(addprefix $(FILESYSTEM_DIR)/, $(notdir $(SOUNDS:%.wav=%.wav64)))
 
 $(MINIZ_OBJS): N64_CFLAGS+=-DMINIZ_NO_TIME -fcompare-debug-second
 $(SPNG_OBJS): N64_CFLAGS+=-isystem $(SOURCE_DIR)/libs/miniz -DSPNG_USE_MINIZ -fcompare-debug-second
 $(FILESYSTEM_DIR)/FiraMonoBold.font64: MKFONT_FLAGS+=-c 1 --size 16 -r 20-1FF -r 2026-2026 --ellipsis 2026,1
+$(FILESYSTEM_DIR)/%.wav64: AUDIOCONV_FLAGS=--wav-compress 1
+
 
 $(@info $(shell mkdir -p ./$(FILESYSTEM_DIR) &> /dev/null))
 
 $(FILESYSTEM_DIR)/%.font64: $(ASSETS_DIR)/%.ttf
 	@echo "    [FONT] $@"
 	@$(N64_MKFONT) $(MKFONT_FLAGS) -o $(FILESYSTEM_DIR) "$<"
 
+$(FILESYSTEM_DIR)/%.wav64: $(ASSETS_DIR)/%.wav
+	@echo "    [AUDIO] $@"
+	@$(N64_AUDIOCONV) $(AUDIOCONV_FLAGS) -o $(FILESYSTEM_DIR) "$<"
+
 $(BUILD_DIR)/$(PROJECT_NAME).dfs: $(FILESYSTEM)
 
 $(BUILD_DIR)/menu/views/credits.o: .FORCE

diff --git a/assets/back.wav b/assets/back.wav
diff --git a/assets/cursorsound.wav b/assets/cursorsound.wav
diff --git a/assets/enter.wav b/assets/enter.wav
diff --git a/assets/error.wav b/assets/error.wav
diff --git a/assets/settings.wav b/assets/settings.wav
diff --git a/src/menu/components/context_menu.c b/src/menu/components/context_menu.c
@@ -1,5 +1,6 @@
 #include "../components.h"
 #include "../fonts.h"
+#include "../menu.h"
 #include "constants.h"
 
 
@@ -41,6 +42,7 @@ bool component_context_menu_process (menu_t *menu, component_context_menu_t *cm)
         } else {
             cm->hide_pending = true;
         }
+        wav64_play(&sfx_exit, SFX_CHANNEL);
     } else if (menu->actions.enter) {
         if (cm->list[cm->selected].submenu) {
             cm->submenu = cm->list[cm->selected].submenu;
@@ -51,16 +53,19 @@ bool component_context_menu_process (menu_t *menu, component_context_menu_t *cm)
             cm->list[cm->selected].action(menu, cm->list[cm->selected].arg);
             top->hide_pending = true;
         }
+        wav64_play(&sfx_enter, SFX_CHANNEL);
     } else if (menu->actions.go_up) {
         cm->selected -= 1;
         if (cm->selected < 0) {
             cm->selected = 0;
         }
+        wav64_play(&sfx_cursor, SFX_CHANNEL);
     } else if (menu->actions.go_down) {
         cm->selected += 1;
         if (cm->selected >= cm->count) {
             cm->selected = (cm->count - 1);
         }
+        wav64_play(&sfx_cursor, SFX_CHANNEL);
     }
 
     return true;

diff --git a/src/menu/menu.c b/src/menu/menu.c
@@ -14,6 +14,7 @@
 #include "mp3_player.h"
 #include "png_decoder.h"
 #include "settings.h"
+#include "menu.h"
 #include "sound.h"
 #include "usb_comm.h"
 #include "utils/fs.h"
@@ -34,6 +35,7 @@
 static menu_t *menu;
 static tv_type_t tv_type;
 static volatile int frame_counter = 0;
+wav64_t sfx_cursor, sfx_error, sfx_enter, sfx_exit, sfx_settings;
 
 extern tv_type_t __boot_tvtype;
 
@@ -67,6 +69,13 @@ static void menu_init (boot_params_t *boot_params) {
 
     sound_init_default();
 
+    mixer_ch_set_vol(SFX_CHANNEL, 0.5f, 0.5f);
+    wav64_open(&sfx_cursor, "rom:/cursorsound.wav64");
+    wav64_open(&sfx_exit, "rom:/back.wav64");
+    wav64_open(&sfx_settings, "rom:/settings.wav64");
+    wav64_open(&sfx_enter, "rom:/enter.wav64");
+    wav64_open(&sfx_error, "rom:/error.wav64");
+
     menu = calloc(1, sizeof(menu_t));
     assert(menu != NULL);
 
@@ -115,6 +124,10 @@ static void menu_init (boot_params_t *boot_params) {
         __boot_tvtype = TV_NTSC;
     }
 
+    if (!menu->settings.sound_enabled) {
+        mixer_ch_set_vol(SFX_CHANNEL, 0, 0);
+    }
+
     display_init(RESOLUTION_640x480, DEPTH_16_BPP, 2, GAMMA_NONE, FILTERS_DISABLED);
 
     register_VI_handler(frame_counter_handler);

diff --git a/src/menu/menu.h b/src/menu/menu.h
@@ -7,9 +7,15 @@
 #ifndef MENU_H__
 #define MENU_H__
 
+#include <libdragon.h>
 
 #include "boot/boot.h"
 
+extern wav64_t sfx_cursor, sfx_error, sfx_enter, sfx_exit, sfx_settings;
+
+enum sfx_channels {
+	SFX_CHANNEL
+};
 
 void menu_run (boot_params_t *boot_params);
 

diff --git a/src/menu/settings.c b/src/menu/settings.c
@@ -13,10 +13,10 @@ static settings_t init = {
     .show_protected_entries = false,
     .default_directory = "/",
     .use_saves_folder = true,
+    .sound_enabled = true,
 
     /* Beta feature flags (should always init to off) */
     .bgm_enabled = false,
-    .sound_enabled = false,
     .rumble_enabled = false,
 };
 
@@ -39,10 +39,10 @@ void settings_load (settings_t *settings) {
     settings->show_protected_entries = mini_get_bool(ini, "menu", "show_protected_entries", init.show_protected_entries);
     settings->default_directory = strdup(mini_get_string(ini, "menu", "default_directory", init.default_directory));
     settings->use_saves_folder = mini_get_bool(ini, "menu", "use_saves_folder", init.use_saves_folder);
+    settings->sound_enabled = mini_get_bool(ini, "menu", "sound_enabled", init.sound_enabled);
 
     /* Beta feature flags, they might not be in the file */
     settings->bgm_enabled = mini_get_bool(ini, "menu_beta_flag", "bgm_enabled", init.bgm_enabled);
-    settings->sound_enabled = mini_get_bool(ini, "menu_beta_flag", "sound_enabled", init.sound_enabled);
     settings->rumble_enabled = mini_get_bool(ini, "menu_beta_flag", "rumble_enabled", init.rumble_enabled);
 
     mini_free(ini);
@@ -55,10 +55,10 @@ void settings_save (settings_t *settings) {
     mini_set_bool(ini, "menu", "show_protected_entries", settings->show_protected_entries);
     mini_set_string(ini, "menu", "default_directory", settings->default_directory);
     mini_set_bool(ini, "menu", "use_saves_folder", settings->use_saves_folder);
+    mini_set_bool(ini, "menu", "sound_enabled", settings->sound_enabled);
 
     /* Beta feature flags, they should not save until production ready! */
     // mini_set_bool(ini, "menu_beta_flag", "bgm_enabled", settings->bgm_enabled);
-    // mini_set_bool(ini, "menu_beta_flag", "sound_enabled", settings->sound_enabled);
     // mini_set_bool(ini, "menu_beta_flag", "rumble_enabled", settings->rumble_enabled);
 
     mini_save(ini, MINI_FLAGS_SKIP_EMPTY_GROUPS);

diff --git a/src/menu/views/browser.c b/src/menu/views/browser.c
@@ -6,6 +6,7 @@
 #include "../fonts.h"
 #include "utils/fs.h"
 #include "views.h"
+#include "../menu.h"
 
 
 static const char *rom_extensions[] = { "z64", "n64", "v64", "rom", NULL };
@@ -296,16 +297,19 @@ static void process (menu_t *menu) {
             if (menu->browser.selected < 0) {
                 menu->browser.selected = 0;
             }
+            wav64_play(&sfx_cursor, SFX_CHANNEL);
         } else if (menu->actions.go_down) {
             menu->browser.selected += scroll_speed;
             if (menu->browser.selected >= menu->browser.entries) {
                 menu->browser.selected = menu->browser.entries - 1;
             }
+            wav64_play(&sfx_cursor, SFX_CHANNEL);
         }
         menu->browser.entry = &menu->browser.list[menu->browser.selected];
     }
 
     if (menu->actions.enter && menu->browser.entry) {
+        wav64_play(&sfx_enter, SFX_CHANNEL);
         switch (menu->browser.entry->type) {
             case ENTRY_TYPE_DIR:
                 if (push_directory(menu, menu->browser.entry->name)) {
@@ -340,10 +344,13 @@ static void process (menu_t *menu) {
             menu->browser.valid = false;
             menu_show_error(menu, "Couldn't open last directory");
         }
+        wav64_play(&sfx_exit, SFX_CHANNEL);
     } else if (menu->actions.options && menu->browser.entry) {
         component_context_menu_show(&entry_context_menu);
+        wav64_play(&sfx_settings, SFX_CHANNEL);
     } else if (menu->actions.settings) {
         component_context_menu_show(&settings_context_menu);
+        wav64_play(&sfx_settings, SFX_CHANNEL);
     }
 }
 

diff --git a/src/menu/views/credits.c b/src/menu/views/credits.c
@@ -1,5 +1,5 @@
 #include "views.h"
-
+#include "../menu.h"
 
 #ifndef MENU_VERSION
 #define MENU_VERSION "Unknown"
@@ -13,6 +13,7 @@
 static void process (menu_t *menu) {
     if (menu->actions.back) {
         menu->next_mode = MENU_MODE_BROWSER;
+        wav64_play(&sfx_exit, SFX_CHANNEL);
     }
 }
 

diff --git a/src/menu/views/error.c b/src/menu/views/error.c
@@ -1,9 +1,11 @@
 #include "views.h"
+#include "../menu.h"
 
 
 static void process (menu_t *menu) {
     if (menu->actions.back) {
         menu->next_mode = MENU_MODE_BROWSER;
+        wav64_play(&sfx_exit, SFX_CHANNEL);
     }
 }
 
@@ -48,6 +50,7 @@ void view_error_display (menu_t *menu, surface_t *display) {
 }
 
 void menu_show_error (menu_t *menu, char *error_message) {
+    wav64_play(&sfx_error, SFX_CHANNEL);
     menu->next_mode = MENU_MODE_ERROR;
     menu->error_message = error_message;
 }
diff --git a/src/menu/views/file_info.c b/src/menu/views/file_info.c
@@ -1,4 +1,5 @@
 #include <sys/stat.h>
+#include "../menu.h"
 
 #include "utils/fs.h"
 #include "views.h"
@@ -50,6 +51,7 @@ static char *format_file_type (char *name, bool is_directory) {
 static void process (menu_t *menu) {
     if (menu->actions.back) {
         menu->next_mode = MENU_MODE_BROWSER;
+        wav64_play(&sfx_exit, SFX_CHANNEL);
     }
 }
 

diff --git a/src/menu/views/flashcart_info.c b/src/menu/views/flashcart_info.c
@@ -1,9 +1,11 @@
 #include "views.h"
+#include "../menu.h"
 
 
 static void process (menu_t *menu) {
     if (menu->actions.back) {
         menu->next_mode = MENU_MODE_BROWSER;
+        wav64_play(&sfx_exit, SFX_CHANNEL);
     }
 }
 

diff --git a/src/menu/views/image_viewer.c b/src/menu/views/image_viewer.c
@@ -1,4 +1,5 @@
 #include <stdlib.h>
+#include "../menu.h"
 
 #include "../png_decoder.h"
 #include "views.h"
@@ -40,6 +41,7 @@ static void process (menu_t *menu) {
         } else {
             menu->next_mode = MENU_MODE_BROWSER;
         }
+        wav64_play(&sfx_exit, SFX_CHANNEL);
     } else if (menu->actions.enter && image) {
         if (show_message) {
             show_message = false;
@@ -48,6 +50,7 @@ static void process (menu_t *menu) {
         } else {
             show_message = true;
         }
+        wav64_play(&sfx_enter, SFX_CHANNEL);
     }
 }
 

diff --git a/src/menu/views/load_disk.c b/src/menu/views/load_disk.c
@@ -1,6 +1,7 @@
 #include "../cart_load.h"
 #include "../disk_info.h"
 #include "boot/boot.h"
+#include "../menu.h"
 #include "views.h"
 
 
@@ -34,8 +35,10 @@ static void process (menu_t *menu) {
     } else if (menu->actions.options && menu->load.rom_path) {
         load_pending = true;
         load_rom = true;
+        wav64_play(&sfx_settings, SFX_CHANNEL);
     } else if (menu->actions.back) {
         menu->next_mode = MENU_MODE_BROWSER;
+        wav64_play(&sfx_exit, SFX_CHANNEL);
     }
 }
 

diff --git a/src/menu/views/load_emulator.c b/src/menu/views/load_emulator.c
@@ -1,6 +1,7 @@
 #include "../cart_load.h"
 #include "boot/boot.h"
 #include "utils/fs.h"
+#include "../menu.h"
 #include "views.h"
 
 
@@ -36,6 +37,7 @@ static void process (menu_t *menu) {
         load_pending = true;
     } else if (menu->actions.back) {
         menu->next_mode = MENU_MODE_BROWSER;
+        wav64_play(&sfx_exit, SFX_CHANNEL);
     }
 }
 

diff --git a/src/menu/views/load_rom.c b/src/menu/views/load_rom.c
@@ -1,6 +1,7 @@
 #include "../cart_load.h"
 #include "../rom_info.h"
 #include "boot/boot.h"
+#include "../menu.h"
 #include "views.h"
 
 
@@ -197,8 +198,10 @@ static void process (menu_t *menu) {
         load_pending = true;
     } else if (menu->actions.back) {
         menu->next_mode = MENU_MODE_BROWSER;
+        wav64_play(&sfx_exit, SFX_CHANNEL);
     } else if (menu->actions.options) {
         component_context_menu_show(&options_context_menu);
+        wav64_play(&sfx_settings, SFX_CHANNEL);
     }
 }
 

diff --git a/src/menu/views/music_player.c b/src/menu/views/music_player.c
@@ -1,5 +1,6 @@
 #include "../mp3_player.h"
 #include "../sound.h"
+#include "../menu.h"
 #include "views.h"
 
 
@@ -42,6 +43,7 @@ static void process (menu_t *menu) {
         menu_show_error(menu, convert_error_message(err));
     } else if (menu->actions.back) {
         menu->next_mode = MENU_MODE_BROWSER;
+        wav64_play(&sfx_exit, SFX_CHANNEL);
     } else if (menu->actions.enter) {
         err = mp3player_toggle();
         if (err != MP3PLAYER_OK) {

diff --git a/src/menu/views/rtc.c b/src/menu/views/rtc.c
@@ -1,4 +1,5 @@
 #include <time.h>
+#include "../menu.h"
 #include "views.h"
 
 // FIXME: add implementation!
@@ -18,6 +19,7 @@
 static void process (menu_t *menu) {
     if (menu->actions.back) {
         menu->next_mode = MENU_MODE_BROWSER;
+        wav64_play(&sfx_exit, SFX_CHANNEL);
     }
 }
 

diff --git a/src/menu/views/settings_editor.c b/src/menu/views/settings_editor.c
@@ -1,3 +1,4 @@
+#include "../menu.h"
 #include "views.h"
 
 
@@ -12,6 +13,7 @@ static const char *format_switch (bool state) {
 static void process (menu_t *menu) {
     if (menu->actions.back) {
         menu->next_mode = MENU_MODE_BROWSER;
+        wav64_play(&sfx_exit, SFX_CHANNEL);
     }
 }