Separate notion of configured audio backend from Disobedience/playrtp

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index de251970855cc103316b2f503bf192e0dc6528ff..a06524cb3133b8c53c28621242e7075c275d6e14 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -189,6 +189,16 @@ struct config {
 #define BACKEND_COREAUDIO 3            /**< Use Core Audio (Mac only) */
 #define BACKEND_OSS 4                  /**< Use OSS */
 
+#if HAVE_ALSA_ASOUNDLIB_H
+# define DEFAULT_BACKEND BACKEND_ALSA
+#elif HAVE_SYS_SOUNDCARD_H || EMPEG_HOST
+# define DEFAULT_BACKEND BACKEND_OSS
+#elif HAVE_COREAUDIO_AUDIOHARDWARE_H
+# define DEFAULT_BACKEND BACKEND_COREAUDIO
+#else
+# error Cannot choose a default backend
+#endif
+
   /** @brief Home directory for state files */
   const char *home;
 
@@ -270,6 +280,9 @@ struct config {
 
   /** @brief Minimum interval between password reminder emails */
   long reminder_interval;
+
+  /** @brief Whether to allow user management over TCP */
+  int remote_userman;
   
   /* derived values: */
   int nparts;                          /* number of distinct name parts */