Some minor IWYU work in mixer.h.

diff --git a/mixer.cpp b/mixer.cpp
index 9d418c9942622d17ba8a71fe5544bdbd61e6cb6a..1b1e040a88c0142ead695b40468120347484bedb 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -15,6 +15,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <sys/resource.h>
 #include <sys/time.h>
 #include <time.h>
 #include <algorithm>
@@ -28,9 +29,6 @@
 #include <thread>
 #include <utility>
 #include <vector>
-#include <arpa/inet.h>
-#include <sys/time.h>
-#include <sys/resource.h>
 
 #include "bmusb/bmusb.h"
 #include "bmusb/fake_capture.h"
@@ -39,10 +37,10 @@
 #include "defs.h"
 #include "disk_space_estimator.h"
 #include "flags.h"
-#include "video_encoder.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_gl_sync.h"
 #include "timebase.h"
+#include "video_encoder.h"
 
 class QOpenGLContext;
 

diff --git a/mixer.h b/mixer.h
index 547691428ad5fcfe60f5f1720c5d4a36514e2fb2..31ae7ae907f79fc1c2ef8f875fb2f9f89a940ed8 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -3,31 +3,37 @@
 
 // The actual video mixer, running in its own separate background thread.
 
+#include <assert.h>
 #include <epoxy/gl.h>
 #undef Success
-#include <stdbool.h>
-#include <stdint.h>
 
 #include <movit/effect_chain.h>
 #include <movit/flat_input.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <zita-resampler/resampler.h>
+
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
 #include <cstddef>
 #include <functional>
+#include <map>
 #include <memory>
 #include <mutex>
+#include <queue>
 #include <string>
 #include <thread>
 #include <vector>
 
-#include "bmusb/bmusb.h"
 #include "alsa_output.h"
 #include "audio_mixer.h"
+#include "bmusb/bmusb.h"
+#include "correlation_measurer.h"
+#include "defs.h"
 #include "ebu_r128_proc.h"
-#include "video_encoder.h"
 #include "httpd.h"
+#include "input_state.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
@@ -35,12 +41,11 @@
 #include "theme.h"
 #include "timebase.h"
 #include "stereocompressor.h"
-#include "filter.h"
-#include "input_state.h"
-#include "correlation_measurer.h"
+#include "video_encoder.h"
 
-class QuickSyncEncoder;
+class ALSAOutput;
 class QSurface;
+class QuickSyncEncoder;
 namespace movit {
 class Effect;
 class EffectChain;