diff options
Diffstat (limited to 'apps/plugin.h')
-rw-r--r-- | apps/plugin.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/apps/plugin.h b/apps/plugin.h index 8760162405..839e87af64 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -44,7 +44,7 @@ | |||
44 | #include "mpeg.h" | 44 | #include "mpeg.h" |
45 | #include "audio.h" | 45 | #include "audio.h" |
46 | #include "mp3_playback.h" | 46 | #include "mp3_playback.h" |
47 | #if (HWCODEC == MASNONE) | 47 | #if (HWCODEC == SWCODEC) |
48 | #include "pcm_playback.h" | 48 | #include "pcm_playback.h" |
49 | #endif | 49 | #endif |
50 | #include "settings.h" | 50 | #include "settings.h" |
@@ -325,10 +325,10 @@ struct plugin_api { | |||
325 | void (*mp3_play_pause)(bool play); | 325 | void (*mp3_play_pause)(bool play); |
326 | void (*mp3_play_stop)(void); | 326 | void (*mp3_play_stop)(void); |
327 | bool (*mp3_is_playing)(void); | 327 | bool (*mp3_is_playing)(void); |
328 | #if CONFIG_HWCODEC != MASNONE | 328 | #if CONFIG_CODEC != SWCODEC |
329 | void (*bitswap)(unsigned char *data, int length); | 329 | void (*bitswap)(unsigned char *data, int length); |
330 | #endif | 330 | #endif |
331 | #if CONFIG_HWCODEC == MASNONE | 331 | #if CONFIG_CODEC == SWCODEC |
332 | void (*pcm_play_data)(void (*get_more)(unsigned char** start, long*size)); | 332 | void (*pcm_play_data)(void (*get_more)(unsigned char** start, long*size)); |
333 | void (*pcm_play_stop)(void); | 333 | void (*pcm_play_stop)(void); |
334 | void (*pcm_set_frequency)(unsigned int frequency); | 334 | void (*pcm_set_frequency)(unsigned int frequency); |
@@ -352,20 +352,20 @@ struct plugin_api { | |||
352 | struct mp3entry* (*audio_current_track)(void); | 352 | struct mp3entry* (*audio_current_track)(void); |
353 | void (*audio_flush_and_reload_tracks)(void); | 353 | void (*audio_flush_and_reload_tracks)(void); |
354 | int (*audio_get_file_pos)(void); | 354 | int (*audio_get_file_pos)(void); |
355 | #if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE) | 355 | #if !defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC) |
356 | unsigned long (*mpeg_get_last_header)(void); | 356 | unsigned long (*mpeg_get_last_header)(void); |
357 | #endif | 357 | #endif |
358 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 358 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
359 | void (*sound_set_pitch)(int pitch); | 359 | void (*sound_set_pitch)(int pitch); |
360 | #endif | 360 | #endif |
361 | 361 | ||
362 | /* MAS communication */ | 362 | /* MAS communication */ |
363 | #if !defined(SIMULATOR) && (CONFIG_HWCODEC != MASNONE) | 363 | #if !defined(SIMULATOR) && (CONFIG_CODEC != SWCODEC) |
364 | int (*mas_readmem)(int bank, int addr, unsigned long* dest, int len); | 364 | int (*mas_readmem)(int bank, int addr, unsigned long* dest, int len); |
365 | int (*mas_writemem)(int bank, int addr, const unsigned long* src, int len); | 365 | int (*mas_writemem)(int bank, int addr, const unsigned long* src, int len); |
366 | int (*mas_readreg)(int reg); | 366 | int (*mas_readreg)(int reg); |
367 | int (*mas_writereg)(int reg, unsigned int val); | 367 | int (*mas_writereg)(int reg, unsigned int val); |
368 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 368 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
369 | int (*mas_codec_writereg)(int reg, unsigned int val); | 369 | int (*mas_codec_writereg)(int reg, unsigned int val); |
370 | int (*mas_codec_readreg)(int reg); | 370 | int (*mas_codec_readreg)(int reg); |
371 | #endif | 371 | #endif |
@@ -410,7 +410,7 @@ struct plugin_api { | |||
410 | long max_offset, unsigned long last_header); | 410 | long max_offset, unsigned long last_header); |
411 | int (*battery_level)(void); | 411 | int (*battery_level)(void); |
412 | bool (*battery_level_safe)(void); | 412 | bool (*battery_level_safe)(void); |
413 | #if (CONFIG_HWCODEC == MAS3587F) || (CONFIG_HWCODEC == MAS3539F) | 413 | #if (CONFIG_CODEC == MAS3587F) || (CONFIG_CODEC == MAS3539F) |
414 | unsigned short (*peak_meter_scale_value)(unsigned short val, | 414 | unsigned short (*peak_meter_scale_value)(unsigned short val, |
415 | int meterwidth); | 415 | int meterwidth); |
416 | void (*peak_meter_set_use_dbfs)(bool use); | 416 | void (*peak_meter_set_use_dbfs)(bool use); |