From ebdae19fd226104baec712b9da9939ff82ef3c3a Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Wed, 21 Sep 2016 00:21:23 +0900 Subject: Remove empty newlines in #include blocks. This makes clang-format useful on those. Also add a bunch of forgotten transitive includes, which otherwise prevented compilation. --- src/audio_core/audio_core.cpp | 4 +--- src/audio_core/codec.cpp | 4 +--- src/audio_core/codec.h | 1 - src/audio_core/hle/common.h | 1 - src/audio_core/hle/dsp.cpp | 3 +-- src/audio_core/hle/dsp.h | 2 -- src/audio_core/hle/filter.cpp | 4 +--- src/audio_core/hle/filter.h | 2 -- src/audio_core/hle/mixers.cpp | 1 - src/audio_core/hle/mixers.h | 1 - src/audio_core/hle/pipe.cpp | 5 +---- src/audio_core/hle/pipe.h | 1 - src/audio_core/hle/source.cpp | 5 +---- src/audio_core/hle/source.h | 2 -- src/audio_core/interpolate.cpp | 1 - src/audio_core/interpolate.h | 1 - src/audio_core/null_sink.h | 1 - src/audio_core/sdl2_sink.cpp | 7 ++----- src/audio_core/sdl2_sink.h | 1 - src/audio_core/sink.h | 1 - src/audio_core/sink_details.cpp | 4 +--- src/audio_core/time_stretch.cpp | 5 +---- src/audio_core/time_stretch.h | 1 - 23 files changed, 10 insertions(+), 48 deletions(-) (limited to 'src/audio_core') diff --git a/src/audio_core/audio_core.cpp b/src/audio_core/audio_core.cpp index 0b36dbb03..c54a4b99a 100644 --- a/src/audio_core/audio_core.cpp +++ b/src/audio_core/audio_core.cpp @@ -2,16 +2,14 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "audio_core/audio_core.h" #include #include - -#include "audio_core/audio_core.h" #include "audio_core/hle/dsp.h" #include "audio_core/hle/pipe.h" #include "audio_core/null_sink.h" #include "audio_core/sink.h" #include "audio_core/sink_details.h" - #include "core/core_timing.h" #include "core/hle/kernel/vm_manager.h" #include "core/hle/service/dsp_dsp.h" diff --git a/src/audio_core/codec.cpp b/src/audio_core/codec.cpp index 4edfe9be0..fd189a176 100644 --- a/src/audio_core/codec.cpp +++ b/src/audio_core/codec.cpp @@ -2,13 +2,11 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "audio_core/codec.h" #include #include #include #include - -#include "audio_core/codec.h" - #include "common/assert.h" #include "common/common_types.h" #include "common/math_util.h" diff --git a/src/audio_core/codec.h b/src/audio_core/codec.h index 77bbf98b5..2b0c395e6 100644 --- a/src/audio_core/codec.h +++ b/src/audio_core/codec.h @@ -6,7 +6,6 @@ #include #include - #include "common/common_types.h" namespace Codec { diff --git a/src/audio_core/hle/common.h b/src/audio_core/hle/common.h index 8e7e5c3cd..7fbc3ad9a 100644 --- a/src/audio_core/hle/common.h +++ b/src/audio_core/hle/common.h @@ -6,7 +6,6 @@ #include #include - #include "common/common_types.h" namespace DSP { diff --git a/src/audio_core/hle/dsp.cpp b/src/audio_core/hle/dsp.cpp index aaa3a280f..aa64dae97 100644 --- a/src/audio_core/hle/dsp.cpp +++ b/src/audio_core/hle/dsp.cpp @@ -2,10 +2,9 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "audio_core/hle/dsp.h" #include #include - -#include "audio_core/hle/dsp.h" #include "audio_core/hle/mixers.h" #include "audio_core/hle/pipe.h" #include "audio_core/hle/source.h" diff --git a/src/audio_core/hle/dsp.h b/src/audio_core/hle/dsp.h index f4c4b01e2..0a0f60ac1 100644 --- a/src/audio_core/hle/dsp.h +++ b/src/audio_core/hle/dsp.h @@ -8,9 +8,7 @@ #include #include #include - #include "audio_core/hle/common.h" - #include "common/bit_field.h" #include "common/common_funcs.h" #include "common/common_types.h" diff --git a/src/audio_core/hle/filter.cpp b/src/audio_core/hle/filter.cpp index da2a4684e..edf95f686 100644 --- a/src/audio_core/hle/filter.cpp +++ b/src/audio_core/hle/filter.cpp @@ -2,13 +2,11 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "audio_core/hle/filter.h" #include #include - #include "audio_core/hle/common.h" #include "audio_core/hle/dsp.h" -#include "audio_core/hle/filter.h" - #include "common/common_types.h" #include "common/math_util.h" diff --git a/src/audio_core/hle/filter.h b/src/audio_core/hle/filter.h index 73d5ce670..4281a5898 100644 --- a/src/audio_core/hle/filter.h +++ b/src/audio_core/hle/filter.h @@ -5,10 +5,8 @@ #pragma once #include - #include "audio_core/hle/common.h" #include "audio_core/hle/dsp.h" - #include "common/common_types.h" namespace DSP { diff --git a/src/audio_core/hle/mixers.cpp b/src/audio_core/hle/mixers.cpp index 126f328bc..6cc81dfca 100644 --- a/src/audio_core/hle/mixers.cpp +++ b/src/audio_core/hle/mixers.cpp @@ -7,7 +7,6 @@ #include "audio_core/hle/common.h" #include "audio_core/hle/dsp.h" #include "audio_core/hle/mixers.h" - #include "common/assert.h" #include "common/logging/log.h" #include "common/math_util.h" diff --git a/src/audio_core/hle/mixers.h b/src/audio_core/hle/mixers.h index 537c3a3b9..bf4e865ae 100644 --- a/src/audio_core/hle/mixers.h +++ b/src/audio_core/hle/mixers.h @@ -5,7 +5,6 @@ #pragma once #include - #include "audio_core/hle/common.h" #include "audio_core/hle/dsp.h" diff --git a/src/audio_core/hle/pipe.cpp b/src/audio_core/hle/pipe.cpp index f2b6d6552..cab30c8aa 100644 --- a/src/audio_core/hle/pipe.cpp +++ b/src/audio_core/hle/pipe.cpp @@ -2,16 +2,13 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "audio_core/hle/pipe.h" #include #include - #include "audio_core/hle/dsp.h" -#include "audio_core/hle/pipe.h" - #include "common/assert.h" #include "common/common_types.h" #include "common/logging/log.h" - #include "core/hle/service/dsp_dsp.h" namespace DSP { diff --git a/src/audio_core/hle/pipe.h b/src/audio_core/hle/pipe.h index 6d7fd92ab..ac053c029 100644 --- a/src/audio_core/hle/pipe.h +++ b/src/audio_core/hle/pipe.h @@ -6,7 +6,6 @@ #include #include - #include "common/common_types.h" namespace DSP { diff --git a/src/audio_core/hle/source.cpp b/src/audio_core/hle/source.cpp index 249acc449..9e6b36fcd 100644 --- a/src/audio_core/hle/source.cpp +++ b/src/audio_core/hle/source.cpp @@ -2,17 +2,14 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "audio_core/hle/source.h" #include #include - #include "audio_core/codec.h" #include "audio_core/hle/common.h" -#include "audio_core/hle/source.h" #include "audio_core/interpolate.h" - #include "common/assert.h" #include "common/logging/log.h" - #include "core/memory.h" namespace DSP { diff --git a/src/audio_core/hle/source.h b/src/audio_core/hle/source.h index a1ab15520..3d725f2a3 100644 --- a/src/audio_core/hle/source.h +++ b/src/audio_core/hle/source.h @@ -7,13 +7,11 @@ #include #include #include - #include "audio_core/codec.h" #include "audio_core/hle/common.h" #include "audio_core/hle/dsp.h" #include "audio_core/hle/filter.h" #include "audio_core/interpolate.h" - #include "common/common_types.h" namespace DSP { diff --git a/src/audio_core/interpolate.cpp b/src/audio_core/interpolate.cpp index cb1c58a67..8a5d4181a 100644 --- a/src/audio_core/interpolate.cpp +++ b/src/audio_core/interpolate.cpp @@ -3,7 +3,6 @@ // Refer to the license.txt file included. #include "audio_core/interpolate.h" - #include "common/assert.h" #include "common/math_util.h" diff --git a/src/audio_core/interpolate.h b/src/audio_core/interpolate.h index 2d2e60311..dd06fdda9 100644 --- a/src/audio_core/interpolate.h +++ b/src/audio_core/interpolate.h @@ -6,7 +6,6 @@ #include #include - #include "common/common_types.h" namespace AudioInterp { diff --git a/src/audio_core/null_sink.h b/src/audio_core/null_sink.h index 9931c4778..e7668438c 100644 --- a/src/audio_core/null_sink.h +++ b/src/audio_core/null_sink.h @@ -5,7 +5,6 @@ #pragma once #include - #include "audio_core/audio_core.h" #include "audio_core/sink.h" diff --git a/src/audio_core/sdl2_sink.cpp b/src/audio_core/sdl2_sink.cpp index 65aac877a..2520796cb 100644 --- a/src/audio_core/sdl2_sink.cpp +++ b/src/audio_core/sdl2_sink.cpp @@ -2,15 +2,12 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "audio_core/sdl2_sink.h" #include +#include #include - #include - #include "audio_core/audio_core.h" -#include "audio_core/sdl2_sink.h" - -#include #include "common/assert.h" #include "common/logging/log.h" diff --git a/src/audio_core/sdl2_sink.h b/src/audio_core/sdl2_sink.h index b13827214..ccd0f7c7e 100644 --- a/src/audio_core/sdl2_sink.h +++ b/src/audio_core/sdl2_sink.h @@ -6,7 +6,6 @@ #include #include - #include "audio_core/sink.h" namespace AudioCore { diff --git a/src/audio_core/sink.h b/src/audio_core/sink.h index f5ce55a6b..08f3bab5b 100644 --- a/src/audio_core/sink.h +++ b/src/audio_core/sink.h @@ -5,7 +5,6 @@ #pragma once #include - #include "common/common_types.h" namespace AudioCore { diff --git a/src/audio_core/sink_details.cpp b/src/audio_core/sink_details.cpp index ff529f4cf..1dc5e862e 100644 --- a/src/audio_core/sink_details.cpp +++ b/src/audio_core/sink_details.cpp @@ -2,12 +2,10 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "audio_core/sink_details.h" #include #include - #include "audio_core/null_sink.h" -#include "audio_core/sink_details.h" - #ifdef HAVE_SDL2 #include "audio_core/sdl2_sink.h" #endif diff --git a/src/audio_core/time_stretch.cpp b/src/audio_core/time_stretch.cpp index f44807c84..26059f503 100644 --- a/src/audio_core/time_stretch.cpp +++ b/src/audio_core/time_stretch.cpp @@ -2,15 +2,12 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include "audio_core/time_stretch.h" #include #include #include - #include - #include "audio_core/audio_core.h" -#include "audio_core/time_stretch.h" - #include "common/common_types.h" #include "common/logging/log.h" #include "common/math_util.h" diff --git a/src/audio_core/time_stretch.h b/src/audio_core/time_stretch.h index 42a213679..fa81718ed 100644 --- a/src/audio_core/time_stretch.h +++ b/src/audio_core/time_stretch.h @@ -5,7 +5,6 @@ #include #include #include - #include "common/common_types.h" namespace AudioCore { -- cgit v1.2.3