X-Git-Url: https://git.sesse.net/?p=cubemap;a=blobdiff_plain;f=main.cpp;h=e258c86424dddcdd614dd3784d4ef59d40c50725;hp=db3be63f2d05a2cbcff27afa620205b97405f524;hb=742f56c25bdd54dc438b21cb5e422de520bc7231;hpb=684496ba9c7def1421d045435b6b92e80bc54c74

diff --git a/main.cpp b/main.cpp
index db3be63..e258c86 100644
--- a/main.cpp
+++ b/main.cpp
@@ -25,7 +25,9 @@
 #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;
@@ -267,7 +269,7 @@ vector<Input *> create_inputs(const vector<ConfigLine> &config,
 			deserialized_inputs->erase(deserialized_input_it);
 		}
 		if (input == NULL) {
-			input = new Input(stream_id, src);
+			input = new HTTPInput(stream_id, src);
 		}
 		input->run();
 		inputs.push_back(input);
@@ -322,7 +324,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;
@@ -358,7 +360,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 Input(loaded_state.inputs(i))));
+				new HTTPInput(loaded_state.inputs(i))));
 		} 
 
 		// Convert the acceptor from older serialized formats.