From e0f0590269cca48532efb540293e1ad519793849 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 23 Nov 2015 19:40:09 +0100 Subject: [PATCH] Rearrange header includes --- audio/audio_thread_wrapper.c | 1 - audio/audio_thread_wrapper.h | 3 ++- audio/drivers/alsa.c | 4 ++-- audio/drivers/alsa_qsa.c | 4 ++-- audio/drivers/alsathread.c | 4 ++-- audio/drivers/coreaudio.c | 4 ++-- audio/drivers/ctr_csnd_audio.c | 5 +++-- audio/drivers/ctr_dsp_audio.c | 5 +++-- audio/drivers/dsound.c | 4 ++-- audio/drivers/gx_audio.c | 4 ++-- audio/drivers/jack.c | 4 ++-- audio/drivers/nullaudio.c | 3 +-- audio/drivers/openal.c | 4 ++-- audio/drivers/opensl.c | 4 ++-- audio/drivers/oss.c | 4 ++-- audio/drivers/ps3_audio.c | 4 ++-- audio/drivers/psp_audio.c | 4 ++-- audio/drivers/pulse.c | 4 ++-- audio/drivers/roar.c | 4 ++-- audio/drivers/rwebaudio.c | 4 ++-- audio/drivers/sdl_audio.c | 4 ++-- audio/drivers/xaudio.cpp | 4 ++-- audio/drivers/xenon360_audio.c | 4 ++-- command_event.c | 1 + configuration.c | 1 + driver.c | 1 + driver.h | 1 - dynamic.c | 1 + libretro_version_1.c | 1 + menu/menu_setting.c | 1 + rewind.c | 1 + runloop.c | 1 + 32 files changed, 53 insertions(+), 45 deletions(-) diff --git a/audio/audio_thread_wrapper.c b/audio/audio_thread_wrapper.c index fb9d745607..9072e0b610 100644 --- a/audio/audio_thread_wrapper.c +++ b/audio/audio_thread_wrapper.c @@ -21,7 +21,6 @@ #include #include "audio_thread_wrapper.h" -#include "../general.h" #include "../performance.h" #include "../verbosity.h" diff --git a/audio/audio_thread_wrapper.h b/audio/audio_thread_wrapper.h index e56ea089f5..ae97616a37 100644 --- a/audio/audio_thread_wrapper.h +++ b/audio/audio_thread_wrapper.h @@ -17,9 +17,10 @@ #ifndef RARCH_AUDIO_THREAD_H__ #define RARCH_AUDIO_THREAD_H__ -#include "../driver.h" #include +#include "audio_driver.h" + /** * rarch_threaded_audio_init: * @out_driver : output driver diff --git a/audio/drivers/alsa.c b/audio/drivers/alsa.c index e79ec029cd..6fb951054d 100644 --- a/audio/drivers/alsa.c +++ b/audio/drivers/alsa.c @@ -17,8 +17,8 @@ #include -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" #include "../../verbosity.h" typedef struct alsa diff --git a/audio/drivers/alsa_qsa.c b/audio/drivers/alsa_qsa.c index 5fde5e78c3..6cd68ba2e3 100644 --- a/audio/drivers/alsa_qsa.c +++ b/audio/drivers/alsa_qsa.c @@ -18,8 +18,8 @@ #define ALSA_PCM_NEW_SW_PARAMS_API #include -#include "../../general.h" -#include "../../driver.h" +#include "../audio_driver.h" +#include "../../configuration.h" #define MAX_FRAG_SIZE 3072 #define DEFAULT_RATE 48000 diff --git a/audio/drivers/alsathread.c b/audio/drivers/alsathread.c index c8819a5ace..9947cf980d 100644 --- a/audio/drivers/alsathread.c +++ b/audio/drivers/alsathread.c @@ -21,8 +21,8 @@ #include #include -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" #include "../../verbosity.h" #define TRY_ALSA(x) if (x < 0) { \ diff --git a/audio/drivers/coreaudio.c b/audio/drivers/coreaudio.c index fe0566fccd..d8295d5958 100644 --- a/audio/drivers/coreaudio.c +++ b/audio/drivers/coreaudio.c @@ -31,8 +31,8 @@ #include #include -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../configuration.h" #include "../../verbosity.h" #if defined(__powerpc__) || defined(__ppc__) || defined(__POWERPC__) diff --git a/audio/drivers/ctr_csnd_audio.c b/audio/drivers/ctr_csnd_audio.c index 05969c8b5d..de5d0770c5 100644 --- a/audio/drivers/ctr_csnd_audio.c +++ b/audio/drivers/ctr_csnd_audio.c @@ -14,8 +14,9 @@ */ #include <3ds.h> -#include "../../general.h" -#include "../../driver.h" + +#include "../audio_driver.h" +#include "../../configuration.h" #include "../../performance.h" typedef struct diff --git a/audio/drivers/ctr_dsp_audio.c b/audio/drivers/ctr_dsp_audio.c index bdf51aa7d6..45277f9138 100644 --- a/audio/drivers/ctr_dsp_audio.c +++ b/audio/drivers/ctr_dsp_audio.c @@ -14,8 +14,9 @@ */ #include <3ds.h> -#include "../../general.h" -#include "../../driver.h" + +#include "../audio_driver.h" +#include "../../configuration.h" #include "../../performance.h" diff --git a/audio/drivers/dsound.c b/audio/drivers/dsound.c index 43d9815110..8082e18720 100644 --- a/audio/drivers/dsound.c +++ b/audio/drivers/dsound.c @@ -34,8 +34,8 @@ #include #include -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../configuration.h" #include "../../verbosity.h" #ifdef _XBOX diff --git a/audio/drivers/gx_audio.c b/audio/drivers/gx_audio.c index df01e01d7d..6b5bec560d 100644 --- a/audio/drivers/gx_audio.c +++ b/audio/drivers/gx_audio.c @@ -27,8 +27,8 @@ #include #include -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" #include "../../defines/gx_defines.h" #define CHUNK_FRAMES 64 diff --git a/audio/drivers/jack.c b/audio/drivers/jack.c index 4ef0b8e276..82724c41fc 100644 --- a/audio/drivers/jack.c +++ b/audio/drivers/jack.c @@ -26,8 +26,8 @@ #include #include -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" #include "../../verbosity.h" #define FRAMES(x) (x / (sizeof(float) * 2)) diff --git a/audio/drivers/nullaudio.c b/audio/drivers/nullaudio.c index f5435db775..1a6dd65272 100644 --- a/audio/drivers/nullaudio.c +++ b/audio/drivers/nullaudio.c @@ -13,8 +13,7 @@ * If not, see . */ -#include "../../general.h" -#include "../../driver.h" +#include "../audio_driver.h" static void *null_audio_init(const char *device, unsigned rate, unsigned latency) { diff --git a/audio/drivers/openal.c b/audio/drivers/openal.c index 133b3f469f..0571affb5b 100644 --- a/audio/drivers/openal.c +++ b/audio/drivers/openal.c @@ -28,8 +28,8 @@ #include #endif -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" #include "../../verbosity.h" #define BUFSIZE 1024 diff --git a/audio/drivers/opensl.c b/audio/drivers/opensl.c index 08c396803d..e2044452b4 100644 --- a/audio/drivers/opensl.c +++ b/audio/drivers/opensl.c @@ -21,8 +21,8 @@ #include -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" /* Helper macros, COM-style. */ #define SLObjectItf_Realize(a, ...) ((*(a))->Realize(a, __VA_ARGS__)) diff --git a/audio/drivers/oss.c b/audio/drivers/oss.c index 2e4e360f1b..c5a54393bc 100644 --- a/audio/drivers/oss.c +++ b/audio/drivers/oss.c @@ -31,8 +31,8 @@ #include "config.h" #endif -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" #include "../../verbosity.h" #ifdef HAVE_OSS_BSD diff --git a/audio/drivers/ps3_audio.c b/audio/drivers/ps3_audio.c index 2775941931..a1f9bfb99a 100644 --- a/audio/drivers/ps3_audio.c +++ b/audio/drivers/ps3_audio.c @@ -19,8 +19,8 @@ #include -#include "../driver.h" -#include "../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" #include "../../defines/ps3_defines.h" diff --git a/audio/drivers/psp_audio.c b/audio/drivers/psp_audio.c index 02df989dc7..70051885a3 100644 --- a/audio/drivers/psp_audio.c +++ b/audio/drivers/psp_audio.c @@ -28,8 +28,8 @@ #include #endif -#include "../../general.h" -#include "../../driver.h" +#include "../audio_driver.h" +#include "../../configuration.h" typedef struct psp_audio { diff --git a/audio/drivers/pulse.c b/audio/drivers/pulse.c index 77051ff635..4838537ab5 100644 --- a/audio/drivers/pulse.c +++ b/audio/drivers/pulse.c @@ -21,8 +21,8 @@ #include #include -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" #include "../../verbosity.h" typedef struct diff --git a/audio/drivers/roar.c b/audio/drivers/roar.c index b66c090fce..beff03f4cf 100644 --- a/audio/drivers/roar.c +++ b/audio/drivers/roar.c @@ -22,8 +22,8 @@ #include -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" typedef struct { diff --git a/audio/drivers/rwebaudio.c b/audio/drivers/rwebaudio.c index 702e648183..516c60162f 100644 --- a/audio/drivers/rwebaudio.c +++ b/audio/drivers/rwebaudio.c @@ -17,8 +17,8 @@ #include #include -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" /* forward declarations */ unsigned RWebAudioSampleRate(void); diff --git a/audio/drivers/sdl_audio.c b/audio/drivers/sdl_audio.c index f6703e606f..ac68c1eeba 100644 --- a/audio/drivers/sdl_audio.c +++ b/audio/drivers/sdl_audio.c @@ -26,8 +26,8 @@ #include #include -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" #include "../../verbosity.h" typedef struct sdl_audio diff --git a/audio/drivers/xaudio.cpp b/audio/drivers/xaudio.cpp index c6c3340d20..ace9d75702 100644 --- a/audio/drivers/xaudio.cpp +++ b/audio/drivers/xaudio.cpp @@ -24,8 +24,8 @@ #include "xaudio.h" -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" #include "../../verbosity.h" typedef struct xaudio2 xaudio2_t; diff --git a/audio/drivers/xenon360_audio.c b/audio/drivers/xenon360_audio.c index 51a4885f06..348efe3f46 100644 --- a/audio/drivers/xenon360_audio.c +++ b/audio/drivers/xenon360_audio.c @@ -21,8 +21,8 @@ #include -#include "../../driver.h" -#include "../../general.h" +#include "../audio_driver.h" +#include "../../configuration.h" #define SOUND_FREQUENCY 48000 #define MAX_BUFFER 2048 diff --git a/command_event.c b/command_event.c index 5db26d5edc..dc2f9b32ee 100644 --- a/command_event.c +++ b/command_event.c @@ -19,6 +19,7 @@ #include "command_event.h" +#include "audio/audio_driver.h" #include "general.h" #include "performance.h" #include "dynamic.h" diff --git a/configuration.c b/configuration.c index 4715ea385a..915087285e 100644 --- a/configuration.c +++ b/configuration.c @@ -22,6 +22,7 @@ #include #include +#include "audio/audio_driver.h" #include "config.def.h" #include "input/input_common.h" #include "input/input_keymaps.h" diff --git a/driver.c b/driver.c index 978eafa51b..af5313aef2 100644 --- a/driver.c +++ b/driver.c @@ -21,6 +21,7 @@ #include "msg_hash.h" #include "verbosity.h" +#include "audio/audio_driver.h" #ifdef HAVE_MENU #include "menu/menu.h" diff --git a/driver.h b/driver.h index 4bcb52679a..5f9460fbc5 100644 --- a/driver.h +++ b/driver.h @@ -30,7 +30,6 @@ #include "ui/ui_companion_driver.h" #include "gfx/video_driver.h" #include "gfx/font_renderer_driver.h" -#include "audio/audio_driver.h" #include "camera/camera_driver.h" #include "location/location_driver.h" diff --git a/dynamic.c b/dynamic.c index 58c217f5ed..df3d84181b 100644 --- a/dynamic.c +++ b/dynamic.c @@ -29,6 +29,7 @@ #include "performance.h" +#include "audio/audio_driver.h" #include "libretro_private.h" #include "cores/internal_cores.h" #include "retroarch.h" diff --git a/libretro_version_1.c b/libretro_version_1.c index f51ce09a23..32d39351ec 100644 --- a/libretro_version_1.c +++ b/libretro_version_1.c @@ -32,6 +32,7 @@ #include "rewind.h" #include "performance.h" #include "input/input_remapping.h" +#include "audio/audio_driver.h" #include "record/record_driver.h" #include "verbosity.h" diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 9556dd90a2..bf523aa133 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -38,6 +38,7 @@ #include "../driver.h" #include "../general.h" #include "../dynamic.h" +#include "../audio/audio_driver.h" #include "../input/input_common.h" #include "../input/input_autodetect.h" #include "../config.def.h" diff --git a/rewind.c b/rewind.c index fa4bef13ab..6f61641bc4 100644 --- a/rewind.c +++ b/rewind.c @@ -26,6 +26,7 @@ #include "rewind.h" #include "performance.h" #include "verbosity.h" +#include "audio/audio_driver.h" /* This makes Valgrind throw errors if a core overflows its savestate size. */ /* Keep it off unless you're chasing a core bug, it slows things down. */ diff --git a/runloop.c b/runloop.c index 9858d9a8e6..c40f410c8a 100644 --- a/runloop.c +++ b/runloop.c @@ -29,6 +29,7 @@ #include "retroarch.h" #include "runloop.h" #include "runloop_data.h" +#include "audio/audio_driver.h" #include "msg_hash.h"