More support for multiple input types.

[cubemap] / main.cpp

diff --git a/main.cpp b/main.cpp
index e258c86424dddcdd614dd3784d4ef59d40c50725..03ef0d7aaa5ef587cd2547be0b07b38abe0f7183 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -25,7 +25,6 @@
 #include "server.h"
 #include "serverpool.h"
 #include "input.h"
-#include "httpinput.h"
 #include "stats.h"
 #include "version.h"
 #include "state.pb.h"
@@ -269,7 +268,7 @@ vector<Input *> create_inputs(const vector<ConfigLine> &config,
                        deserialized_inputs->erase(deserialized_input_it);
                }
                if (input == NULL) {
-                       input = new HTTPInput(stream_id, src);
+                       input = create_input(stream_id, src);
                }
                input->run();
                inputs.push_back(input);
@@ -360,7 +359,7 @@ int main(int argc, char **argv)
                for (int i = 0; i < loaded_state.inputs_size(); ++i) {
                        deserialized_inputs.insert(make_pair(
                                loaded_state.inputs(i).stream_id(),
-                               new HTTPInput(loaded_state.inputs(i))));
+                               create_input(loaded_state.inputs(i))));
                } 
 
                // Convert the acceptor from older serialized formats.