Tweak paramters of mp3_play_data and callback.

Use generic void * and size_t and make mp3_play_data and its callback
agree on types. Use mp3_play_callback_t instead of prototyping
right in the function call (so it's not so messy to look at). Change
doesn't appear to require plugin API version increment.

Change-Id: Idcab2740ee316a2beb6e0a87b8f4934d9d6b3dd8
This commit is contained in:
Michael Sevakis 2012-03-04 14:44:43 -05:00
parent 534117d1e0
commit d18a5cad7f
13 changed files with 39 additions and 32 deletions

View file

@ -53,7 +53,7 @@ static bool paused; /* playback is paused */
static bool playing; /* We are playing an MP3 stream */
/* the registered callback function to ask for more mp3 data */
static void (*callback_for_more)(unsigned char**, size_t*);
static mp3_play_callback_t callback_for_more;
/* list of tracks in memory */
#define MAX_ID3_TAGS (1<<4) /* Must be power of 2 */
@ -156,7 +156,7 @@ static void play_tick(void)
void DEI3(void) __attribute__((interrupt_handler));
void DEI3(void)
{
unsigned char* start;
const void* start;
size_t size = 0;
if (callback_for_more != NULL)
@ -469,9 +469,8 @@ void mp3_play_init(void)
}
#endif
void mp3_play_data(const unsigned char* start, int size,
void (*get_more)(unsigned char** start, size_t* size) /* callback fn */
)
void mp3_play_data(const void* start, size_t size,
mp3_play_callback_t get_more)
{
/* init DMA */
DAR3 = 0x5FFFEC3;