X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=stream.cpp;fp=stream.cpp;h=7f4bce8c5825380f0be1b7e2ddfec9fcc328b903;hp=df131932435fd9a095edc50ec50c3c099a66a5a7;hb=b2d3112addcc8da422f08708db29435b45d85afa;hpb=1f9e2a199957bd4c42bf56873d80c4c71381c3b4

diff --git a/stream.cpp b/stream.cpp
index df13193..7f4bce8 100644
--- a/stream.cpp
+++ b/stream.cpp
@@ -28,7 +28,7 @@ Stream::Stream(const string &url, size_t backlog_size, size_t prebuffering_bytes
 	  bytes_received(0),
 	  last_suitable_starting_point(-1),
 	  pacing_rate(~0U),
-	  queued_data_last_starting_point(-1)
+	  queued_data_last_starting_point_index(-1)
 {
 	if (data_fd == -1) {
 		exit(1);
@@ -54,7 +54,7 @@ Stream::Stream(const StreamProto &serialized, int data_fd)
 	  prebuffering_bytes(serialized.prebuffering_bytes()),
 	  bytes_received(serialized.bytes_received()),
 	  pacing_rate(~0U),
-	  queued_data_last_starting_point(-1)
+	  queued_data_last_starting_point_index(-1)
 {
 	if (data_fd == -1) {
 		exit(1);
@@ -208,7 +208,7 @@ void Stream::add_data_deferred(const char *data, size_t bytes, StreamStartSuitab
 	assert(suitable_for_stream_start == SUITABLE_FOR_STREAM_START ||
 	       suitable_for_stream_start == NOT_SUITABLE_FOR_STREAM_START);
 	if (suitable_for_stream_start == SUITABLE_FOR_STREAM_START) {
-		queued_data_last_starting_point = queued_data.size();
+		queued_data_last_starting_point_index = queued_data.size();
 	}
 
 	if (encoding == Stream::STREAM_ENCODING_METACUBE) {
@@ -246,7 +246,7 @@ void Stream::add_data_deferred(const char *data, size_t bytes, StreamStartSuitab
 void Stream::process_queued_data()
 {
 	std::vector<iovec> queued_data_copy;
-	int queued_data_last_starting_point_copy = -1;
+	int queued_data_last_starting_point_index_copy = -1;
 
 	// Hold the lock for as short as possible, since add_data_raw() can possibly
 	// write to disk, which might disturb the input thread.
@@ -257,15 +257,15 @@ void Stream::process_queued_data()
 		}
 
 		swap(queued_data, queued_data_copy);
-		swap(queued_data_last_starting_point, queued_data_last_starting_point_copy);
+		swap(queued_data_last_starting_point_index, queued_data_last_starting_point_index_copy);
 	}
 
 	// Update the last suitable starting point for the stream,
 	// if the queued data contains such a starting point.
-	assert(queued_data_last_starting_point_copy < ssize_t(queued_data_copy.size()));
-	if (queued_data_last_starting_point_copy >= 0) {
+	assert(queued_data_last_starting_point_index_copy < ssize_t(queued_data_copy.size()));
+	if (queued_data_last_starting_point_index_copy >= 0) {
 		last_suitable_starting_point = bytes_received;
-		for (int i = 0; i < queued_data_last_starting_point_copy; ++i) {
+		for (int i = 0; i < queued_data_last_starting_point_index_copy; ++i) {
 			last_suitable_starting_point += queued_data_copy[i].iov_len;
 		}
 	}