relax config file checking for non-server programs

[disorder] / server / speaker.c

diff --git a/server/speaker.c b/server/speaker.c
index aa09c02b1fb15067442a8e955b33faa388d4e473..70d21625c23dab914c13533bbb5f43c4b899051b 100644 (file)
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -517,7 +517,7 @@ static void mainloop(void) {
          break;
        case SM_RELOAD:
           D(("SM_RELOAD"));
          break;
        case SM_RELOAD:
           D(("SM_RELOAD"));

-         if(config_read()) error(0, "cannot read configuration");
+         if(config_read(1)) error(0, "cannot read configuration");

           info("reloaded configuration");
          break;
        default:
           info("reloaded configuration");
          break;
        default:


@@ -561,7 +561,7 @@ int main(int argc, char **argv) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }

-  if(config_read()) fatal(0, "cannot read configuration");
+  if(config_read(1)) fatal(0, "cannot read configuration");

   bpf = bytes_per_frame(&config->sample_format);
   /* ignore SIGPIPE */
   signal(SIGPIPE, SIG_IGN);
   bpf = bytes_per_frame(&config->sample_format);
   /* ignore SIGPIPE */
   signal(SIGPIPE, SIG_IGN);