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

[nageru] / nageru / mixer.h

diff --git a/nageru/mixer.h b/nageru/mixer.h
index 992bcb9b182e08d8fcfb19ffc82f0bd143914b4c..3ed6c5f5c9baac664fc48d6a31f40cc60498155a 100644 (file)
--- a/nageru/mixer.h
+++ b/nageru/mixer.h
@@ -28,12 +28,12 @@
 #include "audio_mixer.h"
 #include "bmusb/bmusb.h"
 #include "defs.h"
-#include "httpd.h"
+#include "shared/httpd.h"
 #include "input_state.h"
 #include "libusb.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
-#include "ref_counted_gl_sync.h"
+#include "shared/ref_counted_gl_sync.h"
 #include "theme.h"
 #include "shared/timebase.h"
 #include "video_encoder.h"