mirror of
https://github.com/Polprzewodnikowy/N64FlashcartMenu.git
synced 2024-11-22 18:49:20 +01:00
Fix ability to set SFX audio without console reboot (#118)
<!--- Provide a general summary of your changes in the Title above --> ## Description <!--- Describe your changes in detail --> Allow realtime setting changes for SFX in menu. Add note that the PAL60 setting still requires a reboot. ## Motivation and Context <!--- What does this sample do? What problem does it solve? --> <!--- If it fixes/closes/resolves an open issue, please link to the issue here --> The sfx setting previously required a flashcart reboot. ## How Has This Been Tested? <!-- (if applicable) --> <!--- Please describe in detail how you tested your sample/changes. --> <!--- Include details of your testing environment, and the tests you ran to --> <!--- see how your change affects other areas of the code, etc. --> ## Screenshots <!-- (if appropriate): --> ## Types of changes <!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [x] Improvement (non-breaking change that adds a new feature) - [ ] Bug fix (fixes an issue) - [ ] Breaking change (breaking change) - [ ] Config and build (change in the configuration and build system, has no impact on code or features) ## Checklist: <!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> - [ ] My code follows the code style of this project. - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. - [ ] I have added tests to cover my changes. - [ ] All new and existing tests passed. <!--- It would be nice if you could sign off your contribution by replacing the name with your GitHub user name and GitHub email contact. --> Signed-off-by: GITHUB_USER <GITHUB_USER_EMAIL>
This commit is contained in:
parent
f299bdcac9
commit
1deb7242fc
@ -119,8 +119,9 @@ static void menu_init (boot_params_t *boot_params) {
|
|||||||
__boot_tvtype = TV_NTSC;
|
__boot_tvtype = TV_NTSC;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
sound_init_sfx();
|
||||||
if (menu->settings.sound_enabled) {
|
if (menu->settings.sound_enabled) {
|
||||||
sound_init_sfx();
|
sound_use_sfx(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
display_init(RESOLUTION_640x480, DEPTH_16_BPP, 2, GAMMA_NONE, FILTERS_DISABLED);
|
display_init(RESOLUTION_640x480, DEPTH_16_BPP, 2, GAMMA_NONE, FILTERS_DISABLED);
|
||||||
|
@ -50,6 +50,14 @@ void sound_init_sfx (void) {
|
|||||||
sfx_enabled = true;
|
sfx_enabled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void sound_use_sfx(bool state) {
|
||||||
|
if (state) {
|
||||||
|
sfx_enabled = true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
sfx_enabled = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void sound_play_effect(sound_effect_t sfx) {
|
void sound_play_effect(sound_effect_t sfx) {
|
||||||
if(sfx_enabled) {
|
if(sfx_enabled) {
|
||||||
|
@ -7,6 +7,7 @@
|
|||||||
#ifndef SOUND_H__
|
#ifndef SOUND_H__
|
||||||
#define SOUND_H__
|
#define SOUND_H__
|
||||||
|
|
||||||
|
#include <stdbool.h>
|
||||||
|
|
||||||
#define SOUND_MP3_PLAYER_CHANNEL (0)
|
#define SOUND_MP3_PLAYER_CHANNEL (0)
|
||||||
#define SOUND_SFX_CHANNEL (2)
|
#define SOUND_SFX_CHANNEL (2)
|
||||||
@ -23,6 +24,7 @@ typedef enum {
|
|||||||
void sound_init_default (void);
|
void sound_init_default (void);
|
||||||
void sound_init_mp3_playback (void);
|
void sound_init_mp3_playback (void);
|
||||||
void sound_init_sfx (void);
|
void sound_init_sfx (void);
|
||||||
|
void sound_use_sfx(bool);
|
||||||
void sound_play_effect(sound_effect_t sfx);
|
void sound_play_effect(sound_effect_t sfx);
|
||||||
void sound_deinit (void);
|
void sound_deinit (void);
|
||||||
void sound_poll (void);
|
void sound_poll (void);
|
||||||
|
@ -30,6 +30,7 @@ static void set_use_saves_folder_type (menu_t *menu, void *arg) {
|
|||||||
|
|
||||||
static void set_sound_enabled_type (menu_t *menu, void *arg) {
|
static void set_sound_enabled_type (menu_t *menu, void *arg) {
|
||||||
menu->settings.sound_enabled = (bool) (arg);
|
menu->settings.sound_enabled = (bool) (arg);
|
||||||
|
sound_use_sfx(menu->settings.sound_enabled);
|
||||||
settings_save(&menu->settings);
|
settings_save(&menu->settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -134,19 +135,19 @@ static void draw (menu_t *menu, surface_t *d) {
|
|||||||
component_main_text_draw(
|
component_main_text_draw(
|
||||||
ALIGN_LEFT, VALIGN_TOP,
|
ALIGN_LEFT, VALIGN_TOP,
|
||||||
"\n\n"
|
"\n\n"
|
||||||
" Default Directory : %s\n\n"
|
" Default Directory : %s\n\n"
|
||||||
"To change the menu settings, press 'A'.\n\n"
|
"To change the following menu settings, press 'A':\n"
|
||||||
" PAL60 Mode : %s\n"
|
"* PAL60 Mode : %s\n"
|
||||||
" Show Hidden Files : %s\n"
|
" Show Hidden Files : %s\n"
|
||||||
" Use Saves folder : %s\n"
|
" Use Saves folder : %s\n"
|
||||||
"* Sound Effects : %s\n"
|
" Sound Effects : %s\n"
|
||||||
#ifdef BETA_SETTINGS
|
#ifdef BETA_SETTINGS
|
||||||
" Background Music : %s\n"
|
" Background Music : %s\n"
|
||||||
" Rumble Feedback : %s\n"
|
" Rumble Feedback : %s\n"
|
||||||
#endif
|
#endif
|
||||||
"\n\n"
|
|
||||||
"Note: Certain settings have the following caveats:\n\n"
|
"Note: Certain settings have the following caveats:\n\n"
|
||||||
"* Requires a flashcart reboot.\n",
|
"* Requires a flashcart reboot.\n",
|
||||||
|
"\n",
|
||||||
menu->settings.default_directory,
|
menu->settings.default_directory,
|
||||||
format_switch(menu->settings.pal60_enabled),
|
format_switch(menu->settings.pal60_enabled),
|
||||||
format_switch(menu->settings.show_protected_entries),
|
format_switch(menu->settings.show_protected_entries),
|
||||||
|
Loading…
Reference in New Issue
Block a user