core audio support in speaker

[disorder] / server / disorderd.c

diff --git a/server/disorderd.c b/server/disorderd.c
index 4a3915aa466e0896c7d329cb9d125b7244e95ce2..b41dadea0809ad327d1f9bf55cc8efb580ed198e 100644 (file)
--- a/server/disorderd.c
+++ b/server/disorderd.c
@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include "types.h"
 
 #include <stdio.h>
 #include <getopt.h>
@@ -70,6 +71,7 @@ static const struct option options[] = {
   { "log", required_argument, 0, 'l' },
   { "pidfile", required_argument, 0, 'P' },
   { "no-initial-rescan", no_argument, 0, 'N' },
+  { "wide-open", no_argument, 0, 'w' },
   { "syslog", no_argument, 0, 's' },
   { 0, 0, 0, 0 }
 };
@@ -189,7 +191,7 @@ static void fix_path(void) {
   if(!path)
     error(0, "PATH is not set at all!");
 
-  if(*finkbindir)
+  if(*finkbindir && strcmp(finkbindir, "/"))
     /* We appear to be a finkized mac; include fink on the path in case the
      * tools we need are there. */
     byte_xasprintf(&newpath, "PATH=%s:%s:%s:%s", 
@@ -221,6 +223,7 @@ int main(int argc, char **argv) {
     case 'P': pidfile = optarg; break;
     case 'N': initial_rescan = 0; break;
     case 's': logsyslog = 1; break;
+    case 'w': wideopen = 1; break;
     default: fatal(0, "invalid option");
     }
   }
@@ -240,7 +243,7 @@ int main(int argc, char **argv) {
   ev = ev_new();
   if(ev_child_setup(ev)) fatal(0, "ev_child_setup failed");
   /* read config */
-  if(config_read())
+  if(config_read(1))
     fatal(0, "cannot read configuration");
   /* Start the speaker process (as root! - so it can choose its nice value) */
   speaker_setup(ev);
@@ -286,7 +289,7 @@ int main(int argc, char **argv) {
   /* periodically tidy up the database */
   dbgc_after(60);
   /* periodically check the volume */
-  volumecheck_after(60);
+  volumecheck_again(0, 0, 0);
   /* set initial state */
   add_random_track();
   play(ev);