Refer to streams internally mostly by an index, not the stream_id.

[cubemap] / config.cpp

diff --git a/config.cpp b/config.cpp
index c5547bda4f5d62ef155ffa4cf1381819658c90f4..405033868f65f8c804cff3570e4e384dbf198d94 100644 (file)
--- a/config.cpp
+++ b/config.cpp
@@ -189,12 +189,12 @@ bool parse_stream(const ConfigLine &line, Config *config)
        }
 
        StreamConfig stream;
-       stream.stream_id = line.arguments[0];
+       stream.url = line.arguments[0];
 
        map<string, string>::const_iterator src_it = line.parameters.find("src");
        if (src_it == line.parameters.end()) {
                log(WARNING, "stream '%s' has no src= attribute, clients will not get any data.",
-                       stream.stream_id.c_str());
+                       stream.url.c_str());
        } else {
                stream.src = src_it->second;
                // TODO: Verify that the URL is parseable?