Rename queued_data_last_starting_point to queued_data_last_starting_point_index,...

[cubemap] / config.cpp

diff --git a/config.cpp b/config.cpp
index f474f8c495f2cd07c624bd87a9e7a0f4d58f3f6c..aa0f670a4b78a0607db4bf8af1d1232a14f21426 100644 (file)
--- a/config.cpp
+++ b/config.cpp
@@ -19,7 +19,7 @@
 
 using namespace std;
 
-#define DEFAULT_BACKLOG_SIZE 1048576
+#define DEFAULT_BACKLOG_SIZE 10485760
 
 struct ConfigLine {
        string keyword;
@@ -188,7 +188,7 @@ bool parse_port(const ConfigLine &line, Config *config)
        }
 
        AcceptorConfig acceptor;
-       acceptor.addr = CreateAnyAddress(port);
+       acceptor.addr = create_any_address(port);
 
        config->acceptors.push_back(acceptor);
        return true;
@@ -235,6 +235,13 @@ bool parse_stream(const ConfigLine &line, Config *config)
                stream.backlog_size = atoi(backlog_it->second.c_str());
        }
 
+       map<string, string>::const_iterator prebuffer_it = line.parameters.find("force_prebuffer");
+       if (prebuffer_it == line.parameters.end()) {
+               stream.prebuffering_bytes = 0;
+       } else {
+               stream.prebuffering_bytes = atoi(prebuffer_it->second.c_str());
+       }
+
        // Parse encoding.
        map<string, string>::const_iterator encoding_parm_it = line.parameters.find("encoding");
        if (encoding_parm_it == line.parameters.end() ||