Do not bother making a METACUBE_FLAGS_HEADER block if it is empty.

[cubemap] / main.cpp

diff --git a/main.cpp b/main.cpp
index fa63549bd7f8a00b1ce05d55ad09c5f594507cfa..c626f46aa26060aab8b09eb2b43c8dfaf269c539 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -143,9 +143,13 @@ void create_streams(const Config &config,
        for (unsigned i = 0; i < config.streams.size(); ++i) {
                const StreamConfig &stream_config = config.streams[i];
                if (deserialized_stream_ids.count(stream_config.stream_id) == 0) {
-                       servers->add_stream(stream_config.stream_id, stream_config.backlog_size);
+                       servers->add_stream(stream_config.stream_id,
+                                           stream_config.backlog_size,
+                                           Stream::Encoding(stream_config.encoding));
                } else {
                        servers->set_backlog_size(stream_config.stream_id, stream_config.backlog_size);
+                       servers->set_encoding(stream_config.stream_id,
+                                             Stream::Encoding(stream_config.encoding));
                }
                expecting_stream_ids.erase(stream_config.stream_id);
 
@@ -381,6 +385,7 @@ start:
                if (input_it->second.refcount == 0) {
                        log(WARNING, "Input '%s' no longer in use, closing.",
                            input_it->first.c_str());
+                       input_it->second.input->close_socket();
                        delete input_it->second.input;
                        inputs.erase(input_it++);
                } else {