X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=6535da04eef8adb1da56d257496b9ad6d78324d6;hp=194ffc7fa97c77fcdc13d9872a234141bb762cb3;hb=9bb62cbda887f69e570a3ea0fd28b564c5adc2c9;hpb=afb6264b5c56ce9e8c85b336bd247caa55b97478 diff --git a/main.cpp b/main.cpp index 194ffc7..6535da0 100644 --- a/main.cpp +++ b/main.cpp @@ -420,12 +420,6 @@ start: data_fds.push_back(stream.data_fds(j)); } - // Older versions stored the data once in the protobuf instead of - // sending around file descriptors. - if (data_fds.empty() && stream.has_data()) { - data_fds.push_back(make_tempfile(stream.data())); - } - servers->add_stream_from_serialized(stream, data_fds); deserialized_urls.insert(stream.url()); @@ -437,15 +431,6 @@ start: for (int i = 0; i < loaded_state.inputs_size(); ++i) { InputProto serialized_input = loaded_state.inputs(i); - // Older versions did not store the stream header in the input, - // only in each stream. We need to have the stream header in the - // input as well, in case we create a new stream reusing the same input. - // Thus, we put it into place here if it's missing. - if (!serialized_input.has_stream_header() && - stream_headers_for_url.count(serialized_input.url()) != 0) { - serialized_input.set_stream_header(stream_headers_for_url[serialized_input.url()]); - } - InputWithRefcount iwr; iwr.input = create_input(serialized_input); iwr.refcount = 0;