From d2e75bf02d1ad91fca0e283e8c71b1091ec85a80 Mon Sep 17 00:00:00 2001 From: Brandon Low Date: Fri, 3 Feb 2006 00:12:11 +0000 Subject: Remove exported pcm functions. Codecs should never be allowed to access the pcm directly. Only through the callbacks in playback.c. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8544 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'apps/codecs.h') diff --git a/apps/codecs.h b/apps/codecs.h index 70799f790e..6e2ef9882c 100644 --- a/apps/codecs.h +++ b/apps/codecs.h @@ -48,7 +48,6 @@ #endif #if (CONFIG_CODEC == SWCODEC) #include "dsp.h" -#include "pcm_playback.h" #include "playback.h" #endif #include "settings.h" @@ -86,12 +85,12 @@ #define CODEC_MAGIC 0x52434F44 /* RCOD */ /* increase this every time the api struct changes */ -#define CODEC_API_VERSION 2 +#define CODEC_API_VERSION 3 /* update this to latest version if a change to the api struct breaks backwards compatibility (and please take the opportunity to sort in any new function which are "waiting" at the end of the function table) */ -#define CODEC_MIN_API_VERSION 1 +#define CODEC_MIN_API_VERSION 3 /* codec return codes */ enum codec_status { @@ -230,13 +229,6 @@ struct codec_api { void (*mp3_play_pause)(bool play); void (*mp3_play_stop)(void); bool (*mp3_is_playing)(void); -#if CONFIG_CODEC == SWCODEC - void (*pcm_play_data)(void (*get_more)(unsigned char** start, long*size)); - void (*pcm_play_stop)(void); - void (*pcm_set_frequency)(unsigned int frequency); - bool (*pcm_is_playing)(void); - void (*pcm_play_pause)(bool play); -#endif #endif /* !SIMULATOR */ /* playback control */ @@ -290,8 +282,6 @@ struct codec_api { int (*battery_level)(void); bool (*battery_level_safe)(void); - /* new stuff at the end, sort into place next time - the API gets incompatible */ #ifdef RB_PROFILE void (*profile_thread)(void); void (*profstop)(void); @@ -299,6 +289,9 @@ struct codec_api { void (*profile_func_exit)(void *this_fn, void *call_site); #endif + /* new stuff at the end, sort into place next time + the API gets incompatible */ + }; /* codec header */ -- cgit v1.2.3