X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.cpp;h=b8604012f628fcce938e5861908af82436e1e0d6;hp=37961fadad9253c09b01745233c62256ab115f18;hb=58d50f2d9710403ea7bddf0fb290a90777c8dd68;hpb=ef7f588a9b7a63ba2153cd06ce5322db4453fa16

diff --git a/stream.cpp b/stream.cpp
index 37961fa..b860401 100644
--- 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;
 }
@@ -222,7 +222,7 @@ void Stream::add_data_deferred(const char *data, size_t bytes)
 
 		queued_data.push_back(iov);
 	} else {
-		assert(encoding == Stream::STREAM_ENCODING_RAW);
+		assert(false);
 	}
 }