X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=config.h;h=2e052876cd0a43e3bfa381c4db385dcc0a77abc2;hp=5a006cad29054c919f2f629917eb88d4c2abb748;hb=f01fb2bf103f8d73563d67139a2c2d4de784c37e;hpb=4934a0983fee26765a3c1a5b6bf5834ba6e7e52c

diff --git a/config.h b/config.h
index 5a006ca..2e05287 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 {
@@ -26,7 +28,7 @@ struct UDPStreamConfig {
 	int multicast_iface_index;  // Default is -1 (use operating system default).
 };
 
-struct PingConfig {
+struct Gen204Config {
 	std::string url;  // As seen by the client.
 	std::string allow_origin;  // Can be empty.
 };
@@ -45,7 +47,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;