summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2005-09-21 13:09:10 +0000
committerThom Johansen <thomj@rockbox.org>2005-09-21 13:09:10 +0000
commitf60e6200f64f0fcf9d82027eaf40ddad0f1e2f17 (patch)
tree2e0e84fa01730805d6f252054942e6c25a06e3ab
parent5f78b9a53065caf12955f0c3271b20e42ba30fc1 (diff)
downloadrockbox-f60e6200f64f0fcf9d82027eaf40ddad0f1e2f17.tar.gz
rockbox-f60e6200f64f0fcf9d82027eaf40ddad0f1e2f17.zip
DSP_* constants moved from playback.h to dsp.h.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7529 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/codecs/lib/codeclib.c2
-rw-r--r--apps/codecs/mpc.c2
-rw-r--r--apps/dsp.h19
-rw-r--r--apps/playback.h19
4 files changed, 21 insertions, 21 deletions
diff --git a/apps/codecs/lib/codeclib.c b/apps/codecs/lib/codeclib.c
index ac6e36245f..b2f5c23f77 100644
--- a/apps/codecs/lib/codeclib.c
+++ b/apps/codecs/lib/codeclib.c
@@ -20,7 +20,7 @@
20/* "helper functions" common to all codecs */ 20/* "helper functions" common to all codecs */
21 21
22#include "plugin.h" 22#include "plugin.h"
23#include "playback.h" 23#include "dsp.h"
24#include "codeclib.h" 24#include "codeclib.h"
25#include "xxx2wav.h" 25#include "xxx2wav.h"
26#include "id3.h" 26#include "id3.h"
diff --git a/apps/codecs/mpc.c b/apps/codecs/mpc.c
index abcb30b653..d37ac46a4f 100644
--- a/apps/codecs/mpc.c
+++ b/apps/codecs/mpc.c
@@ -18,7 +18,7 @@
18 ****************************************************************************/ 18 ****************************************************************************/
19 19
20#include "codec.h" 20#include "codec.h"
21#include "playback.h" 21#include "dsp.h"
22#include "lib/codeclib.h" 22#include "lib/codeclib.h"
23#include <codecs/libmusepack/musepack.h> 23#include <codecs/libmusepack/musepack.h>
24 24
diff --git a/apps/dsp.h b/apps/dsp.h
index 856c08f689..fdd9a191cb 100644
--- a/apps/dsp.h
+++ b/apps/dsp.h
@@ -28,6 +28,25 @@
28#define STEREO_NONINTERLEAVED 1 28#define STEREO_NONINTERLEAVED 1
29#define STEREO_MONO 2 29#define STEREO_MONO 2
30 30
31enum {
32 CODEC_SET_FILEBUF_WATERMARK = 1,
33 CODEC_SET_FILEBUF_CHUNKSIZE,
34 CODEC_SET_FILEBUF_LIMIT,
35 CODEC_DSP_ENABLE,
36 DSP_SET_FREQUENCY,
37 DSP_SWITCH_FREQUENCY,
38 DSP_SET_CLIP_MIN,
39 DSP_SET_CLIP_MAX,
40 DSP_SET_SAMPLE_DEPTH,
41 DSP_SET_STEREO_MODE,
42 DSP_RESET,
43 DSP_DITHER,
44 DSP_SET_TRACK_GAIN,
45 DSP_SET_ALBUM_GAIN,
46 DSP_SET_TRACK_PEAK,
47 DSP_SET_ALBUM_PEAK
48};
49
31long dsp_process(char *dest, char *src[], long size); 50long dsp_process(char *dest, char *src[], long size);
32long dsp_input_size(long size); 51long dsp_input_size(long size);
33long dsp_output_size(long size); 52long dsp_output_size(long size);
diff --git a/apps/playback.h b/apps/playback.h
index a5b64ba0e3..0fb5d5c319 100644
--- a/apps/playback.h
+++ b/apps/playback.h
@@ -27,25 +27,6 @@
27#include "id3.h" 27#include "id3.h"
28#include "mp3data.h" 28#include "mp3data.h"
29 29
30enum {
31 CODEC_SET_FILEBUF_WATERMARK = 1,
32 CODEC_SET_FILEBUF_CHUNKSIZE,
33 CODEC_SET_FILEBUF_LIMIT,
34 CODEC_DSP_ENABLE,
35 DSP_SET_FREQUENCY,
36 DSP_SWITCH_FREQUENCY,
37 DSP_SET_CLIP_MIN,
38 DSP_SET_CLIP_MAX,
39 DSP_SET_SAMPLE_DEPTH,
40 DSP_SET_STEREO_MODE,
41 DSP_RESET,
42 DSP_DITHER,
43 DSP_SET_TRACK_GAIN,
44 DSP_SET_ALBUM_GAIN,
45 DSP_SET_TRACK_PEAK,
46 DSP_SET_ALBUM_PEAK
47};
48
49/* Not yet implemented. */ 30/* Not yet implemented. */
50#define CODEC_SET_AUDIOBUF_WATERMARK 4 31#define CODEC_SET_AUDIOBUF_WATERMARK 4
51 32