Fix an issue where Metacube output would not include updated headers (e.g. on encoder...

[cubemap] / stream.h

diff --git a/stream.h b/stream.h
index 057a48cbe08e516be02f756ce4aeac3701672ee2..9995765b2db95042fbe1c6369e9d3c2114896400 100644 (file)
--- a/stream.h
+++ b/stream.h
@@ -15,11 +15,6 @@
 class StreamProto;
 struct Client;
 
-enum StreamStartSuitability {
-       NOT_SUITABLE_FOR_STREAM_START,
-       SUITABLE_FOR_STREAM_START,
-};
-
 struct Stream {
        // Must be in sync with StreamConfig::Encoding.
        enum Encoding { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE };
@@ -99,7 +94,7 @@ struct Stream {
        // The data pointers in the iovec are owned by us.
        struct DataElement {
                iovec data;
-               StreamStartSuitability suitable_for_stream_start;
+               uint16_t metacube_flags;
        };
        std::vector<DataElement> queued_data;
 
@@ -110,7 +105,7 @@ struct Stream {
 
        // Add more data to <queued_data>, adding Metacube headers if needed.
        // Does not take ownership of <data>.
-       void add_data_deferred(const char *data, size_t bytes, StreamStartSuitability suitable_for_stream_start);
+       void add_data_deferred(const char *data, size_t bytes, uint16_t metacube_flags);
 
        // Add queued data to the stream, if any.
        // You should hold the owning Server's <mutex>.