Remove mark= from cubemap.config.sample, as the option no longer exists.

[cubemap] / state.proto

diff --git a/state.proto b/state.proto
index 99c1e92e657eaf15906f28b5dfa194b0e6ae17f0..9f17e08e0b14d3ae5687c7e979f0636d7b987700 100644 (file)
--- a/state.proto
+++ b/state.proto
@@ -23,13 +23,6 @@ message StreamProto {
        optional int64 bytes_received = 3;
        optional int64 last_suitable_starting_point = 9;
        optional string url = 4;
-
-       // Older versions stored the HTTP and video headers together in this field.
-       optional bytes header = 1;
-
-       // Older versions stored the data in the protobuf instead of sending file
-       // descriptors around.
-       optional bytes data = 2;
 };
 
 // Corresponds to class Input.
@@ -40,6 +33,7 @@ message InputProto {
        optional int32 request_bytes_sent = 5;
        optional bytes response = 6;
        optional bytes http_header = 10;
+       optional bytes stream_header = 14;
        optional bytes pending_data = 7;
        optional bool has_metacube_header = 8;
        optional int32 sock = 9;
@@ -52,6 +46,7 @@ message InputProto {
 message AcceptorProto {
        optional int32 server_sock = 1;
        optional int32 port = 2;
+       optional string addr = 3;  // As a string. Empty is equivalent to "::".
 };
 
 message CubemapStateProto {