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

[cubemap] / stream.cpp

diff --git a/stream.cpp b/stream.cpp
index ae313087e003ac236d7b6134950e32e441582f8c..99226553451b2b5e8376954883d96e7cab5996f0 100644 (file)
--- a/stream.cpp
+++ b/stream.cpp
@@ -15,8 +15,8 @@
 
 using namespace std;
 
-Stream::Stream(const string &stream_id, size_t backlog_size, Encoding encoding)
-       : stream_id(stream_id),
+Stream::Stream(const string &url, size_t backlog_size, Encoding encoding)
+       : url(url),
          encoding(encoding),
          data_fd(make_tempfile("")),
           backlog_size(backlog_size),
@@ -36,7 +36,7 @@ Stream::~Stream()
 }
 
 Stream::Stream(const StreamProto &serialized, int data_fd)
-       : stream_id(serialized.stream_id()),
+       : url(serialized.url()),
          http_header(serialized.http_header()),
          stream_header(serialized.stream_header()),
          encoding(Stream::STREAM_ENCODING_RAW),  // Will be changed later.
@@ -71,7 +71,7 @@ StreamProto Stream::serialize()
        serialized.add_data_fds(data_fd);
        serialized.set_backlog_size(backlog_size);
        serialized.set_bytes_received(bytes_received);
-       serialized.set_stream_id(stream_id);
+       serialized.set_url(url);
        data_fd = -1;
        return serialized;
 }
@@ -224,13 +224,6 @@ void Stream::add_data_deferred(const char *data, size_t bytes)
        } else {
                assert(encoding == Stream::STREAM_ENCODING_RAW);
        }
-
-       // Add the data itself.
-       iovec iov;
-       iov.iov_base = new char[bytes];
-       memcpy(iov.iov_base, data, bytes);
-       iov.iov_len = bytes;
-       queued_data.push_back(iov);
 }
 
 void Stream::process_queued_data()