Make rbcodec/dsp includes more specific.

Change-Id: Idb6af40df26f5b8499a40e8b98602261ef227044

19 files changed, 10 insertions, 22 deletions

diff --git a/apps/beep.c b/apps/beep.c
index 0152900..8ac7ccf 100644
--- a/apps/beep.c
+++ b/apps/beep.c
@@ -21,7 +21,7 @@
 #include "config.h"
 #include "system.h"
 #include "settings.h"
-#include "dsp.h"
+#include "dsp_core.h" /* for NATIVE_FREQUENCY */
 #include "pcm.h"
 #include "pcm_mixer.h"
 #include "misc.h"
diff --git a/apps/bookmark.c b/apps/bookmark.c
index e0325b3..a6e454f 100644
--- a/apps/bookmark.c
+++ b/apps/bookmark.c
@@ -42,7 +42,6 @@
 #include "plugin.h"
 #include "file.h"
 #include "filefuncs.h"
-#include "dsp.h"
 
 #define MAX_BOOKMARKS 10
 #define MAX_BOOKMARK_SIZE  350
diff --git a/apps/codec_thread.c b/apps/codec_thread.c
index 17ca980..dd745d3 100644
--- a/apps/codec_thread.c
+++ b/apps/codec_thread.c
@@ -28,7 +28,7 @@
 #include "pcmbuf.h"
 #include "playback.h"
 #include "buffering.h"
-#include "dsp.h"
+#include "dsp_core.h"
 #include "metadata.h"
 #include "settings.h"
 
diff --git a/apps/gui/pitchscreen.c b/apps/gui/pitchscreen.c
index 13da415..200033b 100644
--- a/apps/gui/pitchscreen.c
+++ b/apps/gui/pitchscreen.c
@@ -26,7 +26,6 @@
 #include <stdlib.h> /* for abs() */
 #include "config.h"
 #include "action.h"
-#include "dsp.h"
 #include "sound.h"
 #include "pcmbuf.h"
 #include "lang.h"
diff --git a/apps/gui/quickscreen.c b/apps/gui/quickscreen.c
index 965fe67..6e50d61 100644
--- a/apps/gui/quickscreen.c
+++ b/apps/gui/quickscreen.c
@@ -30,7 +30,6 @@
 #include "settings_list.h"
 #include "lang.h"
 #include "playlist.h"
-#include "dsp.h"
 #include "viewport.h"
 #include "audio.h"
 #include "quickscreen.h"
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 1bb5b8e..0f5deed 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -49,7 +49,6 @@
 /* Image stuff */
 #include "albumart.h"
 #endif
-#include "dsp.h"
 #include "playlist.h"
 #if CONFIG_CODEC == SWCODEC
 #include "playback.h"
diff --git a/apps/gui/skin_engine/skin_touchsupport.c b/apps/gui/skin_engine/skin_touchsupport.c
index 59687bd..a52a884 100644
--- a/apps/gui/skin_engine/skin_touchsupport.c
+++ b/apps/gui/skin_engine/skin_touchsupport.c
@@ -32,7 +32,7 @@
 #include "lang.h"
 #include "splash.h"
 #include "playlist.h"
-#include "dsp.h"
+#include "dsp_misc.h"
 
 /** Disarms all touchregions. */
 void skin_disarm_touchregions(struct wps_data *data)
diff --git a/apps/gui/wps.c b/apps/gui/wps.c
index 313ac2c..88918e1 100644
--- a/apps/gui/wps.c
+++ b/apps/gui/wps.c
@@ -61,7 +61,6 @@
 #include "viewport.h"
 #include "pcmbuf.h"
 #include "option_select.h"
-#include "dsp.h"
 #include "playlist_viewer.h"
 #include "wps.h"
 #include "statusbar-skinned.h"
diff --git a/apps/menus/eq_menu.c b/apps/menus/eq_menu.c
index 60b2687..7ece92e 100644
--- a/apps/menus/eq_menu.c
+++ b/apps/menus/eq_menu.c
@@ -38,7 +38,7 @@
 #include "talk.h"
 #include "misc.h"
 #include "sound.h"
-#include "dsp.h"
+#include "dsp_proc_settings.h"
 #include "tree.h"
 #include "screen_access.h"
 #include "keyboard.h"
diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c
index 17b7e57..d1d9995 100644
--- a/apps/menus/playback_menu.c
+++ b/apps/menus/playback_menu.c
@@ -31,7 +31,6 @@
 #include "sound_menu.h"
 #include "kernel.h"
 #include "playlist.h"
-#include "dsp.h"
 #include "scrobbler.h"
 #include "audio.h"
 #include "cuesheet.h"
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c
index 3eeb8bc..21686ab 100644
--- a/apps/menus/recording_menu.c
+++ b/apps/menus/recording_menu.c
@@ -53,7 +53,6 @@
 #include "splash.h"
 #if CONFIG_CODEC == SWCODEC
 #include "metadata.h"
-#include "dsp.h"
 #include "menus/eq_menu.h"
 #ifdef HAVE_RECORDING
 #include "enc_config.h"
diff --git a/apps/menus/sound_menu.c b/apps/menus/sound_menu.c
index 0817304..8090257 100644
--- a/apps/menus/sound_menu.c
+++ b/apps/menus/sound_menu.c
@@ -34,7 +34,6 @@
 #include "menu_common.h"
 #include "splash.h"
 #include "kernel.h"
-#include "dsp.h"
 
 /***********************************/
 /*    SOUND MENU                   */
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index 9cedae0..9754f13 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -40,7 +40,7 @@
 #include "settings.h"
 #include "audio.h"
 #include "voice_thread.h"
-#include "dsp.h"
+#include "dsp_core.h"
 
 /* This is the target fill size of chunks on the pcm buffer
    Can be any number of samples but power of two sizes make for faster and
diff --git a/apps/plugin.h b/apps/plugin.h
index 3820c7e..588a012 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -75,7 +75,8 @@ void* plugin_get_buffer(size_t *buffer_size);
 #if (CONFIG_CODEC == SWCODEC)
 #include "pcm_mixer.h"
 #include "dsp-util.h"
-#include "dsp.h"
+#include "dsp_core.h"
+#include "dsp_proc_settings.h"
 #include "codecs.h"
 #include "playback.h"
 #include "codec_thread.h"
diff --git a/apps/screens.c b/apps/screens.c
index 866ec58..d02f29b 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -55,10 +55,6 @@
 #include "language.h"
 #include "replaygain.h"
 
-#if CONFIG_CODEC == SWCODEC
-#include "dsp.h"
-#endif
-
 #if defined(ARCHOS_FMRECORDER) || defined(ARCHOS_RECORDERV2)
 #include "adc.h"
 #endif
diff --git a/apps/settings.c b/apps/settings.c
index 49d239a..d481bc5 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -80,7 +80,7 @@ struct user_settings global_settings;
 struct system_status global_status;
 
 #if CONFIG_CODEC == SWCODEC
-#include "dsp.h"
+#include "dsp_proc_settings.h"
 #include "playback.h"
 #ifdef HAVE_RECORDING
 #include "enc_config.h"
diff --git a/apps/settings.h b/apps/settings.h
index 4d94ca8..0713468 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -32,7 +32,7 @@
 #include "button.h"
 #if CONFIG_CODEC == SWCODEC
 #include "audio.h"
-#include "dsp.h"
+#include "dsp_proc_settings.h"
 #endif
 #include "rbpaths.h"
 
diff --git a/apps/settings_list.c b/apps/settings_list.c
index 82cccd8..5f4adde 100644
--- a/apps/settings_list.c
+++ b/apps/settings_list.c
@@ -33,7 +33,6 @@
 #include "settings.h"
 #include "settings_list.h"
 #include "usb.h"
-#include "dsp.h"
 #include "audio.h"
 #include "power.h"
 #include "powermgmt.h"
diff --git a/apps/voice_thread.c b/apps/voice_thread.c
index cff703a..48c6f48 100644
--- a/apps/voice_thread.c
+++ b/apps/voice_thread.c
@@ -23,7 +23,7 @@
 #include "thread.h"
 #include "voice_thread.h"
 #include "talk.h"
-#include "dsp.h"
+#include "dsp_core.h"
 #include "audio.h"
 #include "playback.h"
 #include "pcmbuf.h"