nils/shairport-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set initial debug level to 0; fix a bug reading convolution files with dbus support enabled. [skip ci]

Browse Source
This commit is contained in:
Mike Brady
2026-02-13 15:36:20 +00:00
parent ea4bf0c860
commit 59bf5915f6
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dbus-service.c
+7 -6
View File
@@ -614,17 +614,18 @@ gboolean notify_convolution_impulse_response_files_callback(ShairportSync *skele
__attribute__((unused))
gpointer user_data) {
char *th = (char *)shairport_sync_get_convolution_impulse_response_files(skeleton);
if (config.convolution_ir_files != NULL) {
if (th != NULL) {
debug(1, ">> freeing current configuration impulse response filter files.");
free_ir_filenames(config.convolution_ir_files, config.convolution_ir_file_count);
config.convolution_ir_files = NULL;
config.convolution_ir_file_count = 0;
config.convolution_ir_files = parse_ir_filenames(th, &config.convolution_ir_file_count);
sanity_check_ir_files(1, config.convolution_ir_files, config.convolution_ir_file_count);
debug(1, ">> setting %d configuration impulse response filter%s",
config.convolution_ir_file_count, config.convolution_ir_file_count == 1 ? "" : "s");
config.convolution_ir_files_updated = 1;
}
config.convolution_ir_files = parse_ir_filenames(th, &config.convolution_ir_file_count);
sanity_check_ir_files(1, config.convolution_ir_files, config.convolution_ir_file_count);
debug(1, ">> setting %d configuration impulse response filter%s",
config.convolution_ir_file_count, config.convolution_ir_file_count == 1 ? "" : "s");
config.convolution_ir_files_updated = 1;
return TRUE;
}
#else
shairport.c
+3 -4
View File
@@ -2282,10 +2282,9 @@ const char *av_channel_layout_name(uint64_t channel_layout) {
#endif
int main(int argc, char **argv) {
// initialise debug messages stuff -- level 1, no elapsed time, relative time, file and line
// the debug level will be reset to zero if no debug level is set
// initialise debug messages stuff -- level 0, no elapsed time, relative time, file and line
// debug_init(int level, int show_elapsed_time, int show_relative_time, int show_file_and_line)
debug_init(1, 0, 1, 1);
debug_init(0, 0, 1, 1);
memset(&config, 0, sizeof(config)); // also clears all strings, BTW
/* Check if we are called with -V or --version parameter */
if (argc >= 2 && ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0))) {
@@ -2517,7 +2516,7 @@ int main(int argc, char **argv) {
#ifdef CONFIG_LIBDAEMON
/* If we are going to daemonise, check that the daemon is not running already.*/
if ((config.daemonise) && ((pid = daemon_pid_file_is_running()) >= 0)) {
warn("The %s deamon is already running with process ID (PID) %u.", config.appName, pid);
warn("The %s daemon is already running with process ID (PID) %u.", config.appName, pid);
// daemon_log(LOG_ERR, "The %s daemon is already running as PID %u", config.appName, pid);
return 1;
}