rtp-address command allows client to query server config

[disorder] / lib / configuration.c

diff --git a/lib/configuration.c b/lib/configuration.c
index 69b8bb7e9affc261dde6774e2c5ce18b0c156bc4..a506ee948fe8439167324c928017c341aca36d93 100644 (file)
--- a/lib/configuration.c
+++ b/lib/configuration.c
@@ -439,7 +439,7 @@ static int set_backend(const struct config_state *cs,
     return -1;
   }
   if(!strcmp(vec[0], "alsa")) {
-#if API_ALSA
+#if HAVE_ALSA_ASOUNDLIB_H
     *valuep = BACKEND_ALSA;
 #else
     error(0, "%s:%d: ALSA is not available on this platform",
@@ -450,7 +450,23 @@ static int set_backend(const struct config_state *cs,
     *valuep = BACKEND_COMMAND;
   else if(!strcmp(vec[0], "network"))
     *valuep = BACKEND_NETWORK;
-  else {
+  else if(!strcmp(vec[0], "coreaudio")) {
+#if HAVE_COREAUDIO_AUDIOHARDWARE_H
+    *valuep = BACKEND_COREAUDIO;
+#else
+    error(0, "%s:%d: Core Audio is not available on this platform",
+         cs->path, cs->line);
+    return -1;
+#endif
+  } else if(!strcmp(vec[0], "oss")) {
+#if HAVE_SYS_SOUNDCARD_H
+    *valuep = BACKEND_OSS;
+#else
+    error(0, "%s:%d: OSS is not available on this platform",
+         cs->path, cs->line);
+    return -1;
+#endif
+  } else {
     error(0, "%s:%d: invalid '%s' value '%s'",
          cs->path, cs->line, whoami->name, vec[0]);
     return -1;
@@ -857,6 +873,7 @@ static const struct conf conf[] = {
   { C(nice_rescan),      &type_integer,          validate_non_negative },
   { C(nice_server),      &type_integer,          validate_any },
   { C(nice_speaker),     &type_integer,          validate_any },
+  { C(noticed_history),  &type_integer,          validate_positive },
   { C(password),         &type_string,           validate_any },
   { C(player),           &type_stringlist_accum, validate_player },
   { C(plugins),          &type_string_accum,     validate_isdir },
@@ -992,6 +1009,7 @@ static struct config *config_default(void) {
   c->speaker_backend = -1;
   c->multicast_ttl = 1;
   c->authorization_algorithm = xstrdup("sha1");
+  c->noticed_history = 31;
   return c;
 }
 
@@ -1066,8 +1084,12 @@ static void config_postdefaults(struct config *c,
     else if(c->broadcast.n)
       c->speaker_backend = BACKEND_NETWORK;
     else {
-#if API_ALSA
+#if HAVE_ALSA_ASOUNDLIB_H
       c->speaker_backend = BACKEND_ALSA;
+#elif HAVE_SYS_SOUNDCARD_H
+      c->speaker_backend = BACKEND_OSS;
+#elif HAVE_COREAUDIO_AUDIOHARDWARE_H
+      c->speaker_backend = BACKEND_COREAUDIO;
 #else
       c->speaker_backend = BACKEND_COMMAND;
 #endif
@@ -1079,13 +1101,21 @@ static void config_postdefaults(struct config *c,
     if(c->speaker_backend == BACKEND_NETWORK && !c->broadcast.n)
       fatal(0, "speaker_backend is network but broadcast is not set");
   }
-  if(c->speaker_backend) {
-    /* Override sample format */
+  /* Override sample format */
+  switch(c->speaker_backend) {
+  case BACKEND_NETWORK:
     c->sample_format.rate = 44100;
     c->sample_format.channels = 2;
     c->sample_format.bits = 16;
     c->sample_format.endian = ENDIAN_BIG;
-  }
+    break;
+  case BACKEND_COREAUDIO:
+    c->sample_format.rate = 44100;
+    c->sample_format.channels = 2;
+    c->sample_format.bits = 16;
+    c->sample_format.endian = ENDIAN_NATIVE;
+    break; 
+ }
 }
 
 /** @brief (Re-)read the config file