oops many changes

This commit is contained in:
sankalp committed 2025-10-14 23:32:58 +05:45
1 parent 347d3048f0
commit 65dc7da800
12 files changed
+219 -330

No files matched your search

+18 -14
View File
@@ -87,10 +87,12 @@ void stop_children(void) {
}
}
int start_children(const char *sound_dir, const char *config_path, int volume,
int verbose, int mute, const char *mouse_sound_dir,
const char *mouse_config_path, int mouse_volume,
int keyboard_mute, int mouse_mute) {
int keyboard_mute, int mouse_mute, int keyboard_enabled,
int mouse_enabled) {
(void)config_path;
(void)mouse_sound_dir;
int pipefd[2];
@@ -116,21 +118,23 @@ int start_children(const char *sound_dir, const char *config_path, int volume,
perror("chdir");
exit(1);
}
char volume_str[32];
snprintf(volume_str, sizeof(volume_str), "%d", volume);
char mouse_volume_str[32];
snprintf(mouse_volume_str, sizeof(mouse_volume_str), "%d", mouse_volume);
char verbose_str[8];
snprintf(verbose_str, sizeof(verbose_str), "%d", verbose);
char mute_str[8];
snprintf(mute_str, sizeof(mute_str), "%d", mute);
char keyboard_mute_str[8];
snprintf(keyboard_mute_str, sizeof(keyboard_mute_str), "%d", keyboard_mute);
char mouse_mute_str[8];
snprintf(mouse_mute_str, sizeof(mouse_mute_str), "%d", mouse_mute);
char volume_str[32], mouse_volume_str[32], verbose_str[8], mute_str[8];
char keyboard_mute_str[8], mouse_mute_str[8];
char keyboard_enabled_str[8], mouse_enabled_str[8];
int_to_str(volume_str, sizeof(volume_str), volume);
int_to_str(mouse_volume_str, sizeof(mouse_volume_str), mouse_volume);
int_to_str(verbose_str, sizeof(verbose_str), verbose);
int_to_str(mute_str, sizeof(mute_str), mute);
int_to_str(keyboard_mute_str, sizeof(keyboard_mute_str), keyboard_mute);
int_to_str(mouse_mute_str, sizeof(mouse_mute_str), mouse_mute);
int_to_str(keyboard_enabled_str, sizeof(keyboard_enabled_str), keyboard_enabled);
int_to_str(mouse_enabled_str, sizeof(mouse_enabled_str), mouse_enabled);
execl(sound_player_path, "keyvibe-audio", "config.json", volume_str,
verbose_str, mute_str, mouse_config_path, mouse_volume_str,
keyboard_mute_str, mouse_mute_str, (char *)NULL);
keyboard_mute_str, mouse_mute_str, keyboard_enabled_str,
mouse_enabled_str, (char *)NULL);
perror("execl keyvibe-audio");
exit(1);
}
+19 -7
View File
@@ -1,5 +1,6 @@
#include "app/reload.h"
#include "app/process.h"
#include "common/utils.h"
#include "soundpacks.h"
#include "user_config.h"
#include <stdio.h>
@@ -21,13 +22,16 @@ int handle_reload(const char *user_cfg_path, char *current_sound_name,
int cfg_keyboard_enabled = *current_keyboard_enabled;
int cfg_mouse_enabled = *current_mouse_enabled;
if (read_user_config(user_cfg_path, &cfg_keyboard_sound, &cfg_mouse_sound,
&cfg_keyboard_volume, &cfg_mouse_volume, &cfg_keyboard_enabled, &cfg_mouse_enabled)) {
printf("Read config - keyboard:%s mouse:%s kvol:%d mvol:%d kenabled:%d menabled:%d\n",
&cfg_keyboard_volume, &cfg_mouse_volume,
&cfg_keyboard_enabled, &cfg_mouse_enabled)) {
printf("Read config - keyboard:%s mouse:%s kvol:%d mvol:%d kenabled:%d "
"menabled:%d\n",
cfg_keyboard_sound ? cfg_keyboard_sound : "NULL",
cfg_mouse_sound ? cfg_mouse_sound : "NULL", cfg_keyboard_volume,
cfg_mouse_volume, cfg_keyboard_enabled, cfg_mouse_enabled);
int keyboard_changed = 0, mouse_changed = 0, keyboard_volume_changed = 0,
mouse_volume_changed = 0, keyboard_enabled_changed = 0, mouse_enabled_changed = 0;
mouse_volume_changed = 0, keyboard_enabled_changed = 0,
mouse_enabled_changed = 0;
if (cfg_keyboard_sound &&
strcmp(current_sound_name, cfg_keyboard_sound) != 0) {
keyboard_changed = 1;
@@ -58,11 +62,18 @@ int handle_reload(const char *user_cfg_path, char *current_sound_name,
mouse_enabled_changed = 1;
*current_mouse_enabled = cfg_mouse_enabled;
}
printf("Config changed - keyboard:%d mouse:%d kvol:%d mvol:%d kenabled:%d menabled:%d\n",
printf("Config changed - keyboard:%d mouse:%d kvol:%d mvol:%d kenabled:%d "
"menabled:%d\n",
keyboard_changed, mouse_changed, keyboard_volume_changed,
mouse_volume_changed, keyboard_enabled_changed, mouse_enabled_changed);
mouse_volume_changed, keyboard_enabled_changed,
mouse_enabled_changed);
if (keyboard_changed || mouse_changed || keyboard_volume_changed ||
mouse_volume_changed || keyboard_enabled_changed || mouse_enabled_changed) {
mouse_volume_changed || keyboard_enabled_changed ||
mouse_enabled_changed) {
// Persist enabled state to runtime files so the audio process picks it up
// immediately
write_runtime_keyboard_enabled_file(*current_keyboard_enabled);
write_runtime_mouse_enabled_file(*current_mouse_enabled);
int keyboard_valid = validate_keyboard_sound_pack(current_sound_name);
int mouse_valid = validate_mouse_sound_pack(current_mouse_sound_name);
if (keyboard_valid && mouse_valid) {
@@ -77,7 +88,8 @@ int handle_reload(const char *user_cfg_path, char *current_sound_name,
*current_keyboard_volume, current_verbose,
current_mute, current_mouse_sound_dir,
current_mouse_config_path, current_mouse_volume_arg,
current_keyboard_mute, current_mouse_mute);
current_keyboard_mute, current_mouse_mute,
*current_keyboard_enabled, *current_mouse_enabled);
printf("Reloaded successfully: keyboard=%s, mouse=%s, kvol=%d, "
"mvol=%d\n",
current_sound_name, current_mouse_sound_name,