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

2 files changed, 8 insertions, 25 deletions

diff --git a/apps/codecs.c b/apps/codecs.c
index 6720de909c..380816ba40 100644
--- a/apps/codecs.c
+++ b/apps/codecs.c
@@ -50,10 +50,6 @@
 #include "database.h"
 #include "splash.h"
 
-#if (CONFIG_CODEC == SWCODEC)
-#include "pcm_playback.h"
-#endif
-
 #ifdef SIMULATOR
 #if CONFIG_CODEC == SWCODEC
 unsigned char codecbuf[CODEC_SIZE];
@@ -162,13 +158,6 @@ struct codec_api ci = {
     mp3_play_pause,
     mp3_play_stop,
     mp3_is_playing,
-#if CONFIG_CODEC == SWCODEC
-    pcm_play_data,    
-    pcm_play_stop,
-    pcm_set_frequency,
-    pcm_is_playing,
-    pcm_play_pause,
-#endif
 #endif
 
     /* playback control */
@@ -216,8 +205,6 @@ struct codec_api ci = {
     battery_level,
     battery_level_safe,
 
-    /* new stuff at the end, sort into place next time
-       the API gets incompatible */
 #ifdef RB_PROFILE
     profile_thread,
     profstop,
@@ -225,6 +212,9 @@ struct codec_api ci = {
     profile_func_exit,
 #endif
 
+    /* new stuff at the end, sort into place next time
+       the API gets incompatible */
+
 };
 
 int codec_load_ram(char* codecptr, int size, void* ptr2, int bufwrap,
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 */