X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.h;fp=stream.h;h=9a9982a3541d489f72b63a18228f1e1d1910acca;hp=3a9474a78bf0fcacebd3b7fdfe31dafc35a7303c;hb=00cf4a1ffcb987ef6d27fcf49811fd5ef572a985;hpb=b2d3112addcc8da422f08708db29435b45d85afa

diff --git a/stream.h b/stream.h
index 3a9474a..9a9982a 100644
--- a/stream.h
+++ b/stream.h
@@ -93,11 +93,11 @@ struct Stream {
 
 	// Queued data, if any. Protected by <queued_data_mutex>.
 	// The data pointers in the iovec are owned by us.
-	std::vector<iovec> queued_data;
-
-	// Index of the last element in queued_data that is suitable to start streaming at.
-	// -1 if none. Protected by <queued_data_mutex>.
-	int queued_data_last_starting_point_index;
+	struct DataElement {
+		iovec data;
+		StreamStartSuitability suitable_for_stream_start;
+	};
+	std::vector<DataElement> queued_data;
 
 	// Put client to sleep, since there is no more data for it; we will on
 	// longer listen on POLLOUT until we get more data. Also, it will be put
@@ -118,7 +118,7 @@ private:
 	// Adds data directly to the stream file descriptor, without adding headers or
 	// going through <queued_data>.
 	// You should hold the owning Server's <mutex>.
-	void add_data_raw(const std::vector<iovec> &data);
+	void add_data_raw(const std::vector<DataElement> &data);
 };
 
 #endif  // !defined(_STREAM_H)