diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-08-29 21:15:27 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-08-29 21:15:27 +0000 |
commit | d6c054575b4561b4c657565ecb4ff82565fa6c78 (patch) | |
tree | c05a7f619a2580a8ae3ee29e863f076d1065c398 /apps/codecs.h | |
parent | 99a0598c284471342fcda1fdcba90d4b666bfbb3 (diff) | |
download | rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.tar.gz rockbox-d6c054575b4561b4c657565ecb4ff82565fa6c78.zip |
Renamed CONFIG_HWCODEC and MASNONE to the more appropriate CONFIG_CODEC and SWCODEC, respectively.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7416 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs.h')
-rw-r--r-- | apps/codecs.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/apps/codecs.h b/apps/codecs.h index 47cd5711ae..fe309554db 100644 --- a/apps/codecs.h +++ b/apps/codecs.h | |||
@@ -43,7 +43,7 @@ | |||
43 | #include "mpeg.h" | 43 | #include "mpeg.h" |
44 | #include "audio.h" | 44 | #include "audio.h" |
45 | #include "mp3_playback.h" | 45 | #include "mp3_playback.h" |
46 | #if (HWCODEC == MASNONE) | 46 | #if (HWCODEC == SWCODEC) |
47 | #include "pcm_playback.h" | 47 | #include "pcm_playback.h" |
48 | #endif | 48 | #endif |
49 | #include "settings.h" | 49 | #include "settings.h" |
@@ -234,10 +234,10 @@ struct codec_api { | |||
234 | void (*mp3_play_pause)(bool play); | 234 | void (*mp3_play_pause)(bool play); |
235 | void (*mp3_play_stop)(void); | 235 | void (*mp3_play_stop)(void); |
236 | bool (*mp3_is_playing)(void); | 236 | bool (*mp3_is_playing)(void); |
237 | #if CONFIG_HWCODEC != MASNONE | 237 | #if CONFIG_CODEC != SWCODEC |
238 | void (*bitswap)(unsigned char *data, int length); | 238 | void (*bitswap)(unsigned char *data, int length); |
239 | #endif | 239 | #endif |
240 | #if CONFIG_HWCODEC == MASNONE | 240 | #if CONFIG_CODEC == SWCODEC |
241 | void (*pcm_play_data)(void (*get_more)(unsigned char** start, long*size)); | 241 | void (*pcm_play_data)(void (*get_more)(unsigned char** start, long*size)); |
242 | void (*pcm_play_stop)(void); | 242 | void (*pcm_play_stop)(void); |
243 | void (*pcm_set_frequency)(unsigned int frequency); | 243 | void (*pcm_set_frequency)(unsigned int frequency); |
@@ -261,20 +261,20 @@ struct codec_api { | |||
261 | struct mp3entry* (*audio_current_track)(void); | 261 | struct mp3entry* (*audio_current_track)(void); |
262 | void (*audio_flush_and_reload_tracks)(void); | 262 | void (*audio_flush_and_reload_tracks)(void); |
263 | int (*audio_get_file_pos)(void); | 263 | int (*audio_get_file_pos)(void); |
264 | #if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE) | 264 | #if !defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC) |
265 | unsigned long (*mpeg_get_last_header)(void); | 265 | unsigned long (*mpeg_get_last_header)(void); |
266 | #endif | 266 | #endif |
267 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 267 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
268 | void (*sound_set_pitch)(int pitch); | 268 | void (*sound_set_pitch)(int pitch); |
269 | #endif | 269 | #endif |
270 | 270 | ||
271 | /* MAS communication */ | 271 | /* MAS communication */ |
272 | #if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE) | 272 | #if !defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC) |
273 | int (*mas_readmem)(int bank, int addr, unsigned long* dest, int len); | 273 | int (*mas_readmem)(int bank, int addr, unsigned long* dest, int len); |
274 | int (*mas_writemem)(int bank, int addr, const unsigned long* src, int len); | 274 | int (*mas_writemem)(int bank, int addr, const unsigned long* src, int len); |
275 | int (*mas_readreg)(int reg); | 275 | int (*mas_readreg)(int reg); |
276 | int (*mas_writereg)(int reg, unsigned int val); | 276 | int (*mas_writereg)(int reg, unsigned int val); |
277 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 277 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
278 | int (*mas_codec_writereg)(int reg, unsigned int val); | 278 | int (*mas_codec_writereg)(int reg, unsigned int val); |
279 | int (*mas_codec_readreg)(int reg); | 279 | int (*mas_codec_readreg)(int reg); |
280 | #endif | 280 | #endif |
@@ -311,7 +311,7 @@ struct codec_api { | |||
311 | long max_offset, unsigned long last_header); | 311 | long max_offset, unsigned long last_header); |
312 | int (*battery_level)(void); | 312 | int (*battery_level)(void); |
313 | bool (*battery_level_safe)(void); | 313 | bool (*battery_level_safe)(void); |
314 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 314 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
315 | unsigned short (*peak_meter_scale_value)(unsigned short val, | 315 | unsigned short (*peak_meter_scale_value)(unsigned short val, |
316 | int meterwidth); | 316 | int meterwidth); |
317 | void (*peak_meter_set_use_dbfs)(bool use); | 317 | void (*peak_meter_set_use_dbfs)(bool use); |
@@ -332,7 +332,7 @@ struct codec_api { | |||
332 | }; | 332 | }; |
333 | 333 | ||
334 | /* defined by the codec loader (codec.c) */ | 334 | /* defined by the codec loader (codec.c) */ |
335 | #if CONFIG_HWCODEC == MASNONE | 335 | #if CONFIG_CODEC == SWCODEC |
336 | int codec_load_ram(char* codecptr, int size, void* ptr2, int bufwrap, | 336 | int codec_load_ram(char* codecptr, int size, void* ptr2, int bufwrap, |
337 | struct codec_api *api); | 337 | struct codec_api *api); |
338 | int codec_load_file(const char* codec, struct codec_api *api); | 338 | int codec_load_file(const char* codec, struct codec_api *api); |