diff options
author | Björn Stenberg <bjorn@haxx.se> | 2009-01-07 09:53:46 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2009-01-07 09:53:46 +0000 |
commit | a36cdf5b37994a301d4fdeab123ee1569a34cf46 (patch) | |
tree | 5794a1f13f93e3d7190572e07709aa1a11e9e892 /apps/codecs.h | |
parent | f9329e4c9273f1b82aa5dbb36f243546ce55036d (diff) | |
download | rockbox-a36cdf5b37994a301d4fdeab123ee1569a34cf46.tar.gz rockbox-a36cdf5b37994a301d4fdeab123ee1569a34cf46.zip |
Removed the sim_ prefix from the plugin api.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19704 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs.h')
-rw-r--r-- | apps/codecs.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/apps/codecs.h b/apps/codecs.h index d765daba2a..cd3774d191 100644 --- a/apps/codecs.h +++ b/apps/codecs.h | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <stdbool.h> | 34 | #include <stdbool.h> |
35 | #include <stdlib.h> | 35 | #include <stdlib.h> |
36 | #include "config.h" | 36 | #include "config.h" |
37 | #include "kernel.h" | ||
38 | #include "system.h" | 37 | #include "system.h" |
39 | #include "metadata.h" | 38 | #include "metadata.h" |
40 | #include "audio.h" | 39 | #include "audio.h" |
@@ -70,12 +69,6 @@ | |||
70 | 69 | ||
71 | #endif | 70 | #endif |
72 | 71 | ||
73 | #ifdef SIMULATOR | ||
74 | #define PREFIX(_x_) sim_ ## _x_ | ||
75 | #else | ||
76 | #define PREFIX(_x_) _x_ | ||
77 | #endif | ||
78 | |||
79 | /* magic for normal codecs */ | 72 | /* magic for normal codecs */ |
80 | #define CODEC_MAGIC 0x52434F44 /* RCOD */ | 73 | #define CODEC_MAGIC 0x52434F44 /* RCOD */ |
81 | /* magic for encoder codecs */ | 74 | /* magic for encoder codecs */ |
@@ -160,7 +153,7 @@ struct codec_api { | |||
160 | void (*configure)(int setting, intptr_t value); | 153 | void (*configure)(int setting, intptr_t value); |
161 | 154 | ||
162 | /* kernel/ system */ | 155 | /* kernel/ system */ |
163 | void (*PREFIX(sleep))(int ticks); | 156 | void (*sleep)(int ticks); |
164 | void (*yield)(void); | 157 | void (*yield)(void); |
165 | 158 | ||
166 | #if NUM_CORES > 1 | 159 | #if NUM_CORES > 1 |
@@ -227,10 +220,10 @@ struct codec_api { | |||
227 | size_t (*enc_unget_pcm_data)(size_t size); | 220 | size_t (*enc_unget_pcm_data)(size_t size); |
228 | 221 | ||
229 | /* file */ | 222 | /* file */ |
230 | int (*PREFIX(open))(const char* pathname, int flags); | 223 | int (*open)(const char* pathname, int flags); |
231 | int (*close)(int fd); | 224 | int (*close)(int fd); |
232 | ssize_t (*read)(int fd, void* buf, size_t count); | 225 | ssize_t (*read)(int fd, void* buf, size_t count); |
233 | off_t (*PREFIX(lseek))(int fd, off_t offset, int whence); | 226 | off_t (*lseek)(int fd, off_t offset, int whence); |
234 | ssize_t (*write)(int fd, const void* buf, size_t count); | 227 | ssize_t (*write)(int fd, const void* buf, size_t count); |
235 | int (*round_value_to_list32)(unsigned long value, | 228 | int (*round_value_to_list32)(unsigned long value, |
236 | const unsigned long list[], | 229 | const unsigned long list[], |