X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=03ef0d7aaa5ef587cd2547be0b07b38abe0f7183;hp=04d0d3da33b26bd6ae0a44942964d08c230682b2;hb=7c4707af4ea7af05e34bc0414d18d9fd54e4f23e;hpb=239a9eab1a2468b401183745a24b2fbd590a6998

diff --git a/main.cpp b/main.cpp
index 04d0d3d..03ef0d7 100644
--- a/main.cpp
+++ b/main.cpp
@@ -25,8 +25,8 @@
 #include "server.h"
 #include "serverpool.h"
 #include "input.h"
-#include "httpinput.h"
 #include "stats.h"
+#include "version.h"
 #include "state.pb.h"
 
 using namespace std;
@@ -268,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);
@@ -323,7 +323,7 @@ void create_streams(const vector<ConfigLine> &config,
 
 int main(int argc, char **argv)
 {
-	fprintf(stderr, "\nCubemap starting.\n");
+	fprintf(stderr, "\nCubemap " SERVER_VERSION " starting.\n");
 
 	struct timeval serialize_start;
 	bool is_reexec = false;
@@ -359,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.