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

[cubemap] / stream.h

diff --git a/stream.h b/stream.h
index a57c6d88e7ff0955a68e0d02fceeb0910bd7491f..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,17 +15,30 @@ 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.
+       void set_backlog_size(size_t new_size);
+
        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.
        //
@@ -60,14 +74,17 @@ struct Stream {
        // in the list of clients to wake up when we do.
        void put_client_to_sleep(Client *client);
 
-       // Add more input data to the stream, and wake up all clients that are sleeping.
+       // Add more input data to the stream. You should probably call wake_up_all_clients()
+       // after that.
        void add_data(const char *data, ssize_t bytes);
 
+       // We have more data, so mark all clients that are sleeping as ready to go.
+       void wake_up_all_clients();
+
 private:
        Stream(const Stream& other);
 
-       // We have more data, so mark all clients that are sleeping as ready to go.
-       void wake_up_all_clients();
+       void add_data_raw(const char *data, ssize_t bytes);
 };
 
 #endif  // !defined(_STREAM_H)