Re-run include-what-you-use.

Insignificant compile-time savings this time, but still nice
to have it cleaned up.

diff --git a/aboutdialog.cpp b/aboutdialog.cpp
index 6b74aecd1fe42787d1ac9c2a737c4a3ce4ddf816..94ef345d92d8a690a46a68ebc4c1e5520684f80f 100644 (file)
--- a/aboutdialog.cpp
+++ b/aboutdialog.cpp
@@ -1,5 +1,7 @@
 #include "aboutdialog.h"
 
+#include <QDialogButtonBox>
+
 #include "ui_aboutdialog.h"
 
 using namespace std;

diff --git a/aboutdialog.h b/aboutdialog.h
index 980dc830ad791484835037872df8bedad1582f40..5100c009014320dee93a5bb0c4124ad502108ba3 100644 (file)
--- a/aboutdialog.h
+++ b/aboutdialog.h
@@ -2,11 +2,9 @@
 #define _ABOUTDIALOG_H 1
 
 #include <QDialog>
-#include <string>
-#include <vector>
-#include <sys/time.h>
+#include <QString>
 
-#include "mixer.h"
+class QObject;
 
 namespace Ui {
 class AboutDialog;

diff --git a/alsa_input.cpp b/alsa_input.cpp
index ff726f06f6002de1d992e471e57667c7fd004c0b..158bfaa32e0e914d50a1a29efe52a6cec5fb7bd3 100644 (file)
--- a/alsa_input.cpp
+++ b/alsa_input.cpp
@@ -5,6 +5,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <cstdint>
 
 #include "alsa_pool.h"
 #include "bmusb/bmusb.h"

diff --git a/alsa_input.h b/alsa_input.h
index b08d47ac66729a9730ce4fed7171440669a71056..6bce9134cdcd2a3fb3d381988cc482d4419ccbc1 100644 (file)
--- a/alsa_input.h
+++ b/alsa_input.h
@@ -10,21 +10,17 @@
 // as a whole, since that's what AudioMixer::add_audio() wants.
 
 #include <alsa/asoundlib.h>
-#include <alsa/pcm.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <atomic>
 #include <functional>
+#include <memory>
 #include <string>
 #include <thread>
-#include <unordered_map>
-#include <vector>
 
 #include "bmusb/bmusb.h"
-#include "timebase.h"
 
 class ALSAPool;
-class DeviceSpecProto;
 
 class ALSAInput {
 public:

diff --git a/alsa_output.cpp b/alsa_output.cpp
index d5ee35fd9ec77214b2b10b03e9b7859e56f2b9c9..7dd10244b094d83b9f93c65af0b8e87dc4e5a5c6 100644 (file)
--- a/alsa_output.cpp
+++ b/alsa_output.cpp
@@ -1,5 +1,9 @@
 #include "alsa_output.h"
 
+#include <alsa/asoundlib.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <vector>
 
 using namespace std;

diff --git a/alsa_output.h b/alsa_output.h
index 90223b75baa71d9438cf3ce2c8580f797c347a48..3d1d2ca4add8e5735b046720e612203780b27302 100644 (file)
--- a/alsa_output.h
+++ b/alsa_output.h
@@ -9,7 +9,6 @@
 // probably drift out of sync enough to make a little pop.
 
 #include <alsa/asoundlib.h>
-
 #include <vector>
 
 class ALSAOutput {

diff --git a/alsa_pool.cpp b/alsa_pool.cpp
index 0a7da5946292a45291bae50cf9c21a373596e177..3b6dd7ed3bcaab379accd31f26cd58e00e6de466 100644 (file)
--- a/alsa_pool.cpp
+++ b/alsa_pool.cpp
@@ -1,16 +1,21 @@
 #include "alsa_pool.h"
 
-#include <alsa/control.h>
-#include <alsa/error.h>
-#include <alsa/pcm.h>
+#include <alsa/asoundlib.h>
 #include <assert.h>
+#include <errno.h>
 #include <limits.h>
+#include <poll.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <sys/eventfd.h>
 #include <sys/inotify.h>
 #include <unistd.h>
 #include <algorithm>
+#include <chrono>
+#include <functional>
+#include <iterator>
 #include <memory>
+#include <ratio>
 
 #include "alsa_input.h"
 #include "audio_mixer.h"

diff --git a/alsa_pool.h b/alsa_pool.h
index 7bab80806f309828f160e8bc4580e56d2fe30ff3..904e2ecf971f9850744b5e5a723e00aae073c399 100644 (file)
--- a/alsa_pool.h
+++ b/alsa_pool.h
@@ -1,19 +1,14 @@
 #ifndef _ALSA_POOL_H
 #define _ALSA_POOL_H 1
 
-#include <alsa/asoundlib.h>
 #include <atomic>
-#include <functional>
+#include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
 #include <unordered_map>
 #include <vector>
 
-#include "alsa_input.h"
-#include "bmusb/bmusb.h"
-#include "timebase.h"
-
 class ALSAInput;
 class DeviceSpecProto;
 

diff --git a/audio_encoder.cpp b/audio_encoder.cpp
index 578b0c2e7abec5b3597c7350d75b7cace6b8dc9a..aa343dabf40bdc4a59da2a8fc48b715e45dc58ce 100644 (file)
--- a/audio_encoder.cpp
+++ b/audio_encoder.cpp
@@ -5,18 +5,24 @@ extern "C" {
 #include <libavformat/avformat.h>
 #include <libavresample/avresample.h>
 #include <libavutil/channel_layout.h>
+#include <libavutil/error.h>
 #include <libavutil/frame.h>
+#include <libavutil/mem.h>
+#include <libavutil/opt.h>
 #include <libavutil/rational.h>
 #include <libavutil/samplefmt.h>
-#include <libavutil/opt.h>
 }
 
 #include <assert.h>
-
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "defs.h"
+#include "mux.h"
 #include "timebase.h"
 
 using namespace std;

diff --git a/audio_encoder.h b/audio_encoder.h
index 7bdb02a3657d61675e3ea66354f58ea17e35015a..93adbafce954d6188f3d5ca86770ff7dace53f6c 100644 (file)
--- a/audio_encoder.h
+++ b/audio_encoder.h
@@ -3,18 +3,21 @@
 #ifndef _AUDIO_ENCODER_H
 #define _AUDIO_ENCODER_H 1
 
-#include <memory>
+#include <stddef.h>
+#include <stdint.h>
 #include <string>
 #include <vector>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
 #include <libavresample/avresample.h>
 #include <libavutil/frame.h>
 }
 
 #include "ffmpeg_raii.h"
-#include "mux.h"
+
+class Mux;
 
 class AudioEncoder {
 public:

diff --git a/audio_mixer.cpp b/audio_mixer.cpp
index 46ae44c6f74e73a1f432b712e76008aafdb92394..13532e20a4d506d0fd39b0b46e144599d2b53374 100644 (file)
--- a/audio_mixer.cpp
+++ b/audio_mixer.cpp
@@ -1,19 +1,25 @@
 #include "audio_mixer.h"
 
 #include <assert.h>
-#include <endian.h>
 #include <bmusb/bmusb.h>
-#include <stdio.h>
 #include <endian.h>
-#include <cmath>
-#include <limits>
-#ifdef __SSE__
+#include <math.h>
+#ifdef __SSE2__
 #include <immintrin.h>
 #endif
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <cstddef>
+#include <limits>
+#include <utility>
 
 #include "db.h"
 #include "flags.h"
-#include "mixer.h"
 #include "state.pb.h"
 #include "timebase.h"
 

diff --git a/audio_mixer.h b/audio_mixer.h
index 821171037f6faf70b11e7d8518484380ecbe587f..85f9aedf96a77779b31e3e9a5433710076659208 100644 (file)
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -8,19 +8,19 @@
 //
 // All operations on AudioMixer (except destruction) are thread-safe.
 
-#include <math.h>
+#include <assert.h>
 #include <stdint.h>
+#include <zita-resampler/resampler.h>
 #include <atomic>
+#include <functional>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <set>
+#include <string>
 #include <vector>
-#include <zita-resampler/resampler.h>
 
-#include "alsa_input.h"
 #include "alsa_pool.h"
-#include "bmusb/bmusb.h"
 #include "correlation_measurer.h"
 #include "db.h"
 #include "defs.h"
@@ -30,6 +30,8 @@
 #include "resampling_queue.h"
 #include "stereocompressor.h"
 
+class DeviceSpecProto;
+
 namespace bmusb {
 struct AudioFormat;
 }  // namespace bmusb

diff --git a/benchmark_audio_mixer.cpp b/benchmark_audio_mixer.cpp
index 8fe4710cbc8e834b4f84f6ca44a67309db7c28a1..4b8f84a93ef0458dffa25d8806a54564afa2400e 100644 (file)
--- a/benchmark_audio_mixer.cpp
+++ b/benchmark_audio_mixer.cpp
@@ -2,12 +2,21 @@
 // with the default settings, feeds some white noise to the inputs and
 // runs a while. Useful for e.g. profiling.
 
-#include <stdio.h>
+#include <assert.h>
+#include <bmusb/bmusb.h>
 #include <stdint.h>
-#include <vector>
+#include <stdio.h>
+#include <algorithm>
 #include <chrono>
+#include <cmath>
+#include <ratio>
+#include <vector>
+
 #include "audio_mixer.h"
 #include "db.h"
+#include "defs.h"
+#include "input_mapping.h"
+#include "resampling_queue.h"
 #include "timebase.h"
 
 #define NUM_BENCHMARK_CARDS 4

diff --git a/context.cpp b/context.cpp
index 4736b82b8bbebcc0f6327d27acc132809af025f9..36fa2ea7221c8a971541e43d944bbd966f8b7eeb 100644 (file)
--- a/context.cpp
+++ b/context.cpp
@@ -3,10 +3,9 @@
 #include <QGL>
 #include <QOffscreenSurface>
 #include <QOpenGLContext>
+#include <QSurface>
 #include <QSurfaceFormat>
 
-class QSurface;
-
 QGLWidget *global_share_widget = nullptr;
 
 QSurface *create_surface(const QSurfaceFormat &format)

diff --git a/correlation_measurer.cpp b/correlation_measurer.cpp
index 1e8ff750bb74f51f6a95c1da0ffec56ea992a0e0..d0150a03830d7870fb77aef6bbd17132aa7d954b 100644 (file)
--- a/correlation_measurer.cpp
+++ b/correlation_measurer.cpp
@@ -19,8 +19,8 @@
 #include "correlation_measurer.h"
 
 #include <assert.h>
-#include <stdint.h>
-#include <math.h>
+#include <cmath>
+#include <cstddef>
 
 using namespace std;
 

diff --git a/correlation_meter.cpp b/correlation_meter.cpp
index 005a1e2bb91b47753d23a19a97c1883e616ad961..7b7683a5a1fd4b1158a154c71ced66cbcbd50797 100644 (file)
--- a/correlation_meter.cpp
+++ b/correlation_meter.cpp
@@ -1,8 +1,15 @@
-#include <QPainter>
+#include "correlation_meter.h"
 
 #include <math.h>
+#include <algorithm>
 
-#include "correlation_meter.h"
+#include <QBrush>
+#include <QColor>
+#include <QPainter>
+#include <QRect>
+
+class QPaintEvent;
+class QResizeEvent;
 
 using namespace std;
 

diff --git a/correlation_meter.h b/correlation_meter.h
index 6dc0684c2f498540fb86c2ff710b9a791c552bdb..ea01e04034ecc12196c6b3d13005eaca438bcb74 100644 (file)
--- a/correlation_meter.h
+++ b/correlation_meter.h
@@ -1,10 +1,16 @@
 #ifndef CORRELATION_METER_H
 #define CORRELATION_METER_H
 
-#include <QPaintEvent>
-#include <QWidget>
 #include <mutex>
 
+#include <QPixmap>
+#include <QString>
+#include <QWidget>
+
+class QObject;
+class QPaintEvent;
+class QResizeEvent;
+
 class CorrelationMeter : public QWidget
 {
        Q_OBJECT

diff --git a/decklink_capture.cpp b/decklink_capture.cpp
index 81566cb1a5ad20d85a3be25a8b01e2c24a62906e..505083ff056a72018069ec2e3ae9e2573e5ab51a 100644 (file)
--- a/decklink_capture.cpp
+++ b/decklink_capture.cpp
@@ -1,19 +1,21 @@
 #include "decklink_capture.h"
 
+#include <DeckLinkAPI.h>
+#include <DeckLinkAPIConfiguration.h>
+#include <DeckLinkAPIDiscovery.h>
+#include <DeckLinkAPIModes.h>
 #include <assert.h>
+#ifdef __SSE2__
+#include <immintrin.h>
+#endif
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <cstddef>
-#ifdef __SSE2__
-#include <immintrin.h>
-#endif
+#include <cstdint>
+#include <utility>
+#include <vector>
 
-#include <DeckLinkAPI.h>
-#include <DeckLinkAPIConfiguration.h>
-#include <DeckLinkAPIDiscovery.h>
-#include <DeckLinkAPIModes.h>
 #include "bmusb/bmusb.h"
 
 #define FRAME_SIZE (8 << 20)  // 8 MB.

diff --git a/decklink_capture.h b/decklink_capture.h
index 0a9c37b0494539c3cc5c3bc3f8964793cefa6a77..05eb4a8d29a027b2e5725a93710b8b80b16219c5 100644 (file)
--- a/decklink_capture.h
+++ b/decklink_capture.h
@@ -5,12 +5,17 @@
 #include <stdint.h>
 #include <atomic>
 #include <functional>
+#include <map>
+#include <memory>
 #include <string>
 
+#include "DeckLinkAPIModes.h"
+#include "DeckLinkAPITypes.h"
+#include "LinuxCOM.h"
 #include "bmusb/bmusb.h"
 
 class IDeckLink;
-class IDeckLinkDisplayMode;
+class IDeckLinkConfiguration;
 
 // TODO: Adjust CaptureInterface to be a little less bmusb-centric.
 // There are too many member functions here that don't really do anything.

diff --git a/disk_space_estimator.cpp b/disk_space_estimator.cpp
index 1cb7d6fcfe10f5e10b7fc699e52467d8a7d49282..cacc8117ac5a8e324453ff86dcdb988c5ae0da99 100644 (file)
--- a/disk_space_estimator.cpp
+++ b/disk_space_estimator.cpp
@@ -1,9 +1,10 @@
+#include "disk_space_estimator.h"
+
+#include <stdio.h>
 #include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/vfs.h>
-#include <unistd.h>
+#include <sys/statfs.h>
+#include <memory>
 
-#include "disk_space_estimator.h"
 #include "timebase.h"
 
 DiskSpaceEstimator::DiskSpaceEstimator(DiskSpaceEstimator::callback_t callback)

diff --git a/disk_space_estimator.h b/disk_space_estimator.h
index b585bc37b83ba2324f749599ebfeef70687d453c..2acd4bee10f4113da92761d57d43ef003b47e4c6 100644 (file)
--- a/disk_space_estimator.h
+++ b/disk_space_estimator.h
@@ -10,7 +10,7 @@
 // The bitrate is measured over a simple 30-second sliding window.
 
 #include <stdint.h>
-
+#include <sys/types.h>
 #include <deque>
 #include <functional>
 #include <string>

diff --git a/ebu_r128_proc.cc b/ebu_r128_proc.cc
index d480ce0c053db5e0a08dea21cef8e55b03635a4c..f062eafe6155642da45b8208b747f85fadbc30a8 100644 (file)
--- a/ebu_r128_proc.cc
+++ b/ebu_r128_proc.cc
@@ -19,10 +19,11 @@
 // ------------------------------------------------------------------------
 
 
-#include <string.h>
-#include <math.h>
 #include "ebu_r128_proc.h"
 
+#include <string.h>
+#include <cmath>
+
 
 float Ebu_r128_hist::_bin_power [100] = { 0.0f };
 float Ebu_r128_proc::_chan_gain [5] = { 1.0f, 1.0f, 1.0f, 1.41f, 1.41f };

diff --git a/ffmpeg_raii.cpp b/ffmpeg_raii.cpp
index 042959780c0c5a05f55570c45717b1371430d723..74ea3fd6cd345eea3e12b2bfa73f479d24d1bd49 100644 (file)
--- a/ffmpeg_raii.cpp
+++ b/ffmpeg_raii.cpp
@@ -3,6 +3,8 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavutil/dict.h>
+#include <libavutil/frame.h>
 }
 
 using namespace std;

diff --git a/filter.cpp b/filter.cpp
index c6f9997b9b7387853d41115d72ee02aa36d1ccce..0cb0180d8c4ce4f673112422708f68f5608f9b4d 100644 (file)
--- a/filter.cpp
+++ b/filter.cpp
@@ -1,9 +1,11 @@
+#include <assert.h>
 #include <math.h>
 #include <stdio.h>
 #include <string.h>
-#include <assert.h>
-#include <complex>
 #include <algorithm>
+#include <complex>
+
+#include "defs.h"
 
 #ifdef __SSE__
 #include <mmintrin.h>

diff --git a/filter.h b/filter.h
index a4a3a1349e035b97c592b7d6b5b2e265c0908772..1bf18c9cd5855afdc119bb7c8a399b6e9b560db0 100644 (file)
--- a/filter.h
+++ b/filter.h
@@ -10,20 +10,13 @@
 #define _FILTER_H 1
 
 #define _USE_MATH_DEFINES
-#include <math.h>
-#include <string.h>
+#include <cmath>
 #include <complex>
 
 #ifdef __SSE__
 #include <xmmintrin.h>
 #endif
 
-#include "defs.h"
-
-namespace std {
-template <typename _Tp> struct complex;
-}  // namespace std
-
 enum FilterType
 {
        FILTER_NONE = 0,

diff --git a/glwidget.cpp b/glwidget.cpp
index 9d5e02cd3c72e86207298042c155a092e5599d8f..3aa10fad1032b0e88b71f8b6e56294d1f9fc1139 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -1,33 +1,31 @@
-#include <qmetatype.h>  // Needs to come before egl.h.
-#include <qdatastream.h>  // Needs to come before egl.h.
-#include <qtextstream.h>  // Needs to come before egl.h.
-#include <qcursor.h>  // Needs to come before egl.h.
-#include <qcoreevent.h>  // Needs to come before egl.h.
-#include <qevent.h>  // Needs to come before egl.h.
-#include <epoxy/gl.h>
-#include <epoxy/egl.h>
-#include <QAction>
-#include <QMenu>
-#include <QSurfaceFormat>
-
 #include "glwidget.h"
 
-#include <stdio.h>
-#include <functional>
-#include <limits>
-#include <mutex>
+#include <assert.h>
+#include <bmusb/bmusb.h>
 #include <movit/effect_chain.h>
 #include <movit/resource_pool.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <QAction>
+#include <QActionGroup>
+#include <QList>
+#include <QMenu>
+#include <QPoint>
+#include <QVariant>
+#include <QWidget>
+#include <functional>
+#include <map>
+#include <mutex>
+#include <utility>
 
+#include "audio_mixer.h"
 #include "context.h"
 #include "flags.h"
 #include "mainwindow.h"
 #include "mixer.h"
-#include "qnamespace.h"
 #include "ref_counted_gl_sync.h"
 
 class QMouseEvent;
-class QWidget;
 
 #undef Success
 #include <movit/util.h>

diff --git a/glwidget.h b/glwidget.h
index 3eb55dad47550562307546c3c74a7bce2d577c91..f2eaea8bc00aa0cd95fa40eafa54cdc6edfa67ed 100644 (file)
--- a/glwidget.h
+++ b/glwidget.h
@@ -2,15 +2,16 @@
 #define GLWIDGET_H
 
 #include <epoxy/gl.h>
-#include <QGLWidget>
+#include <QGL>
+#include <QString>
 #include <string>
 #include <vector>
 
 #include "mixer.h"
-#include "qgl.h"
-#include "qobjectdefs.h"
 
 class QMouseEvent;
+class QObject;
+class QPoint;
 class QWidget;
 
 namespace movit {

diff --git a/httpd.cpp b/httpd.cpp
index 3fbab5d6d6630e97e6133a2df44b890b8484cf50..858d9522c9354f1ea275cd0e859e5fef60d30636 100644 (file)
--- a/httpd.cpp
+++ b/httpd.cpp
@@ -1,19 +1,18 @@
-#include <arpa/inet.h>
+#include "httpd.h"
+
 #include <assert.h>
+#include <byteswap.h>
 #include <endian.h>
 #include <microhttpd.h>
+#include <netinet/in.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
-
-#include <vector>
-
-#include "httpd.h"
+#include <sys/time.h>
+#include <time.h>
+#include <memory>
 
 #include "defs.h"
-#include "flags.h"
 #include "metacube2.h"
-#include "timebase.h"
 
 struct MHD_Connection;
 struct MHD_Response;

diff --git a/httpd.h b/httpd.h
index 73410fd427e642cb178f83ba5095318216223ba0..902745a5845b85d5e873914189057846c3a90585 100644 (file)
--- a/httpd.h
+++ b/httpd.h
@@ -3,13 +3,11 @@
 
 // A class dealing with stream output to HTTP.
 
-#include <microhttpd.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <sys/types.h>
 #include <condition_variable>
 #include <deque>
-#include <memory>
 #include <mutex>
 #include <set>
 #include <string>

diff --git a/image_input.cpp b/image_input.cpp
index b8e2b02942b4ea01993131f2ee73acf595479e05..70bffb0f863225c1673a42d3df0f14757ae7c6f2 100644 (file)
--- a/image_input.cpp
+++ b/image_input.cpp
@@ -1,25 +1,39 @@
 #include "image_input.h"
 
+#include <errno.h>
 #include <movit/image_format.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavutil/avutil.h>
+#include <libavutil/error.h>
+#include <libavutil/frame.h>
 #include <libavutil/imgutils.h>
+#include <libavutil/mem.h>
 #include <libavutil/pixfmt.h>
 #include <libswscale/swscale.h>
 }
 
-#include <sys/types.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <fcntl.h>
-
+#include <cstddef>
+#include <functional>
 #include <mutex>
 #include <thread>
+#include <utility>
+#include <vector>
 
 #include "ffmpeg_raii.h"
 #include "flags.h"
+#include "flat_input.h"
+
+struct SwsContext;
 
 using namespace std;
 

diff --git a/image_input.h b/image_input.h
index 3b3c1873763577c2250a48b883cc214b04620592..11c94ce9b626ce65f5fde9a2af895e1fa35de8ad 100644 (file)
--- a/image_input.h
+++ b/image_input.h
@@ -1,16 +1,17 @@
 #ifndef _IMAGE_INPUT_H
 #define _IMAGE_INPUT_H 1
 
+#include <epoxy/gl.h>
+#include <movit/flat_input.h>
+#include <stdbool.h>
+#include <time.h>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
 
-#include <time.h>
-
-#include <movit/flat_input.h>
-
 // An output that takes its input from a static image, loaded with ffmpeg.
 // comes from a single 2D array with chunky pixels. The image is refreshed
 // from disk about every second.

diff --git a/input_mapping.cpp b/input_mapping.cpp
index 4b28a592dec5b8c7d9b4cc865e81c9361067573e..deef92343c75c542b5aa9ecc698e8a4d94dec591 100644 (file)
--- a/input_mapping.cpp
+++ b/input_mapping.cpp
@@ -1,13 +1,14 @@
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
+#include "input_mapping.h"
 
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/io/zero_copy_stream.h>
+#include <assert.h>
+#include <fcntl.h>
 #include <google/protobuf/io/zero_copy_stream_impl.h>
+#include <google/protobuf/text_format.h>
+#include <stdio.h>
+#include <set>
+#include <utility>
 
 #include "audio_mixer.h" 
-#include "input_mapping.h"
 #include "state.pb.h"
 
 using namespace std;

diff --git a/input_mapping_dialog.cpp b/input_mapping_dialog.cpp
index c81e2923e07cfff9864c08daf9d429e4e2b25524..f303280e62215059f246176e7db232ec2a161af8 100644 (file)
--- a/input_mapping_dialog.cpp
+++ b/input_mapping_dialog.cpp
@@ -1,11 +1,29 @@
 #include "input_mapping_dialog.h"
 
-#include "post_to_main_thread.h"
-#include "ui_input_mapping.h"
-
+#include <assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <QAbstractItemView>
 #include <QComboBox>
+#include <QDialogButtonBox>
 #include <QFileDialog>
+#include <QHeaderView>
+#include <QList>
 #include <QMessageBox>
+#include <QPushButton>
+#include <QTableWidget>
+#include <QVariant>
+#include <functional>
+#include <memory>
+#include <set>
+#include <string>
+#include <utility>
+
+#include "alsa_pool.h"
+#include "defs.h"
+#include "post_to_main_thread.h"
+#include "ui_input_mapping.h"
 
 using namespace std;
 using namespace std::placeholders;

diff --git a/input_mapping_dialog.h b/input_mapping_dialog.h
index 3fa11e3fc63c63529d0c3ce73336001c34b52561..640644e3898ce9cca25fc950bf9e350477c1b17b 100644 (file)
--- a/input_mapping_dialog.h
+++ b/input_mapping_dialog.h
@@ -2,12 +2,14 @@
 #define _INPUT_MAPPING_DIALOG_H
 
 #include <QDialog>
-#include <string>
+#include <QString>
+#include <map>
 #include <vector>
-#include <sys/time.h>
 
 #include "audio_mixer.h"
-#include "mixer.h"
+#include "input_mapping.h"
+
+class QObject;
 
 namespace Ui {
 class InputMappingDialog;

diff --git a/lrameter.cpp b/lrameter.cpp
index 8121ee4b1dfdd3b3fced4565e23b78bce34c11d5..62b4a9f923134b101f91254bdae5bff4398a88ed 100644 (file)
--- a/lrameter.cpp
+++ b/lrameter.cpp
@@ -3,9 +3,12 @@
 #include <QPainter>
 #include <QPalette>
 #include <QPen>
+#include <QRect>
+
 #include "vu_common.h"
 
 class QPaintEvent;
+class QResizeEvent;
 
 using namespace std;
 

diff --git a/lrameter.h b/lrameter.h
index 0b887f96aa1c466edae222a55a63c1036bd392e3..7a832dfcd2cc7d4336b239a5b6ffafa49c48b2e0 100644 (file)
--- a/lrameter.h
+++ b/lrameter.h
@@ -2,13 +2,17 @@
 #define LRAMETER_H
 
 #include <math.h>
-#include <QLabel>
-#include <QPaintEvent>
+#include <QPixmap>
+#include <QString>
 #include <QWidget>
 #include <mutex>
 
 #include "vu_common.h"
 
+class QObject;
+class QPaintEvent;
+class QResizeEvent;
+
 class LRAMeter : public QWidget
 {
        Q_OBJECT

diff --git a/main.cpp b/main.cpp
index 37ac4a4ae226943cfb279ddc857f649770427fdd..e2d2cec4ee42c46f12527c9f29be3972302cb0ea 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -5,13 +5,13 @@ extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/mman.h>
-#include <epoxy/gl.h>
-
+#include <epoxy/gl.h>  // IWYU pragma: keep
 #include <QApplication>
 #include <QCoreApplication>
 #include <QGL>
 #include <QSize>
 #include <QSurfaceFormat>
+#include <string>
 
 #include "context.h"
 #include "flags.h"

diff --git a/mainwindow.cpp b/mainwindow.cpp
index eb78d0e545dc73c817c50d8bc762bb579ceee82a..65a612529b540e6fe111b27fca943934f6a155be 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,42 +1,70 @@
 #include "mainwindow.h"
 
-#include <math.h>
-#include <stdio.h>
+#include <assert.h>
 #include <signal.h>
-#include <algorithm>
-#include <chrono>
-#include <string>
-#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <QAbstractButton>
+#include <QAbstractSlider>
+#include <QAction>
+#include <QActionGroup>
+#include <QApplication>
 #include <QBoxLayout>
+#include <QCheckBox>
+#include <QDial>
+#include <QDialog>
+#include <QEvent>
+#include <QFlags>
+#include <QFrame>
+#include <QImage>
 #include <QInputDialog>
 #include <QKeySequence>
 #include <QLabel>
+#include <QLayoutItem>
+#include <QMenuBar>
 #include <QMessageBox>
-#include <QMetaType>
+#include <QMouseEvent>
+#include <QObject>
 #include <QPushButton>
-#include <QResizeEvent>
+#include <QRect>
+#include <QRgb>
 #include <QShortcut>
-#include <QSize>
-#include <QString>
+#include <QStackedWidget>
+#include <QToolButton>
+#include <QWidget>
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <functional>
+#include <limits>
+#include <memory>
+#include <ratio>
+#include <string>
+#include <vector>
 
 #include "aboutdialog.h"
+#include "alsa_pool.h"
+#include "clickable_label.h"
+#include "correlation_meter.h"
 #include "disk_space_estimator.h"
+#include "ellipsis_label.h"
 #include "flags.h"
 #include "glwidget.h"
+#include "input_mapping.h"
 #include "input_mapping_dialog.h"
 #include "lrameter.h"
 #include "midi_mapping.pb.h"
 #include "midi_mapping_dialog.h"
 #include "mixer.h"
+#include "nonlinear_fader.h"
 #include "post_to_main_thread.h"
-#include "ui_audio_miniview.h"
 #include "ui_audio_expanded_view.h"
+#include "ui_audio_miniview.h"
 #include "ui_display.h"
 #include "ui_mainwindow.h"
 #include "vumeter.h"
 
-class QResizeEvent;
-
 using namespace std;
 using namespace std::chrono;
 using namespace std::placeholders;

diff --git a/mainwindow.h b/mainwindow.h
index 8dfbf835db9f412ce79d13c5bab3d19fce38b841..a9dca41a9015ac5a08a49234f1c7d5edb1f896d8 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -1,18 +1,22 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
+#include <stdbool.h>
+#include <sys/types.h>
 #include <QMainWindow>
+#include <QString>
 #include <chrono>
 #include <string>
 #include <vector>
-#include <sys/time.h>
 
+#include "audio_mixer.h"
 #include "midi_mapper.h"
 #include "mixer.h"
 
-class GLWidget;
-class Ui_AudioExpandedView;
+class QEvent;
+class QObject;
 class QResizeEvent;
+class Ui_AudioExpandedView;
 
 namespace Ui {
 class AudioExpandedView;
@@ -21,7 +25,6 @@ class Display;
 class MainWindow;
 }  // namespace Ui
 
-class QDial;
 class QLabel;
 class QPushButton;
 

diff --git a/metacube2.cpp b/metacube2.cpp
index 666355d16867524422b72de72853723725554e88..6b68132237af229745ea032d3e0411e2b5eced04 100644 (file)
--- a/metacube2.cpp
+++ b/metacube2.cpp
@@ -7,7 +7,8 @@
 
 #include "metacube2.h"
 
-#include <arpa/inet.h>
+#include <byteswap.h>
+#include <netinet/in.h>
 
 /*
  * https://www.ece.cmu.edu/~koopman/pubs/KoopmanCRCWebinar9May2012.pdf

diff --git a/midi_mapper.cpp b/midi_mapper.cpp
index 8f43d21bc0de569ecf5d5ad28dcae765bca82cc8..4f0fb48c2da350ad75a5096bea49d003043ba23a 100644 (file)
--- a/midi_mapper.cpp
+++ b/midi_mapper.cpp
@@ -1,18 +1,25 @@
 #include "midi_mapper.h"
 
-#include "audio_mixer.h"
-#include "midi_mapping.pb.h"
-
 #include <alsa/asoundlib.h>
-#include <google/protobuf/text_format.h>
-#include <google/protobuf/io/zero_copy_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl.h>
+#include <assert.h>
+#include <errno.h>
 #include <fcntl.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/io/zero_copy_stream_impl.h>
+#include <google/protobuf/message.h>
+#include <google/protobuf/text_format.h>
+#include <poll.h>
+#include <stdint.h>
+#include <stdio.h>
 #include <sys/eventfd.h>
-
+#include <unistd.h>
+#include <algorithm>
 #include <functional>
 #include <thread>
 
+#include "audio_mixer.h"
+#include "midi_mapping.pb.h"
+
 using namespace google::protobuf;
 using namespace std;
 using namespace std::placeholders;

diff --git a/midi_mapping_dialog.cpp b/midi_mapping_dialog.cpp
index 9e5d11ba83d162de03d742dba6d2ead661927798..783a2331caa487ce675a912a1350428a13cf9da1 100644 (file)
--- a/midi_mapping_dialog.cpp
+++ b/midi_mapping_dialog.cpp
@@ -1,18 +1,29 @@
 #include "midi_mapping_dialog.h"
 
-#include "midi_mapper.h"
-#include "midi_mapping.pb.h"
-#include "post_to_main_thread.h"
-#include "ui_midi_mapping.h"
-
+#include <assert.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/message.h>
 #include <QComboBox>
+#include <QDialogButtonBox>
 #include <QFileDialog>
 #include <QMessageBox>
+#include <QPushButton>
 #include <QSpinBox>
-
+#include <QStringList>
+#include <QTreeWidget>
+#include <stdio.h>
 #include <algorithm>
+#include <cstddef>
+#include <functional>
+#include <limits>
 #include <string>
 
+#include "midi_mapper.h"
+#include "midi_mapping.pb.h"
+#include "ui_midi_mapping.h"
+
+class QObject;
+
 using namespace google::protobuf;
 using namespace std;
 

diff --git a/midi_mapping_dialog.h b/midi_mapping_dialog.h
index a413ef1e19c38a719d68c746d5af40df481c5789..5a1ec3f425a9b4caada9a8fe768e1cb26717636c 100644 (file)
--- a/midi_mapping_dialog.h
+++ b/midi_mapping_dialog.h
@@ -1,21 +1,24 @@
 #ifndef _MIDI_MAPPING_DIALOG_H
 #define _MIDI_MAPPING_DIALOG_H
 
+#include <stdbool.h>
 #include <QDialog>
+#include <QString>
+#include <map>
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>
-#include <sys/time.h>
 
-#include "audio_mixer.h"
 #include "midi_mapper.h"
-#include "mixer.h"
+
+class QEvent;
+class QObject;
 
 namespace Ui {
 class MIDIMappingDialog;
 }  // namespace Ui
 
-class MIDIMapper;
 class MIDIMappingProto;
 class QComboBox;
 class QSpinBox;

diff --git a/mixer.cpp b/mixer.cpp
index aabc67e543fdfade00bc018f86d2cdd837b5d266..780bd52573c3380404cd77a36aa1892bfa8642cf 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -3,7 +3,6 @@
 #include "mixer.h"
 
 #include <assert.h>
-#include <endian.h>
 #include <epoxy/egl.h>
 #include <movit/effect_chain.h>
 #include <movit/effect_util.h>
@@ -16,33 +15,37 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/resource.h>
-#include <sys/time.h>
-#include <time.h>
 #include <algorithm>
 #include <chrono>
-#include <cmath>
 #include <condition_variable>
 #include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <mutex>
+#include <ratio>
 #include <string>
 #include <thread>
 #include <utility>
 #include <vector>
 
+#include "DeckLinkAPI.h"
+#include "LinuxCOM.h"
+#include "alsa_output.h"
 #include "bmusb/bmusb.h"
 #include "bmusb/fake_capture.h"
 #include "context.h"
-#include "db.h"
 #include "decklink_capture.h"
 #include "defs.h"
 #include "disk_space_estimator.h"
 #include "flags.h"
+#include "input_mapping.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_gl_sync.h"
+#include "resampling_queue.h"
 #include "timebase.h"
 #include "video_encoder.h"
 
+class IDeckLink;
 class QOpenGLContext;
 
 using namespace movit;

diff --git a/mixer.h b/mixer.h
index 39b259b45938b4a4dbbf9ffedbf36dcb9c4b5ed3..f5aa4fbdd014758faa047f21bc4dfdf701467a81 100644 (file)
--- a/mixer.h
+++ b/mixer.h
@@ -5,13 +5,11 @@
 
 #include <assert.h>
 #include <epoxy/gl.h>
+
 #undef Success
 
-#include <movit/effect_chain.h>
-#include <movit/flat_input.h>
 #include <stdbool.h>
 #include <stdint.h>
-
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
@@ -25,34 +23,28 @@
 #include <thread>
 #include <vector>
 
-#include "alsa_output.h"
 #include "audio_mixer.h"
 #include "bmusb/bmusb.h"
 #include "defs.h"
 #include "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 "resampling_queue.h"
 #include "theme.h"
 #include "timebase.h"
-#include "stereocompressor.h"
 #include "video_encoder.h"
 
 class ALSAOutput;
 class QSurface;
-class QuickSyncEncoder;
+
 namespace movit {
 class Effect;
 class EffectChain;
 class FlatInput;
 class ResourcePool;
 }  // namespace movit
-
-namespace movit {
-class YCbCrInput;
-}
 class QSurfaceFormat;
 
 // For any card that's not the master (where we pick out the frames as they

diff --git a/mux.cpp b/mux.cpp
index 4f9f4d04a04d9a7221fbe696784c5b43f3158fbc..a7b3a7f838461a9af78f54a2ae93902c26d11c43 100644 (file)
--- a/mux.cpp
+++ b/mux.cpp
@@ -1,12 +1,27 @@
-#include <assert.h>
+#include "mux.h"
 
+#include <assert.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <algorithm>
 #include <mutex>
 #include <string>
+#include <utility>
 #include <vector>
 
+extern "C" {
+#include <libavformat/avio.h>
+#include <libavutil/avutil.h>
+#include <libavutil/dict.h>
+#include <libavutil/mathematics.h>
+#include <libavutil/mem.h>
+#include <libavutil/pixfmt.h>
+#include <libavutil/rational.h>
+}
+
 #include "defs.h"
-#include "mux.h"
 #include "timebase.h"
 
 using namespace std;

diff --git a/mux.h b/mux.h
index 3f5007db9f75c6040415be1a01ce6ccd74059db0..ddf97fe92a591d86ec6dbebd9614cf32fa9a0846 100644 (file)
--- a/mux.h
+++ b/mux.h
@@ -6,12 +6,12 @@
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
-#include <libavformat/avio.h>
 }
 
+#include <sys/types.h>
 #include <functional>
 #include <mutex>
-#include <queue>
+#include <string>
 #include <vector>
 
 class Mux {

diff --git a/nonlinear_fader.cpp b/nonlinear_fader.cpp
index 61317e0acfc0c5c9ba2e871d421e483b6df73b27..4892c6770517b5a8d465fcf9949a808e8332da47 100644 (file)
--- a/nonlinear_fader.cpp
+++ b/nonlinear_fader.cpp
@@ -1,15 +1,18 @@
+#include "nonlinear_fader.h"
+
 #include <assert.h>
 #include <math.h>
-#include <stdio.h>
-#include <vector>
-#include <utility>
-
-#include <QResizeEvent>
 #include <QPainter>
+#include <QPoint>
+#include <QRect>
 #include <QStyle>
-#include <QStyleOptionSlider>
+#include <QStyleOption>
+#include <memory>
+#include <utility>
+#include <vector>
 
-#include "nonlinear_fader.h"
+class QPaintEvent;
+class QWidget;
 
 using namespace std;
 

diff --git a/nonlinear_fader.h b/nonlinear_fader.h
index cd844be2ef9d3386789b9f674ed242772657d3c4..ce7285210e4fc132a5a23a41ec9ffaa6bbf7d447 100644 (file)
--- a/nonlinear_fader.h
+++ b/nonlinear_fader.h
@@ -1,7 +1,13 @@
 #ifndef _NONLINEAR_FADER_H
 #define _NONLINEAR_FADER_H 1
 
+#include <QAbstractSlider>
 #include <QSlider>
+#include <QString>
+
+class QObject;
+class QPaintEvent;
+class QWidget;
 
 class NonLinearFader : public QSlider {
        Q_OBJECT

diff --git a/pbo_frame_allocator.cpp b/pbo_frame_allocator.cpp
index 34b2c7ba04de98378e92c6b0ad2fe78043d52902..d18358a3121b7cf131de211df446a62b098db1e6 100644 (file)
--- a/pbo_frame_allocator.cpp
+++ b/pbo_frame_allocator.cpp
@@ -1,12 +1,12 @@
 #include "pbo_frame_allocator.h"
 
+#include <bmusb/bmusb.h>
+#include <movit/util.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <cstddef>
 
-#include <movit/util.h>
-
 using namespace std;
 
 PBOFrameAllocator::PBOFrameAllocator(size_t frame_size, GLuint width, GLuint height, size_t num_queued_frames, GLenum buffer, GLenum permissions, GLenum map_bits)

diff --git a/pbo_frame_allocator.h b/pbo_frame_allocator.h
index 9220491669c2a194bac2b3c2833d3c3f2ffaf696..024e57a30dc2f60d771659f561b2ac43a337b7aa 100644 (file)
--- a/pbo_frame_allocator.h
+++ b/pbo_frame_allocator.h
@@ -2,6 +2,7 @@
 #define _PBO_FRAME_ALLOCATOR 1
 
 #include <epoxy/gl.h>
+#include <stdbool.h>
 #include <stddef.h>
 #include <memory>
 #include <mutex>

diff --git a/quicksync_encoder.h b/quicksync_encoder.h
index 16fd3d179cd048a2d6b29e447d3209a673ecebca..9e1e9f944fabecb9c6c4173ae954dfd2360c570c 100644 (file)
--- a/quicksync_encoder.h
+++ b/quicksync_encoder.h
@@ -29,8 +29,6 @@
 #include <epoxy/gl.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <atomic>
-#include <functional>
 #include <memory>
 #include <string>
 #include <vector>
@@ -39,10 +37,8 @@ extern "C" {
 #include <libavformat/avformat.h>
 }
 
-#include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
 
-class AudioEncoder;
 class DiskSpaceEstimator;
 class Mux;
 class QSurface;

diff --git a/ref_counted_frame.cpp b/ref_counted_frame.cpp
index 3a30eace84cbc184b2a511483d7661e92a6bfb3f..07990179549c91128668e6119cd519873b46ec6e 100644 (file)
--- a/ref_counted_frame.cpp
+++ b/ref_counted_frame.cpp
@@ -1,5 +1,7 @@
 #include "ref_counted_frame.h"
 
+#include <bmusb/bmusb.h>
+
 void release_refcounted_frame(bmusb::FrameAllocator::Frame *frame)
 {
        if (frame->owner) {

diff --git a/resampling_queue.cpp b/resampling_queue.cpp
index b7f898d83ac428af95034a3a59b29388bddf87be..46fa91070e8d3e56354877ebf1786082f0c49ccd 100644 (file)
--- a/resampling_queue.cpp
+++ b/resampling_queue.cpp
@@ -20,11 +20,14 @@
 #include "resampling_queue.h"
 
 #include <assert.h>
-#include <math.h>
-#include <stddef.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <zita-resampler/vresampler.h>
+#include <algorithm>
+#include <cmath>
+
+using namespace std;
 
 ResamplingQueue::ResamplingQueue(unsigned card_num, unsigned freq_in, unsigned freq_out, unsigned num_channels)
        : card_num(card_num), freq_in(freq_in), freq_out(freq_out), num_channels(num_channels),

diff --git a/resampling_queue.h b/resampling_queue.h
index 339e41bc6c1c4b60de19dcac1df9ae3f24b7ee95..8462152e0fe91bee15bc24474db7e18254b9f5f2 100644 (file)
--- a/resampling_queue.h
+++ b/resampling_queue.h
@@ -38,8 +38,6 @@
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <stdint.h>
-#include <stdlib.h>
 #include <sys/types.h>
 #include <zita-resampler/vresampler.h>
 #include <deque>

diff --git a/stereocompressor.cpp b/stereocompressor.cpp
index 808b71d3c8f0dd87b4a8e59fd99480a474dfbc97..d9f1142fa3595b08ccaadd9431cb70fd7a602288 100644 (file)
--- a/stereocompressor.cpp
+++ b/stereocompressor.cpp
@@ -1,8 +1,8 @@
-#include <math.h>
+#include "stereocompressor.h"
+
 #include <assert.h>
 #include <algorithm>
-
-#include "stereocompressor.h"
+#include <cmath>
 
 using namespace std;
 

diff --git a/stereocompressor.h b/stereocompressor.h
index 239f284eb705a11a3ea05ec3ec24fb270b418262..be13ce2f7cad4d4ec39742d75a8f28ae0f05800e 100644 (file)
--- a/stereocompressor.h
+++ b/stereocompressor.h
@@ -1,6 +1,7 @@
 #ifndef _STEREOCOMPRESSOR_H
 #define _STEREOCOMPRESSOR_H 1
 
+#include <stddef.h>
 // A simple compressor based on absolute values, with independent
 // attack/release times. There is no sidechain or lookahead, but the
 // peak value is shared between both channels.
@@ -9,8 +10,6 @@
 // It has been adapted and relicensed under GPLv3 (or, at your option,
 // any later version) for Nageru, so that its license matches the rest of the code.
 
-class StereoBuffer;
-
 class StereoCompressor {
 public:
        StereoCompressor(float sample_rate)

diff --git a/theme.cpp b/theme.cpp
index d6c9a239b219556ce8fb2d9d2b7222b538e4ce6e..3f52c838fe53ecfcac11238cb0ffeff8a3cc44b6 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -1,17 +1,19 @@
 #include "theme.h"
 
 #include <assert.h>
+#include <bmusb/bmusb.h>
+#include <epoxy/gl.h>
 #include <lauxlib.h>
 #include <lua.hpp>
 #include <movit/effect.h>
 #include <movit/effect_chain.h>
 #include <movit/image_format.h>
 #include <movit/mix_effect.h>
+#include <movit/multiply_effect.h>
 #include <movit/overlay_effect.h>
 #include <movit/padding_effect.h>
 #include <movit/resample_effect.h>
 #include <movit/resize_effect.h>
-#include <movit/multiply_effect.h>
 #include <movit/util.h>
 #include <movit/white_balance_effect.h>
 #include <movit/ycbcr.h>
@@ -19,14 +21,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <cstddef>
+#include <memory>
 #include <new>
 #include <utility>
-#include <memory>
 
 #include "defs.h"
+#include "deinterlace_effect.h"
 #include "flags.h"
 #include "image_input.h"
-#include "mixer.h"
+#include "input.h"
+#include "input_state.h"
+#include "pbo_frame_allocator.h"
+
+class Mixer;
 
 namespace movit {
 class ResourcePool;

diff --git a/theme.h b/theme.h
index 91c5c2e1a11deb2f25229104d4ae581e78f7d91d..ee9389e0fb1f96cf289b13700f4de741007440e1 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -1,26 +1,23 @@
 #ifndef _THEME_H
 #define _THEME_H 1
 
-#include <epoxy/gl.h>
 #include <lua.hpp>
-#include <movit/effect_chain.h>
-#include <movit/deinterlace_effect.h>
 #include <movit/ycbcr_input.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <functional>
+#include <map>
 #include <mutex>
-#include <set>
 #include <string>
-#include <utility>
 #include <vector>
 
-#include "defs.h"
-#include "input_state.h"
 #include "ref_counted_frame.h"
 
+struct InputState;
+
 namespace movit {
 class ResourcePool;
+class Effect;
+class EffectChain;
 struct ImageFormat;
 struct YCbCrFormat;
 }  // namespace movit

diff --git a/video_encoder.cpp b/video_encoder.cpp
index dfbf565437d5dcfc311f84c7245eaa06eaee68be..c817283690503b8bea94131b1328d13b48c3265d 100644 (file)
--- a/video_encoder.cpp
+++ b/video_encoder.cpp
@@ -1,16 +1,28 @@
 #include "video_encoder.h"
 
 #include <assert.h>
-
+#include <stdio.h>
+#include <time.h>
+#include <unistd.h>
 #include <string>
+#include <thread>
+
+extern "C" {
+#include <libavutil/mem.h>
+}
 
+#include "audio_encoder.h"
 #include "defs.h"
+#include "ffmpeg_raii.h"
 #include "flags.h"
 #include "httpd.h"
-#include "timebase.h"
+#include "mux.h"
 #include "quicksync_encoder.h"
+#include "timebase.h"
 #include "x264_encoder.h"
 
+class RefCountedFrame;
+
 using namespace std;
 using namespace movit;
 

diff --git a/video_encoder.h b/video_encoder.h
index 9a9f861839e1834f3b2228c492527731928f3242..0991f91195330a4f32409c9ed047f22455cb922e 100644 (file)
--- a/video_encoder.h
+++ b/video_encoder.h
@@ -5,21 +5,29 @@
 #ifndef _VIDEO_ENCODER_H
 #define _VIDEO_ENCODER_H
 
+#include <epoxy/gl.h>
+#include <stdbool.h>
 #include <stdint.h>
+#include <atomic>
 #include <memory>
-#include <set>
+#include <mutex>
 #include <string>
 #include <vector>
 
-#include "audio_encoder.h"
-#include "mux.h"
-#include "ref_counted_frame.h"
+extern "C" {
+#include <libavformat/avformat.h>
+#include <libavformat/avio.h>
+}
+
 #include "ref_counted_gl_sync.h"
 
+class AudioEncoder;
 class DiskSpaceEstimator;
 class HTTPD;
+class Mux;
 class QSurface;
 class QuickSyncEncoder;
+class RefCountedFrame;
 class X264Encoder;
 
 namespace movit {

diff --git a/vu_common.cpp b/vu_common.cpp
index d4abab20326be1da7f3abf2615b0689336f723c0..b40502cad91b918276983a3c35a7b2422641de40 100644 (file)
--- a/vu_common.cpp
+++ b/vu_common.cpp
@@ -1,11 +1,9 @@
 #include "vu_common.h"
 
-#include <math.h>
-#include <algorithm>
-
-#include <QBrush>
 #include <QColor>
 #include <QPainter>
+#include <algorithm>
+#include <cmath>
 
 using namespace std;
 

diff --git a/vu_common.h b/vu_common.h
index 9c7098e619edc4aa9582735cec3fc186363648c1..c9a62a876c60d65f76cf8dba2f8f88da8e972467 100644 (file)
--- a/vu_common.h
+++ b/vu_common.h
@@ -1,7 +1,7 @@
 #ifndef _VU_COMMON_H
 #define _VU_COMMON_H 1
 
-#include <QPainter>
+class QPainter;
 
 double lufs_to_pos(float level_lu, int height, float min_level, float max_level);
 

diff --git a/vumeter.cpp b/vumeter.cpp
index 2bf36390206a59a18622d59f205c19769fb81a28..65f081c65d7d8230554e84e0fd22151b8f8793ff 100644 (file)
--- a/vumeter.cpp
+++ b/vumeter.cpp
@@ -1,8 +1,12 @@
-#include <QPainter>
-
 #include "vumeter.h"
+
+#include <QPainter>
+#include <QRect>
 #include "vu_common.h"
 
+class QPaintEvent;
+class QResizeEvent;
+
 using namespace std;
 
 VUMeter::VUMeter(QWidget *parent)

diff --git a/vumeter.h b/vumeter.h
index 9b17f43d2c7c2c81fd9d9c4487303045499b5189..4ac2c0fe2bfa13f8e20ff8ffa4c679ea11426bb1 100644 (file)
--- a/vumeter.h
+++ b/vumeter.h
@@ -2,13 +2,17 @@
 #define VUMETER_H
 
 #include <math.h>
-#include <QLabel>
-#include <QPaintEvent>
+#include <QPixmap>
+#include <QString>
 #include <QWidget>
 #include <mutex>
 
 #include "vu_common.h"
 
+class QObject;
+class QPaintEvent;
+class QResizeEvent;
+
 class VUMeter : public QWidget
 {
        Q_OBJECT

diff --git a/x264_encoder.cpp b/x264_encoder.cpp
index 9874519362aadf8a3059eb77f2e797243d230459..f339e8c8b27e09e7b7f059d3d6d1108daccfd37d 100644 (file)
--- a/x264_encoder.cpp
+++ b/x264_encoder.cpp
@@ -1,14 +1,20 @@
+#include "x264_encoder.h"
+
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <x264.h>
+#include <cstdint>
 
 #include "defs.h"
 #include "flags.h"
 #include "mux.h"
 #include "timebase.h"
-#include "x264_encoder.h"
 #include "x264_speed_control.h"
 
 extern "C" {
+#include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 }
 

diff --git a/x264_encoder.h b/x264_encoder.h
index bb9f1dc066dd43b0b544b744452a1c93251a56da..c71cba2f373e7bc3864a23224a734a17ffeb9ead 100644 (file)
--- a/x264_encoder.h
+++ b/x264_encoder.h
@@ -17,16 +17,16 @@
 #define _X264ENCODE_H 1
 
 #include <stdint.h>
-
+#include <x264.h>
 #include <atomic>
 #include <condition_variable>
 #include <memory>
 #include <mutex>
-#include <thread>
 #include <queue>
+#include <string>
+#include <thread>
 
 extern "C" {
-#include "x264.h"
 #include <libavformat/avformat.h>
 }
 

diff --git a/x264_speed_control.cpp b/x264_speed_control.cpp
index f201f80066fab4d9c048af9399d3df668c84fae6..141813203c61e4ae1e6d2ff0b5cb585ab2b8a5a7 100644 (file)
--- a/x264_speed_control.cpp
+++ b/x264_speed_control.cpp
@@ -1,11 +1,15 @@
 #include "x264_speed_control.h"
 
-#include "flags.h"
-
-#include <time.h>
-
+#include <math.h>
+#include <stdio.h>
+#include <x264.h>
 #include <algorithm>
 #include <chrono>
+#include <cmath>
+#include <ratio>
+#include <type_traits>
+
+#include "flags.h"
 
 using namespace std;
 using namespace std::chrono;

diff --git a/x264_speed_control.h b/x264_speed_control.h
index af4513ea5a037ab596e7a016ed98fee1e1acf73b..b45e6c6de285c90e866293f0aa95e52258601b2a 100644 (file)
--- a/x264_speed_control.h
+++ b/x264_speed_control.h
@@ -43,10 +43,7 @@
 // one does not need to patch x264 to use it in Nageru. It still could do with
 // some cleanup, but it's much, much better than just using a static preset.
 
-#include <stdio.h>
 #include <stdint.h>
-#include <string.h>
-#include <math.h>
 #include <chrono>
 #include <functional>