Merge branch 'master' into vaapi

sunshine/main.cpp

@@ -17,6 +17,8 @@
 #include <boost/log/sources/severity_logger.hpp>
 
 #include "config.h"
+#include "confighttp.h"
+#include "httpcommon.h"
 #include "nvhttp.h"
 #include "rtsp.h"
 #include "thread_pool.h"
@@ -128,18 +130,7 @@ int main(int argc, char *argv[]) {
     shutdown_event->raise(true);
   });
 
-  auto proc_opt = proc::parse(config::stream.file_apps);
-  if(!proc_opt) {
-    return 7;
-  }
-
-  {
-    proc::ctx_t ctx;
-    ctx.name = "Desktop"s;
-    proc_opt->get_apps().emplace(std::begin(proc_opt->get_apps()), std::move(ctx));
-  }
-
-  proc::proc = std::move(*proc_opt);
+  proc::refresh(config::stream.file_apps);
 
   auto deinit_guard = platf::init();
   if(!deinit_guard) {
@@ -150,13 +141,16 @@ int main(int argc, char *argv[]) {
   if(video::init()) {
     return 2;
   }
-
+  http::init(shutdown_event);
   task_pool.start(1);
 
   std::thread httpThread { nvhttp::start, shutdown_event };
+  std::thread configThread { confighttp::start, shutdown_event };
   stream::rtpThread(shutdown_event);
 
   httpThread.join();
+  configThread.join();
+
   task_pool.stop();
   task_pool.join();