Use in-class initialization for making it harder to forget to set a default.

[cubemap] / stream.h

diff --git a/stream.h b/stream.h
index 057a48cbe08e516be02f756ce4aeac3701672ee2..6c757a19ff29224f1049c2fc8554d4c24f36af0a 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 };
@@ -77,7 +72,7 @@ struct Stream {
 
        // How many bytes this stream have received. Can very well be larger
        // than <backlog_size>, since the buffer wraps.
-       size_t bytes_received;
+       size_t bytes_received = 0;
 
        // A list of points in the stream that is suitable to start new clients at
        // (after having sent the header). Empty if no such point exists yet.
@@ -93,13 +88,13 @@ struct Stream {
        std::vector<Client *> to_process;
 
        // Maximum pacing rate for the stream.
-       uint32_t pacing_rate;
+       uint32_t pacing_rate = ~0U;
 
        // Queued data, if any. Protected by <queued_data_mutex>.
        // 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>.