X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=config.h;h=a230731cee52b3a89566ec3f2df143439f258d97;hb=36b82fe4368ddf2922e24fbf79c11034e32e946f;hp=5a006cad29054c919f2f629917eb88d4c2abb748;hpb=4934a0983fee26765a3c1a5b6bf5834ba6e7e52c;p=cubemap

diff --git a/config.h b/config.h
index 5a006ca..a230731 100644
--- a/config.h
+++ b/config.h
@@ -15,7 +15,9 @@ struct StreamConfig {
 	size_t backlog_size;
 	size_t prebuffering_bytes;
 	uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
-	enum { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE } encoding;
+	enum Encoding { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE };
+	Encoding encoding;
+	Encoding src_encoding;
 };
 
 struct UDPStreamConfig {
@@ -24,9 +26,10 @@ struct UDPStreamConfig {
 	uint32_t pacing_rate;  // In bytes per second. Default is ~0U (no limit).
 	int ttl;  // Default is -1 (use operating system default).
 	int multicast_iface_index;  // Default is -1 (use operating system default).
+	StreamConfig::Encoding src_encoding;
 };
 
-struct PingConfig {
+struct Gen204Config {
 	std::string url;  // As seen by the client.
 	std::string allow_origin;  // Can be empty.
 };
@@ -45,7 +48,7 @@ struct Config {
 	int num_servers;
 	std::vector<StreamConfig> streams;
 	std::vector<UDPStreamConfig> udpstreams;
-	std::vector<PingConfig> pings;
+	std::vector<Gen204Config> pings;
 	std::vector<AcceptorConfig> acceptors;
 	std::vector<LogConfig> log_destinations;