speaker protocol redesign to cope with libao re-opening

[disorder] / lib / configuration.h

diff --git a/lib/configuration.h b/lib/configuration.h
index eabbcce5a42c58151231bbaf03f72445498ab4cf..84b1eb858de8601fd82620fb84cf35d190c9124a 100644 (file)
--- a/lib/configuration.h
+++ b/lib/configuration.h
@@ -24,7 +24,7 @@
 #ifndef CONFIGURATION_H
 #define CONFIGURATION_H
 
-#include <ao/ao.h>
+#include "speaker-protocol.h"
 
 struct real_pcre;
 
@@ -162,7 +162,7 @@ struct config {
   const char *speaker_command;
 
   /** @brief Target sample format */
-  ao_sample_format sample_format;
+  struct stream_header sample_format;
 
   /** @brief Sox syntax generation */
   long sox_generation;