New run of include-what-you-use.

[cubemap] / config.cpp

diff --git a/config.cpp b/config.cpp
index fad29a5361b7627eb442e0037c2595abcb2a55a7..c5547bda4f5d62ef155ffa4cf1381819658c90f4 100644 (file)
--- a/config.cpp
+++ b/config.cpp
@@ -207,6 +207,18 @@ bool parse_stream(const ConfigLine &line, Config *config)
                stream.backlog_size = atoi(backlog_it->second.c_str());
        }
 
+       // Parse encoding.
+       map<string, string>::const_iterator encoding_parm_it = line.parameters.find("encoding");
+       if (encoding_parm_it == line.parameters.end() ||
+           encoding_parm_it->second == "raw") {
+               stream.encoding = StreamConfig::STREAM_ENCODING_RAW;
+       } else if (encoding_parm_it->second == "metacube") {
+               stream.encoding = StreamConfig::STREAM_ENCODING_METACUBE;
+       } else {
+               log(ERROR, "Parameter 'encoding' must be either 'raw' (default) or 'metacube'");
+               return false;
+       }
+
        // Parse marks, if so desired.
        map<string, string>::const_iterator mark_parm_it = line.parameters.find("mark");
        if (mark_parm_it == line.parameters.end()) {