From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Fri, 6 Apr 2018 17:13:21 +0000 (+0200)
Subject: Do not serialize prebuffering_bytes in StreamProto.
X-Git-Tag: 1.4.0~29
X-Git-Url: https://git.sesse.net/?p=cubemap;a=commitdiff_plain;h=a8c43c314bbda25fa53b487042b4f8f85cb34c2d;hp=2494f1e73d7910cfba3808be0bce9697f28df094;ds=sidebyside

Do not serialize prebuffering_bytes in StreamProto.

There's no need to do this now that we can't have zombie streams anymore
(to be honest, the reason used to be rather thin already; it probably was
rather unintentional).
---

diff --git a/state.proto b/state.proto
index 35d5c50..e6aefb5 100644
--- a/state.proto
+++ b/state.proto
@@ -28,7 +28,7 @@ message StreamProto {
 	optional bytes stream_header = 7;
 	repeated int32 data_fds = 8;
 	optional int64 backlog_size = 5 [default=10485760];
-	optional int64 prebuffering_bytes = 10 [default=0];
+	// Tag 10 is unused from 1.4.0 up (it used to be prebuffering_bytes).
 	optional int64 bytes_received = 3;
 	repeated int64 suitable_starting_point = 9;
 	optional string url = 4;
diff --git a/stream.cpp b/stream.cpp
index 3a4ccc3..0b494fb 100644
--- a/stream.cpp
+++ b/stream.cpp
@@ -46,7 +46,6 @@ Stream::Stream(const StreamProto &serialized, int data_fd)
 	  encoding(Stream::STREAM_ENCODING_RAW),  // Will be changed later.
 	  data_fd(data_fd),
 	  backlog_size(serialized.backlog_size()),
-	  prebuffering_bytes(serialized.prebuffering_bytes()),
 	  bytes_received(serialized.bytes_received())
 {
 	if (data_fd == -1) {
@@ -71,7 +70,6 @@ StreamProto Stream::serialize()
 	serialized.set_stream_header(stream_header);
 	serialized.add_data_fds(data_fd);
 	serialized.set_backlog_size(backlog_size);
-	serialized.set_prebuffering_bytes(prebuffering_bytes);
 	serialized.set_bytes_received(bytes_received);
 	for (size_t point : suitable_starting_points) {
 		serialized.add_suitable_starting_point(point);