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

Tweaks: Added option to mute BGM in MainUI #1236

Merged
merged 9 commits into from
Dec 21, 2023
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/common/system/settings.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ typedef struct settings_s {
int volume;
char keymap[JSON_STRING_LEN];
int mute;
int bgm_mute;
int bgm_volume;
int brightness;
char language[JSON_STRING_LEN];
Expand Down Expand Up @@ -78,6 +79,7 @@ static settings_s __default_settings = (settings_s){
.volume = 20,
.keymap = "L2,L,R2,R,X,A,B,Y",
.mute = 0,
.bgm_mute = 0,
.bgm_volume = 20,
.brightness = 7,
.language = "en.lang",
Expand Down Expand Up @@ -167,6 +169,7 @@ void _settings_load_mainui(void)

json_getInt(json_root, "vol", &settings.volume);
json_getInt(json_root, "bgmvol", &settings.bgm_volume);
json_getInt(json_root, "bgmmute", &settings.bgm_mute);
json_getInt(json_root, "brightness", &settings.brightness);
json_getInt(json_root, "hibernate", &settings.sleep_timer);
json_getInt(json_root, "lumination", &settings.lumination);
Expand Down Expand Up @@ -281,6 +284,7 @@ bool _settings_dirty_mainui(void)
return settings.volume != __settings.volume ||
strcmp(settings.keymap, __settings.keymap) != 0 ||
settings.mute != __settings.mute ||
settings.bgm_mute != __settings.bgm_mute ||
settings.bgm_volume != __settings.bgm_volume ||
settings.brightness != __settings.brightness ||
strcmp(settings.language, __settings.language) != 0 ||
Expand Down Expand Up @@ -311,6 +315,7 @@ void _settings_save_mainui(void)
fprintf(fp, JSON_FORMAT_TAB_NUMBER, "vol", settings.volume);
fprintf(fp, JSON_FORMAT_TAB_STRING, "keymap", settings.keymap);
fprintf(fp, JSON_FORMAT_TAB_NUMBER, "mute", settings.mute);
fprintf(fp, JSON_FORMAT_TAB_NUMBER, "bgmmute", settings.bgm_mute);
fprintf(fp, JSON_FORMAT_TAB_NUMBER, "bgmvol", settings.bgm_volume);
fprintf(fp, JSON_FORMAT_TAB_NUMBER, "brightness", settings.brightness);
fprintf(fp, JSON_FORMAT_TAB_STRING, "language", settings.language);
Expand Down
5 changes: 5 additions & 0 deletions src/tweaks/actions.h
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,11 @@ void action_hideLabelsIcons(void *pt)
theme_changeOverride("hideLabels", "icons", NULL, value_types[item_value]);
}

void action_toggleBackgroundMusic(void *pt)
{
settings.bgm_mute = ((ListItem *)pt)->value == 1;
};

void action_hideLabelsHints(void *pt)
{
static bool applied_values[] = {false, false, true};
Expand Down
7 changes: 7 additions & 0 deletions src/tweaks/menus.h
Original file line number Diff line number Diff line change
Expand Up @@ -437,6 +437,13 @@ void menu_themeOverrides(void *_)
(ListItem){
.label = "Battery percentage...",
.action = menu_batteryPercentage});
list_addItemWithInfoNote(&_menu_theme_overrides,
(ListItem){
.label = "Mute background music",
.item_type = TOGGLE,
.value = settings.bgm_mute,
.action = action_toggleBackgroundMusic},
"Mute background music for themes");
list_addItemWithInfoNote(&_menu_theme_overrides,
(ListItem){
.label = "Hide icon labels",
Expand Down
1 change: 1 addition & 0 deletions src/tweaks/tweaks.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ int main(int argc, char *argv[])
SDL_InitDefault(true);

settings_load();

lang_load();

// Apply tool via command line
Expand Down
19 changes: 19 additions & 0 deletions static/build/.tmp_update/runtime.sh
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@ launch_main_ui() {

start_audioserver

mute_theme_bgm

# MainUI launch
cd $miyoodir/app
PATH="$miyoodir/app:$PATH" \
Expand Down Expand Up @@ -503,6 +505,23 @@ mount_main_ui() {
fi
}

mute_theme_bgm() {
bgm_muted=$(/customer/app/jsonval bgmmute)
system_theme="$(/customer/app/jsonval theme)"
bgm_file="${system_theme}sound/bgm.mp3"
muted_bgm_file="${system_theme}sound/bgm_muted.mp3"

if [ $bgm_muted -eq 1 ]; then
if [[ -f "$bgm_file" ]]; then
mv -f "$bgm_file" "$muted_bgm_file"
fi
else
if [[ -f "$muted_bgm_file" ]]; then
mv -f "$muted_bgm_file" "$bgm_file"
fi
fi
}

init_system() {
log "\n:: Init system"

Expand Down