If make_tempfile() returns -1 in set_backlog_size, exit properly.

[cubemap] / stream.h

diff --git a/stream.h b/stream.h
index 7fabd193d1249016af37a821a5d67b3fce33ef91..7e20aef2f02c6147e952c3804c55f705d39f0363 100644 (file)
--- a/stream.h
+++ b/stream.h
@@ -6,6 +6,7 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <sys/types.h>
 #include <string>
 #include <vector>
 
@@ -14,11 +15,14 @@ class StreamProto;
 struct Client;
 
 struct Stream {
-       Stream(const std::string &stream_id, size_t backlog_size);
+       // Must be in sync with StreamConfig::Encoding.
+       enum Encoding { STREAM_ENCODING_RAW = 0, STREAM_ENCODING_METACUBE };
+
+       Stream(const std::string &stream_id, size_t backlog_size, Encoding encoding);
        ~Stream();
 
        // Serialization/deserialization.
-       Stream(const StreamProto &serialized);
+       Stream(const StreamProto &serialized, int data_fd);
        StreamProto serialize();
 
        // Changes the backlog size, restructuring the data as needed.
@@ -26,8 +30,15 @@ struct Stream {
 
        std::string stream_id;
 
-       // The HTTP response header, plus the video stream header (if any).
-       std::string header;
+       // The HTTP response header, without the trailing double newline.
+       std::string http_header;
+
+       // The video stream header (if any).
+       std::string stream_header;
+
+       // What encoding we apply to the outgoing data (usually raw, but can also
+       // be Metacube, for reflecting to another Cubemap instance).
+       Encoding encoding;
 
        // The stream data itself, stored in a circular buffer.
        //
@@ -72,6 +83,8 @@ struct Stream {
 
 private:
        Stream(const Stream& other);
+
+       void add_data_raw(const char *data, ssize_t bytes);
 };
 
 #endif  // !defined(_STREAM_H)