Remove an obsolete comment.

[cubemap] / server.cpp

diff --git a/server.cpp b/server.cpp
index 946dc5d1df12d0c5b9c3d88058c0b5dad68c5a8d..a418d1c660d409b0ea85162696f9a33de01dc330 100644 (file)
--- a/server.cpp
+++ b/server.cpp
@@ -337,8 +337,18 @@ void Server::set_header(int stream_index, const string &http_header, const strin
        MutexLock lock(&mutex);
        assert(stream_index >= 0 && stream_index < ssize_t(streams.size()));
        streams[stream_index]->http_header = http_header;
+
+       if (stream_header != streams[stream_index]->stream_header) {
+               // We cannot start at any of the older starting points anymore,
+               // since they'd get the wrong header for the stream (not to mention
+               // that a changed header probably means the stream restarted,
+               // which means any client starting on the old one would probably
+               // stop playing properly at the change point). Next block
+               // should be a suitable starting point (if not, something is
+               // pretty strange), so it will fill up again soon enough.
+               streams[stream_index]->suitable_starting_points.clear();
+       }
        streams[stream_index]->stream_header = stream_header;
-       // FIXME: We should reset last_suitable_starting_point at this point.
 }
        
 void Server::set_pacing_rate(int stream_index, uint32_t pacing_rate)
@@ -469,8 +479,6 @@ sending_header_or_error_again:
                            0);
                        client->state = Client::SENDING_DATA;
                } else {
-                       // client->stream_pos should be -1, but it might not be,
-                       // if we have clients from an older version.
                        client->stream_pos = client->stream->bytes_received;
                        client->state = Client::WAITING_FOR_KEYFRAME;
                }