X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=0218623c0ed6ea670182e54d17094a94f4e0f996;hp=eaec887e30eef776e8eb4bf31018ec05ddbcc4ff;hb=6889a665614e926437484a556124a5ff60363568;hpb=b08dc2a81825a298a03f2dee2ae7dd7045e72739 diff --git a/main.cpp b/main.cpp index eaec887..0218623 100644 --- a/main.cpp +++ b/main.cpp @@ -166,6 +166,7 @@ void create_streams(const Config &config, if (deserialized_urls.count(stream_config.url) == 0) { stream_index = servers->add_stream(stream_config.url, stream_config.backlog_size, + stream_config.prebuffering_bytes, Stream::Encoding(stream_config.encoding)); } else { stream_index = servers->lookup_stream_by_url(stream_config.url); @@ -204,7 +205,8 @@ void create_streams(const Config &config, int stream_index = servers->add_udpstream( udpstream_config.dst, udpstream_config.pacing_rate, - udpstream_config.ttl); + udpstream_config.ttl, + udpstream_config.multicast_iface_index); string src = udpstream_config.src; if (!src.empty()) { @@ -427,7 +429,7 @@ start: // Deserialize the acceptors. for (int i = 0; i < loaded_state.acceptors_size(); ++i) { - sockaddr_in6 sin6 = ExtractAddressFromAcceptorProto(loaded_state.acceptors(i)); + sockaddr_in6 sin6 = extract_address_from_acceptor_proto(loaded_state.acceptors(i)); deserialized_acceptors.insert(make_pair( sin6, new Acceptor(loaded_state.acceptors(i))));