summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/rbcodec/codecs/codecs.h3
-rw-r--r--lib/rbcodec/codecs/lib/codeclib.c1
-rw-r--r--lib/rbcodec/dsp/channel_mode.c3
-rw-r--r--lib/rbcodec/dsp/compressor.c12
-rw-r--r--lib/rbcodec/dsp/crossfeed.c9
-rw-r--r--lib/rbcodec/dsp/dsp_core.c2
-rw-r--r--lib/rbcodec/dsp/dsp_core.h (renamed from lib/rbcodec/dsp/dsp.h)3
-rw-r--r--lib/rbcodec/dsp/dsp_misc.c9
-rw-r--r--lib/rbcodec/dsp/dsp_proc_entry.h3
-rw-r--r--lib/rbcodec/dsp/dsp_proc_settings.h2
-rw-r--r--lib/rbcodec/dsp/dsp_sample_input.c2
-rw-r--r--lib/rbcodec/dsp/dsp_sample_output.c2
-rw-r--r--lib/rbcodec/dsp/eq.c6
-rw-r--r--lib/rbcodec/dsp/lin_resample.c4
-rw-r--r--lib/rbcodec/dsp/pga.c2
-rw-r--r--lib/rbcodec/dsp/tdspeed.c4
-rw-r--r--lib/rbcodec/dsp/tone_controls.c8
-rw-r--r--lib/rbcodec/test/warble.c2
18 files changed, 36 insertions, 41 deletions
diff --git a/lib/rbcodec/codecs/codecs.h b/lib/rbcodec/codecs/codecs.h
index d4a51a4..91ce869 100644
--- a/lib/rbcodec/codecs/codecs.h
+++ b/lib/rbcodec/codecs/codecs.h
@@ -42,7 +42,8 @@
#ifdef HAVE_RECORDING
#include "pcm_record.h"
#endif
-#include "dsp.h"
+#include "dsp_core.h"
+#include "dsp_misc.h"
#include "dsp-util.h"
#endif
diff --git a/lib/rbcodec/codecs/lib/codeclib.c b/lib/rbcodec/codecs/lib/codeclib.c
index 4ca6c8c..4859da3 100644
--- a/lib/rbcodec/codecs/lib/codeclib.c
+++ b/lib/rbcodec/codecs/lib/codeclib.c
@@ -23,7 +23,6 @@
#include <string.h>
#include "codecs.h"
-#include "dsp.h"
#include "codeclib.h"
#include "metadata.h"
#include "dsp_proc_entry.h"
diff --git a/lib/rbcodec/dsp/channel_mode.c b/lib/rbcodec/dsp/channel_mode.c
index 5b67888..5259b46 100644
--- a/lib/rbcodec/dsp/channel_mode.c
+++ b/lib/rbcodec/dsp/channel_mode.c
@@ -21,12 +21,11 @@
****************************************************************************/
#include "config.h"
#include "system.h"
-#include "dsp.h"
-#include "settings.h"
#include "sound.h"
#include "fixedpoint.h"
#include "fracmul.h"
#include "dsp_proc_entry.h"
+#include "channel_mode.h"
#if 0
/* SOUND_CHAN_STEREO mode is a noop so has no function - just outline one for
diff --git a/lib/rbcodec/dsp/compressor.c b/lib/rbcodec/dsp/compressor.c
index 8441cd6..22a60e4 100644
--- a/lib/rbcodec/dsp/compressor.c
+++ b/lib/rbcodec/dsp/compressor.c
@@ -19,17 +19,17 @@
*
****************************************************************************/
#include "config.h"
-#include "system.h"
+#include <stdbool.h>
+#include <sys/types.h>
#include "fixedpoint.h"
#include "fracmul.h"
-#include "dsp.h"
#include <string.h>
/* Define LOGF_ENABLE to enable logf output in this file */
/*#define LOGF_ENABLE*/
#include "logf.h"
-
#include "dsp_proc_entry.h"
+#include "compressor.h"
static struct compressor_settings curr_set; /* Cached settings */
@@ -228,10 +228,10 @@ static bool compressor_update(const struct compressor_settings *settings)
logf("\nGain factors:");
for (int i = 1; i <= 65; i++)
{
- debugf("%02d: %.6f ", i, (float)comp_curve[i] / UNITY);
- if (i % 4 == 0) debugf("\n");
+ DEBUGF("%02d: %.6f ", i, (float)comp_curve[i] / UNITY);
+ if (i % 4 == 0) DEBUGF("\n");
}
- debugf("\n");
+ DEBUGF("\n");
#endif
/* if using auto peak, then makeup gain is max offset -
diff --git a/lib/rbcodec/dsp/crossfeed.c b/lib/rbcodec/dsp/crossfeed.c
index ecb5564..344adda 100644
--- a/lib/rbcodec/dsp/crossfeed.c
+++ b/lib/rbcodec/dsp/crossfeed.c
@@ -20,14 +20,15 @@
*
****************************************************************************/
#include "config.h"
-#include "system.h"
-#include "dsp.h"
-#include "dsp_filter.h"
+#include <stdbool.h>
+#include <sys/types.h>
#include "fixedpoint.h"
#include "fracmul.h"
#include "replaygain.h"
-#include <string.h>
#include "dsp_proc_entry.h"
+#include "dsp_filter.h"
+#include "crossfeed.h"
+#include <string.h>
/* Implemented here or in target assembly code */
void crossfeed_process(struct dsp_proc_entry *this, struct dsp_buffer **buf_p);
diff --git a/lib/rbcodec/dsp/dsp_core.c b/lib/rbcodec/dsp/dsp_core.c
index 84fe64a..4a7c478 100644
--- a/lib/rbcodec/dsp/dsp_core.c
+++ b/lib/rbcodec/dsp/dsp_core.c
@@ -21,7 +21,7 @@
****************************************************************************/
#include "config.h"
#include "system.h"
-#include "dsp.h"
+#include "dsp_core.h"
#include "dsp_sample_io.h"
#include <sys/types.h>
diff --git a/lib/rbcodec/dsp/dsp.h b/lib/rbcodec/dsp/dsp_core.h
index feac4aa..0119da8 100644
--- a/lib/rbcodec/dsp/dsp.h
+++ b/lib/rbcodec/dsp/dsp_core.h
@@ -23,9 +23,6 @@
struct dsp_config;
-/* Include all this junk here for now */
-#include "dsp_proc_settings.h"
-
enum dsp_ids
{
CODEC_IDX_AUDIO,
diff --git a/lib/rbcodec/dsp/dsp_misc.c b/lib/rbcodec/dsp/dsp_misc.c
index 7b45891..a98a7e4 100644
--- a/lib/rbcodec/dsp/dsp_misc.c
+++ b/lib/rbcodec/dsp/dsp_misc.c
@@ -22,15 +22,14 @@
*
****************************************************************************/
#include "config.h"
-#include "system.h"
-#include "dsp.h"
-#include "dsp_sample_io.h"
-#include "replaygain.h"
#include "sound.h"
#include "settings.h"
#include "fixedpoint.h"
-#include <string.h>
+#include "replaygain.h"
#include "dsp_proc_entry.h"
+#include "dsp_sample_io.h"
+#include "dsp_misc.h"
+#include <string.h>
/** Firmware callback interface **/
diff --git a/lib/rbcodec/dsp/dsp_proc_entry.h b/lib/rbcodec/dsp/dsp_proc_entry.h
index 8bdfe5e..c534437 100644
--- a/lib/rbcodec/dsp/dsp_proc_entry.h
+++ b/lib/rbcodec/dsp/dsp_proc_entry.h
@@ -90,7 +90,8 @@ struct dsp_proc_db_entry;
#include "dsp_proc_database.h"
struct dsp_proc_entry;
-enum dsp_proc_ids;
+
+#include "dsp_core.h"
/* DSP sample transform function prototype */
typedef void (*dsp_proc_fn_type)(struct dsp_proc_entry *this,
diff --git a/lib/rbcodec/dsp/dsp_proc_settings.h b/lib/rbcodec/dsp/dsp_proc_settings.h
index bade579..10bc671 100644
--- a/lib/rbcodec/dsp/dsp_proc_settings.h
+++ b/lib/rbcodec/dsp/dsp_proc_settings.h
@@ -21,8 +21,6 @@
#ifndef DSP_PROC_SETTINGS_H
#define DSP_PROC_SETTINGS_H
-struct dsp_config;
-
/* Collect all headers together */
#include "channel_mode.h"
#include "compressor.h"
diff --git a/lib/rbcodec/dsp/dsp_sample_input.c b/lib/rbcodec/dsp/dsp_sample_input.c
index 84127e1..97b4ec2 100644
--- a/lib/rbcodec/dsp/dsp_sample_input.c
+++ b/lib/rbcodec/dsp/dsp_sample_input.c
@@ -21,7 +21,7 @@
****************************************************************************/
#include "config.h"
#include "system.h"
-#include "dsp.h"
+#include "dsp_core.h"
#include "dsp_sample_io.h"
#if 1
diff --git a/lib/rbcodec/dsp/dsp_sample_output.c b/lib/rbcodec/dsp/dsp_sample_output.c
index 47fde04..4a8050b 100644
--- a/lib/rbcodec/dsp/dsp_sample_output.c
+++ b/lib/rbcodec/dsp/dsp_sample_output.c
@@ -21,7 +21,7 @@
****************************************************************************/
#include "config.h"
#include "system.h"
-#include "dsp.h"
+#include "dsp_core.h"
#include "dsp_sample_io.h"
#include "dsp-util.h"
#include <string.h>
diff --git a/lib/rbcodec/dsp/eq.c b/lib/rbcodec/dsp/eq.c
index 4e7df9b..a9e200f 100644
--- a/lib/rbcodec/dsp/eq.c
+++ b/lib/rbcodec/dsp/eq.c
@@ -23,11 +23,13 @@
#include "system.h"
#include "fixedpoint.h"
#include "fracmul.h"
-#include "dsp.h"
#include "dsp_filter.h"
+#include "dsp_proc_entry.h"
+#include "dsp_core.h"
+#include "eq.h"
+#include "pga.h"
#include "replaygain.h"
#include <string.h>
-#include "dsp_proc_entry.h"
/**
* Current setup is one lowshelf filters three peaking filters and one
diff --git a/lib/rbcodec/dsp/lin_resample.c b/lib/rbcodec/dsp/lin_resample.c
index c8be3cb..b3855ec 100644
--- a/lib/rbcodec/dsp/lin_resample.c
+++ b/lib/rbcodec/dsp/lin_resample.c
@@ -21,12 +21,10 @@
****************************************************************************/
#include "config.h"
#include "system.h"
-#include "dsp.h"
#include "fracmul.h"
#include "fixedpoint.h"
-#include "dsp_sample_io.h"
-#include <string.h>
#include "dsp_proc_entry.h"
+#include <string.h>
/**
* Linear interpolation resampling that introduces a one sample delay because
diff --git a/lib/rbcodec/dsp/pga.c b/lib/rbcodec/dsp/pga.c
index c2c29cc..de852d0 100644
--- a/lib/rbcodec/dsp/pga.c
+++ b/lib/rbcodec/dsp/pga.c
@@ -21,11 +21,11 @@
****************************************************************************/
#include "config.h"
#include "system.h"
-#include "dsp.h"
#include "dsp-util.h"
#include "fixedpoint.h"
#include "fracmul.h"
#include "dsp_proc_entry.h"
+#include "pga.h"
/* Implemented here or in target assembly code */
void pga_process(struct dsp_proc_entry *this, struct dsp_buffer **buf_p);
diff --git a/lib/rbcodec/dsp/tdspeed.c b/lib/rbcodec/dsp/tdspeed.c
index 3aa8acc..82b6b0e 100644
--- a/lib/rbcodec/dsp/tdspeed.c
+++ b/lib/rbcodec/dsp/tdspeed.c
@@ -24,11 +24,9 @@
#include "system.h"
#include "sound.h"
#include "core_alloc.h"
-#include "system.h"
-#include "tdspeed.h"
-#include "settings.h"
#include "dsp-util.h"
#include "dsp_proc_entry.h"
+#include "tdspeed.h"
#define assert(cond)
diff --git a/lib/rbcodec/dsp/tone_controls.c b/lib/rbcodec/dsp/tone_controls.c
index 0bd4a44..922c966 100644
--- a/lib/rbcodec/dsp/tone_controls.c
+++ b/lib/rbcodec/dsp/tone_controls.c
@@ -20,11 +20,13 @@
*
****************************************************************************/
#include "config.h"
-#include "system.h"
-#include "dsp.h"
-#include <string.h>
+#include <stdbool.h>
+#include <sys/types.h>
+#include <stdint.h>
#include "dsp_proc_entry.h"
#include "dsp_filter.h"
+#include "tone_controls.h"
+#include <string.h>
/* These apply to all DSP streams to remain as consistant as possible with
* the behavior of hardware tone controls */
diff --git a/lib/rbcodec/test/warble.c b/lib/rbcodec/test/warble.c
index 8b55502..5e2e980 100644
--- a/lib/rbcodec/test/warble.c
+++ b/lib/rbcodec/test/warble.c
@@ -35,7 +35,7 @@
#include "codecs.h"
#include "core_alloc.h" /* core_allocator_init */
#include "debug.h"
-#include "dsp.h"
+#include "dsp_core.h"
#include "metadata.h"
#include "settings.h"
#include "sound.h"
generated by cgit v1.1 at 2026-04-25 07:28:06 +0000