Unify httpd.cpp from Nageru and Futatabi (whitespace differences, and metrics support).

[nageru] / futatabi / main.cpp

diff --git a/futatabi/main.cpp b/futatabi/main.cpp
index 41bbb82b41d165a34b4446b87673f814f673def6..46fb200eb149f47eba370d7a23697d992eda463d 100644 (file)
--- a/futatabi/main.cpp
+++ b/futatabi/main.cpp
@@ -20,18 +20,18 @@ extern "C" {
 }
 
 #include "clip_list.h"
-#include "context.h"
+#include "shared/context.h"
 #include "defs.h"
 #include "disk_space_estimator.h"
 #include "shared/ffmpeg_raii.h"
 #include "flags.h"
 #include "frame_on_disk.h"
 #include "frame.pb.h"
-#include "httpd.h"
+#include "shared/httpd.h"
 #include "mainwindow.h"
 #include "player.h"
 #include "shared/post_to_main_thread.h"
-#include "ref_counted_gl_sync.h"
+#include "shared/ref_counted_gl_sync.h"
 #include "shared/timebase.h"
 #include "ui_mainwindow.h"
 #include "vaapi_jpeg_decoder.h"