X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=psp%2Fmp3.c;h=049b9a59a8f23c690559d6e5c02f1af387d46808;hb=69dfeea15942d588fe0e4b18b51cf54cfde5b272;hp=19f6ec36d7973832b18bc02786e17ad1f35d3395;hpb=dfa8d77a42bf22658504d9d1f3d6700dd41d0c7d;p=libpicofe.git diff --git a/psp/mp3.c b/psp/mp3.c index 19f6ec3..049b9a5 100644 --- a/psp/mp3.c +++ b/psp/mp3.c @@ -11,8 +11,8 @@ #include #include -#include "../../Pico/PicoInt.h" -#include "../../Pico/sound/mix.h" +#include "../../pico/pico_int.h" +#include "../../pico/sound/mix.h" #include "../common/lprintf.h" int mp3_last_error = 0; @@ -300,11 +300,11 @@ static int decode_thread(SceSize args, void *argp) // might be called before initialization -int mp3_get_bitrate(FILE *f, int size) +int mp3_get_bitrate(void *f, int size) { int ret, retval = -1, sample_rate, bitrate; // filenames are stored instead handles in PSP, due to stupid max open file limit - char *fname = (char *)f; + char *fname = f; /* make sure thread is not busy.. */ if (thread_busy_sem >= 0) @@ -351,9 +351,9 @@ end: static int mp3_job_started = 0, mp3_samples_ready = 0, mp3_buffer_offs = 0, mp3_play_bufsel = 0; -void mp3_start_play(FILE *f, int pos) +void mp3_start_play(void *f, int pos) { - char *fname = (char *)f; + char *fname = f; if (!initialized) return;