From 4a4530801695dd82e7a9525979b690b50fcdb68a Mon Sep 17 00:00:00 2001 From: twinaphex Date: Wed, 29 Oct 2014 07:51:23 +0100 Subject: [PATCH] Rename gfx/filters and audio/filters to gfx/video_filters and audio/audio_filters respectively --- .../{filters => audio_filters}/BassBoost.dsp | 0 audio/{filters => audio_filters}/Chorus.dsp | 0 audio/{filters => audio_filters}/EQ.dsp | 0 audio/{filters => audio_filters}/Echo.dsp | 0 .../{filters => audio_filters}/EchoReverb.dsp | 0 .../HighShelfDampen.dsp | 0 audio/{filters => audio_filters}/IIR.dsp | 0 audio/{filters => audio_filters}/Makefile | 0 audio/{filters => audio_filters}/Panning.dsp | 0 audio/{filters => audio_filters}/Phaser.dsp | 0 audio/{filters => audio_filters}/Reverb.dsp | 0 audio/{filters => audio_filters}/WahWah.dsp | 0 audio/{filters => audio_filters}/chorus.c | 0 audio/{filters => audio_filters}/dspfilter.h | 0 audio/{filters => audio_filters}/echo.c | 0 audio/{filters => audio_filters}/eq.c | 0 audio/{filters => audio_filters}/fft/fft.c | 0 audio/{filters => audio_filters}/fft/fft.h | 0 audio/{filters => audio_filters}/iir.c | 0 audio/{filters => audio_filters}/link.T | 0 audio/{filters => audio_filters}/panning.c | 0 audio/{filters => audio_filters}/phaser.c | 0 audio/{filters => audio_filters}/reverb.c | 0 audio/{filters => audio_filters}/wahwah.c | 0 audio/dsp_filter.c | 2 +- driver.h | 2 -- gfx/filter.c | 2 +- gfx/filter.h | 2 -- gfx/{filters => video_filters}/2xBR.filt | 0 gfx/{filters => video_filters}/2xSaI.filt | 0 gfx/{filters => video_filters}/2xbr.c | 0 gfx/{filters => video_filters}/2xsai.c | 0 .../Blargg_NTSC_SNES_Composite.filt | 0 .../Blargg_NTSC_SNES_RF.filt | 0 .../Blargg_NTSC_SNES_RGB.filt | 0 .../Blargg_NTSC_SNES_S-Video.filt | 0 gfx/{filters => video_filters}/Darken.filt | 0 gfx/{filters => video_filters}/EPX.filt | 0 gfx/{filters => video_filters}/LQ2x.filt | 0 gfx/{filters => video_filters}/Makefile | 0 .../Phosphor2x.filt | 0 gfx/{filters => video_filters}/Scale2x.filt | 0 .../Super2xSaI.filt | 0 .../SuperEagle.filt | 0 .../blargg_ntsc_snes.c | 0 gfx/{filters => video_filters}/darken.c | 0 gfx/{filters => video_filters}/epx.c | 0 gfx/{filters => video_filters}/link.T | 0 gfx/{filters => video_filters}/lq2x.c | 0 gfx/{filters => video_filters}/phosphor2x.c | 0 gfx/{filters => video_filters}/scale2x.c | 0 .../snes_ntsc/snes_ntsc.c | 0 .../snes_ntsc/snes_ntsc.h | 0 .../snes_ntsc/snes_ntsc_config.h | 0 .../snes_ntsc/snes_ntsc_impl.h | 0 gfx/{filters => video_filters}/softfilter.h | 0 gfx/{filters => video_filters}/super2xsai.c | 0 gfx/{filters => video_filters}/supereagle.c | 0 griffin/griffin.c | 36 +++++++++---------- 59 files changed, 20 insertions(+), 24 deletions(-) rename audio/{filters => audio_filters}/BassBoost.dsp (100%) rename audio/{filters => audio_filters}/Chorus.dsp (100%) rename audio/{filters => audio_filters}/EQ.dsp (100%) rename audio/{filters => audio_filters}/Echo.dsp (100%) rename audio/{filters => audio_filters}/EchoReverb.dsp (100%) rename audio/{filters => audio_filters}/HighShelfDampen.dsp (100%) rename audio/{filters => audio_filters}/IIR.dsp (100%) rename audio/{filters => audio_filters}/Makefile (100%) rename audio/{filters => audio_filters}/Panning.dsp (100%) rename audio/{filters => audio_filters}/Phaser.dsp (100%) rename audio/{filters => audio_filters}/Reverb.dsp (100%) rename audio/{filters => audio_filters}/WahWah.dsp (100%) rename audio/{filters => audio_filters}/chorus.c (100%) rename audio/{filters => audio_filters}/dspfilter.h (100%) rename audio/{filters => audio_filters}/echo.c (100%) rename audio/{filters => audio_filters}/eq.c (100%) rename audio/{filters => audio_filters}/fft/fft.c (100%) rename audio/{filters => audio_filters}/fft/fft.h (100%) rename audio/{filters => audio_filters}/iir.c (100%) rename audio/{filters => audio_filters}/link.T (100%) rename audio/{filters => audio_filters}/panning.c (100%) rename audio/{filters => audio_filters}/phaser.c (100%) rename audio/{filters => audio_filters}/reverb.c (100%) rename audio/{filters => audio_filters}/wahwah.c (100%) rename gfx/{filters => video_filters}/2xBR.filt (100%) rename gfx/{filters => video_filters}/2xSaI.filt (100%) rename gfx/{filters => video_filters}/2xbr.c (100%) rename gfx/{filters => video_filters}/2xsai.c (100%) rename gfx/{filters => video_filters}/Blargg_NTSC_SNES_Composite.filt (100%) rename gfx/{filters => video_filters}/Blargg_NTSC_SNES_RF.filt (100%) rename gfx/{filters => video_filters}/Blargg_NTSC_SNES_RGB.filt (100%) rename gfx/{filters => video_filters}/Blargg_NTSC_SNES_S-Video.filt (100%) rename gfx/{filters => video_filters}/Darken.filt (100%) rename gfx/{filters => video_filters}/EPX.filt (100%) rename gfx/{filters => video_filters}/LQ2x.filt (100%) rename gfx/{filters => video_filters}/Makefile (100%) rename gfx/{filters => video_filters}/Phosphor2x.filt (100%) rename gfx/{filters => video_filters}/Scale2x.filt (100%) rename gfx/{filters => video_filters}/Super2xSaI.filt (100%) rename gfx/{filters => video_filters}/SuperEagle.filt (100%) rename gfx/{filters => video_filters}/blargg_ntsc_snes.c (100%) rename gfx/{filters => video_filters}/darken.c (100%) rename gfx/{filters => video_filters}/epx.c (100%) rename gfx/{filters => video_filters}/link.T (100%) rename gfx/{filters => video_filters}/lq2x.c (100%) rename gfx/{filters => video_filters}/phosphor2x.c (100%) rename gfx/{filters => video_filters}/scale2x.c (100%) rename gfx/{filters => video_filters}/snes_ntsc/snes_ntsc.c (100%) rename gfx/{filters => video_filters}/snes_ntsc/snes_ntsc.h (100%) rename gfx/{filters => video_filters}/snes_ntsc/snes_ntsc_config.h (100%) rename gfx/{filters => video_filters}/snes_ntsc/snes_ntsc_impl.h (100%) rename gfx/{filters => video_filters}/softfilter.h (100%) rename gfx/{filters => video_filters}/super2xsai.c (100%) rename gfx/{filters => video_filters}/supereagle.c (100%) diff --git a/audio/filters/BassBoost.dsp b/audio/audio_filters/BassBoost.dsp similarity index 100% rename from audio/filters/BassBoost.dsp rename to audio/audio_filters/BassBoost.dsp diff --git a/audio/filters/Chorus.dsp b/audio/audio_filters/Chorus.dsp similarity index 100% rename from audio/filters/Chorus.dsp rename to audio/audio_filters/Chorus.dsp diff --git a/audio/filters/EQ.dsp b/audio/audio_filters/EQ.dsp similarity index 100% rename from audio/filters/EQ.dsp rename to audio/audio_filters/EQ.dsp diff --git a/audio/filters/Echo.dsp b/audio/audio_filters/Echo.dsp similarity index 100% rename from audio/filters/Echo.dsp rename to audio/audio_filters/Echo.dsp diff --git a/audio/filters/EchoReverb.dsp b/audio/audio_filters/EchoReverb.dsp similarity index 100% rename from audio/filters/EchoReverb.dsp rename to audio/audio_filters/EchoReverb.dsp diff --git a/audio/filters/HighShelfDampen.dsp b/audio/audio_filters/HighShelfDampen.dsp similarity index 100% rename from audio/filters/HighShelfDampen.dsp rename to audio/audio_filters/HighShelfDampen.dsp diff --git a/audio/filters/IIR.dsp b/audio/audio_filters/IIR.dsp similarity index 100% rename from audio/filters/IIR.dsp rename to audio/audio_filters/IIR.dsp diff --git a/audio/filters/Makefile b/audio/audio_filters/Makefile similarity index 100% rename from audio/filters/Makefile rename to audio/audio_filters/Makefile diff --git a/audio/filters/Panning.dsp b/audio/audio_filters/Panning.dsp similarity index 100% rename from audio/filters/Panning.dsp rename to audio/audio_filters/Panning.dsp diff --git a/audio/filters/Phaser.dsp b/audio/audio_filters/Phaser.dsp similarity index 100% rename from audio/filters/Phaser.dsp rename to audio/audio_filters/Phaser.dsp diff --git a/audio/filters/Reverb.dsp b/audio/audio_filters/Reverb.dsp similarity index 100% rename from audio/filters/Reverb.dsp rename to audio/audio_filters/Reverb.dsp diff --git a/audio/filters/WahWah.dsp b/audio/audio_filters/WahWah.dsp similarity index 100% rename from audio/filters/WahWah.dsp rename to audio/audio_filters/WahWah.dsp diff --git a/audio/filters/chorus.c b/audio/audio_filters/chorus.c similarity index 100% rename from audio/filters/chorus.c rename to audio/audio_filters/chorus.c diff --git a/audio/filters/dspfilter.h b/audio/audio_filters/dspfilter.h similarity index 100% rename from audio/filters/dspfilter.h rename to audio/audio_filters/dspfilter.h diff --git a/audio/filters/echo.c b/audio/audio_filters/echo.c similarity index 100% rename from audio/filters/echo.c rename to audio/audio_filters/echo.c diff --git a/audio/filters/eq.c b/audio/audio_filters/eq.c similarity index 100% rename from audio/filters/eq.c rename to audio/audio_filters/eq.c diff --git a/audio/filters/fft/fft.c b/audio/audio_filters/fft/fft.c similarity index 100% rename from audio/filters/fft/fft.c rename to audio/audio_filters/fft/fft.c diff --git a/audio/filters/fft/fft.h b/audio/audio_filters/fft/fft.h similarity index 100% rename from audio/filters/fft/fft.h rename to audio/audio_filters/fft/fft.h diff --git a/audio/filters/iir.c b/audio/audio_filters/iir.c similarity index 100% rename from audio/filters/iir.c rename to audio/audio_filters/iir.c diff --git a/audio/filters/link.T b/audio/audio_filters/link.T similarity index 100% rename from audio/filters/link.T rename to audio/audio_filters/link.T diff --git a/audio/filters/panning.c b/audio/audio_filters/panning.c similarity index 100% rename from audio/filters/panning.c rename to audio/audio_filters/panning.c diff --git a/audio/filters/phaser.c b/audio/audio_filters/phaser.c similarity index 100% rename from audio/filters/phaser.c rename to audio/audio_filters/phaser.c diff --git a/audio/filters/reverb.c b/audio/audio_filters/reverb.c similarity index 100% rename from audio/filters/reverb.c rename to audio/audio_filters/reverb.c diff --git a/audio/filters/wahwah.c b/audio/audio_filters/wahwah.c similarity index 100% rename from audio/filters/wahwah.c rename to audio/audio_filters/wahwah.c diff --git a/audio/dsp_filter.c b/audio/dsp_filter.c index 9a7f91c16e..7bc435b85c 100644 --- a/audio/dsp_filter.c +++ b/audio/dsp_filter.c @@ -18,7 +18,7 @@ #include "dsp_filter.h" #include "../dynamic.h" #include -#include "filters/dspfilter.h" +#include "audio_filters/dspfilter.h" #include #include "../file_ext.h" #include diff --git a/driver.h b/driver.h index a0b8034eeb..c03318da51 100644 --- a/driver.h +++ b/driver.h @@ -26,9 +26,7 @@ #include #include "gfx/scaler/scaler.h" #include "gfx/image/image.h" -#include "gfx/filters/softfilter.h" #include "gfx/shader/shader_parse.h" -#include "audio/dsp_filter.h" #include "input/input_context.h" #include "input/overlay.h" #include "frontend/frontend_context.h" diff --git a/gfx/filter.c b/gfx/filter.c index 6644211e60..1fae4b2365 100644 --- a/gfx/filter.c +++ b/gfx/filter.c @@ -14,7 +14,7 @@ */ #include "filter.h" -#include "filters/softfilter.h" +#include "video_filters/softfilter.h" #include "../dynamic.h" #include #include diff --git a/gfx/filter.h b/gfx/filter.h index 5e39cd8fe6..d446e40da2 100644 --- a/gfx/filter.h +++ b/gfx/filter.h @@ -19,8 +19,6 @@ #include "../libretro.h" #include -#include "filters/softfilter.h" - #define RARCH_SOFTFILTER_THREADS_AUTO 0 typedef struct rarch_softfilter rarch_softfilter_t; diff --git a/gfx/filters/2xBR.filt b/gfx/video_filters/2xBR.filt similarity index 100% rename from gfx/filters/2xBR.filt rename to gfx/video_filters/2xBR.filt diff --git a/gfx/filters/2xSaI.filt b/gfx/video_filters/2xSaI.filt similarity index 100% rename from gfx/filters/2xSaI.filt rename to gfx/video_filters/2xSaI.filt diff --git a/gfx/filters/2xbr.c b/gfx/video_filters/2xbr.c similarity index 100% rename from gfx/filters/2xbr.c rename to gfx/video_filters/2xbr.c diff --git a/gfx/filters/2xsai.c b/gfx/video_filters/2xsai.c similarity index 100% rename from gfx/filters/2xsai.c rename to gfx/video_filters/2xsai.c diff --git a/gfx/filters/Blargg_NTSC_SNES_Composite.filt b/gfx/video_filters/Blargg_NTSC_SNES_Composite.filt similarity index 100% rename from gfx/filters/Blargg_NTSC_SNES_Composite.filt rename to gfx/video_filters/Blargg_NTSC_SNES_Composite.filt diff --git a/gfx/filters/Blargg_NTSC_SNES_RF.filt b/gfx/video_filters/Blargg_NTSC_SNES_RF.filt similarity index 100% rename from gfx/filters/Blargg_NTSC_SNES_RF.filt rename to gfx/video_filters/Blargg_NTSC_SNES_RF.filt diff --git a/gfx/filters/Blargg_NTSC_SNES_RGB.filt b/gfx/video_filters/Blargg_NTSC_SNES_RGB.filt similarity index 100% rename from gfx/filters/Blargg_NTSC_SNES_RGB.filt rename to gfx/video_filters/Blargg_NTSC_SNES_RGB.filt diff --git a/gfx/filters/Blargg_NTSC_SNES_S-Video.filt b/gfx/video_filters/Blargg_NTSC_SNES_S-Video.filt similarity index 100% rename from gfx/filters/Blargg_NTSC_SNES_S-Video.filt rename to gfx/video_filters/Blargg_NTSC_SNES_S-Video.filt diff --git a/gfx/filters/Darken.filt b/gfx/video_filters/Darken.filt similarity index 100% rename from gfx/filters/Darken.filt rename to gfx/video_filters/Darken.filt diff --git a/gfx/filters/EPX.filt b/gfx/video_filters/EPX.filt similarity index 100% rename from gfx/filters/EPX.filt rename to gfx/video_filters/EPX.filt diff --git a/gfx/filters/LQ2x.filt b/gfx/video_filters/LQ2x.filt similarity index 100% rename from gfx/filters/LQ2x.filt rename to gfx/video_filters/LQ2x.filt diff --git a/gfx/filters/Makefile b/gfx/video_filters/Makefile similarity index 100% rename from gfx/filters/Makefile rename to gfx/video_filters/Makefile diff --git a/gfx/filters/Phosphor2x.filt b/gfx/video_filters/Phosphor2x.filt similarity index 100% rename from gfx/filters/Phosphor2x.filt rename to gfx/video_filters/Phosphor2x.filt diff --git a/gfx/filters/Scale2x.filt b/gfx/video_filters/Scale2x.filt similarity index 100% rename from gfx/filters/Scale2x.filt rename to gfx/video_filters/Scale2x.filt diff --git a/gfx/filters/Super2xSaI.filt b/gfx/video_filters/Super2xSaI.filt similarity index 100% rename from gfx/filters/Super2xSaI.filt rename to gfx/video_filters/Super2xSaI.filt diff --git a/gfx/filters/SuperEagle.filt b/gfx/video_filters/SuperEagle.filt similarity index 100% rename from gfx/filters/SuperEagle.filt rename to gfx/video_filters/SuperEagle.filt diff --git a/gfx/filters/blargg_ntsc_snes.c b/gfx/video_filters/blargg_ntsc_snes.c similarity index 100% rename from gfx/filters/blargg_ntsc_snes.c rename to gfx/video_filters/blargg_ntsc_snes.c diff --git a/gfx/filters/darken.c b/gfx/video_filters/darken.c similarity index 100% rename from gfx/filters/darken.c rename to gfx/video_filters/darken.c diff --git a/gfx/filters/epx.c b/gfx/video_filters/epx.c similarity index 100% rename from gfx/filters/epx.c rename to gfx/video_filters/epx.c diff --git a/gfx/filters/link.T b/gfx/video_filters/link.T similarity index 100% rename from gfx/filters/link.T rename to gfx/video_filters/link.T diff --git a/gfx/filters/lq2x.c b/gfx/video_filters/lq2x.c similarity index 100% rename from gfx/filters/lq2x.c rename to gfx/video_filters/lq2x.c diff --git a/gfx/filters/phosphor2x.c b/gfx/video_filters/phosphor2x.c similarity index 100% rename from gfx/filters/phosphor2x.c rename to gfx/video_filters/phosphor2x.c diff --git a/gfx/filters/scale2x.c b/gfx/video_filters/scale2x.c similarity index 100% rename from gfx/filters/scale2x.c rename to gfx/video_filters/scale2x.c diff --git a/gfx/filters/snes_ntsc/snes_ntsc.c b/gfx/video_filters/snes_ntsc/snes_ntsc.c similarity index 100% rename from gfx/filters/snes_ntsc/snes_ntsc.c rename to gfx/video_filters/snes_ntsc/snes_ntsc.c diff --git a/gfx/filters/snes_ntsc/snes_ntsc.h b/gfx/video_filters/snes_ntsc/snes_ntsc.h similarity index 100% rename from gfx/filters/snes_ntsc/snes_ntsc.h rename to gfx/video_filters/snes_ntsc/snes_ntsc.h diff --git a/gfx/filters/snes_ntsc/snes_ntsc_config.h b/gfx/video_filters/snes_ntsc/snes_ntsc_config.h similarity index 100% rename from gfx/filters/snes_ntsc/snes_ntsc_config.h rename to gfx/video_filters/snes_ntsc/snes_ntsc_config.h diff --git a/gfx/filters/snes_ntsc/snes_ntsc_impl.h b/gfx/video_filters/snes_ntsc/snes_ntsc_impl.h similarity index 100% rename from gfx/filters/snes_ntsc/snes_ntsc_impl.h rename to gfx/video_filters/snes_ntsc/snes_ntsc_impl.h diff --git a/gfx/filters/softfilter.h b/gfx/video_filters/softfilter.h similarity index 100% rename from gfx/filters/softfilter.h rename to gfx/video_filters/softfilter.h diff --git a/gfx/filters/super2xsai.c b/gfx/video_filters/super2xsai.c similarity index 100% rename from gfx/filters/super2xsai.c rename to gfx/video_filters/super2xsai.c diff --git a/gfx/filters/supereagle.c b/gfx/video_filters/supereagle.c similarity index 100% rename from gfx/filters/supereagle.c rename to gfx/video_filters/supereagle.c diff --git a/griffin/griffin.c b/griffin/griffin.c index 73d0862e19..1fe1904e69 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -511,25 +511,25 @@ FILTERS ============================================================ */ #ifdef HAVE_FILTERS_BUILTIN -#include "../gfx/filters/2xsai.c" -#include "../gfx/filters/super2xsai.c" -#include "../gfx/filters/supereagle.c" -#include "../gfx/filters/2xbr.c" -#include "../gfx/filters/darken.c" -#include "../gfx/filters/epx.c" -#include "../gfx/filters/scale2x.c" -#include "../gfx/filters/blargg_ntsc_snes.c" -#include "../gfx/filters/lq2x.c" -#include "../gfx/filters/phosphor2x.c" +#include "../gfx/video_filters/2xsai.c" +#include "../gfx/video_filters/super2xsai.c" +#include "../gfx/video_filters/supereagle.c" +#include "../gfx/video_filters/2xbr.c" +#include "../gfx/video_filters/darken.c" +#include "../gfx/video_filters/epx.c" +#include "../gfx/video_filters/scale2x.c" +#include "../gfx/video_filters/blargg_ntsc_snes.c" +#include "../gfx/video_filters/lq2x.c" +#include "../gfx/video_filters/phosphor2x.c" -#include "../audio/filters/echo.c" -#include "../audio/filters/eq.c" -#include "../audio/filters/chorus.c" -#include "../audio/filters/iir.c" -#include "../audio/filters/panning.c" -#include "../audio/filters/phaser.c" -#include "../audio/filters/reverb.c" -#include "../audio/filters/wahwah.c" +#include "../audio/audio_filters/echo.c" +#include "../audio/audio_filters/eq.c" +#include "../audio/audio_filters/chorus.c" +#include "../audio/audio_filters/iir.c" +#include "../audio/audio_filters/panning.c" +#include "../audio/audio_filters/phaser.c" +#include "../audio/audio_filters/reverb.c" +#include "../audio/audio_filters/wahwah.c" #endif /*============================================================ DYNAMIC