Merge config aliasing bug fix.

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index acb96b769c46a00ba9e4d412081600c929b191b8..4cb56774671ebeec323d4069d6528bb1d75a919f 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -26,6 +26,7 @@
 
 #include "speaker-protocol.h"
 #include "rights.h"
 
 #include "speaker-protocol.h"
 #include "rights.h"

+#include "addr.h"

 
 struct uaudio;
 
 
 struct uaudio;
 


@@ -154,7 +155,7 @@ struct config {
   long prefsync;                       /* preflog sync interval */
 
   /** @brief Secondary listen address */
   long prefsync;                       /* preflog sync interval */
 
   /** @brief Secondary listen address */

-  struct stringlist listen;
+  struct netaddress listen;

 
   /** @brief Alias format string */
   const char *alias;
 
   /** @brief Alias format string */
   const char *alias;


@@ -171,6 +172,9 @@ struct config {
   /** @brief Command execute by speaker to play audio */
   const char *speaker_command;
 
   /** @brief Command execute by speaker to play audio */
   const char *speaker_command;
 

+  /** @brief Pause mode for command backend */
+  const char *pause_mode;
+  

   /** @brief Target sample format */
   struct stream_header sample_format;
 
   /** @brief Target sample format */
   struct stream_header sample_format;
 


@@ -190,7 +194,7 @@ struct config {
   const char *password;
 
   /** @brief Address to connect to */
   const char *password;
 
   /** @brief Address to connect to */

-  struct stringlist connect;
+  struct netaddress connect;

 
   /** @brief Directories to search for web templates */
   struct stringlist templates;
 
   /** @brief Directories to search for web templates */
   struct stringlist templates;


@@ -230,10 +234,10 @@ struct config {
   struct transformlist transform;      /* path name transformations */
 
   /** @brief Address to send audio data to */
   struct transformlist transform;      /* path name transformations */
 
   /** @brief Address to send audio data to */

-  struct stringlist broadcast;
+  struct netaddress broadcast;

 
   /** @brief Source address for network audio transmission */
 
   /** @brief Source address for network audio transmission */

-  struct stringlist broadcast_from;
+  struct netaddress broadcast_from;

 
   /** @brief RTP delay threshold */
   long rtp_delay_threshold;
 
   /** @brief RTP delay threshold */
   long rtp_delay_threshold;