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

[cubemap] / httpinput.cpp

diff --git a/httpinput.cpp b/httpinput.cpp
index f92ac13ca9ca010f1b2a8efb2d45cba68c40b12f..c30651ed3e5c42100a7f5cc0d16f56e8b7c7751f 100644 (file)
--- a/httpinput.cpp
+++ b/httpinput.cpp
@@ -240,8 +240,8 @@ bool HTTPInput::parse_response(const std::string &request)
                http_header.append(it->first + ": " + it->second + "\r\n");
        }
 
-       for (size_t i = 0; i < stream_ids.size(); ++i) {
-               servers->set_header(stream_ids[i], http_header, "");
+       for (size_t i = 0; i < stream_indices.size(); ++i) {
+               servers->set_header(stream_indices[i], http_header, "");
        }
 
        return true;
@@ -264,8 +264,8 @@ void HTTPInput::do_work()
                        request_bytes_sent = 0;
                        response.clear();
                        pending_data.clear();
-                       for (size_t i = 0; i < stream_ids.size(); ++i) {
-                               servers->set_header(stream_ids[i], "", "");
+                       for (size_t i = 0; i < stream_indices.size(); ++i) {
+                               servers->set_header(stream_indices[i], "", "");
                        }
 
                        {
@@ -466,12 +466,12 @@ void HTTPInput::process_data(char *ptr, size_t bytes)
                char *inner_data = pending_data.data() + sizeof(metacube_block_header);
                if (flags & METACUBE_FLAGS_HEADER) {
                        string header(inner_data, inner_data + size);
-                       for (size_t i = 0; i < stream_ids.size(); ++i) {
-                               servers->set_header(stream_ids[i], http_header, header);
+                       for (size_t i = 0; i < stream_indices.size(); ++i) {
+                               servers->set_header(stream_indices[i], http_header, header);
                        }
                } else { 
-                       for (size_t i = 0; i < stream_ids.size(); ++i) {
-                               servers->add_data(stream_ids[i], inner_data, size);
+                       for (size_t i = 0; i < stream_indices.size(); ++i) {
+                               servers->add_data(stream_indices[i], inner_data, size);
                        }
                }