rearrange globals

[picodrive.git] / platform / psp / mp3.c

diff --git a/platform/psp/mp3.c b/platform/psp/mp3.c
index 456b72b..4ea3bdd 100644 (file)
--- a/platform/psp/mp3.c
+++ b/platform/psp/mp3.c
@@ -1,7 +1,10 @@
-// (c) Copyright 2007 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * PicoDrive
+ * (C) notaz, 2007,2008
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include <stdio.h>
 #include <string.h>
@@ -11,8 +14,8 @@
 #include <pspaudiocodec.h>
 #include <kubridge.h>
 
-#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;
@@ -165,7 +168,8 @@ int mp3_init(void)
             mod = load_start_module("flash0:/kd/audiocodec.prx");
        else mod = load_start_module("flash0:/kd/avcodec.prx");
        if (mod < 0) {
-               ret = mod = load_start_module("flash0:/kd/audiocodec_260.prx"); // last chance..
+               ret = mod;
+               mod = load_start_module("flash0:/kd/audiocodec_260.prx"); // last chance..
                if (mod < 0) goto fail;
        }
 
@@ -204,8 +208,9 @@ int mp3_init(void)
                goto fail2;
        }
 
+       /* use slightly higher prio then main */
        thread_exit = 0;
-       thid = sceKernelCreateThread("mp3decode_thread", decode_thread, 30, 0x2000, 0, 0); /* use slightly higher prio then main */
+       thid = sceKernelCreateThread("mp3decode_thread", decode_thread, 30, 0x2000, 0, NULL);
        if (thid < 0) {
                lprintf("failed to create decode thread: %08x\n", thid);
                ret = thid;
@@ -298,11 +303,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)
@@ -349,9 +354,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;
 
@@ -371,6 +376,9 @@ void mp3_start_play(FILE *f, int pos)
                mp3_fname = fname;
        }
 
+       // clear decoder state
+       sceAudiocodecInit(mp3_codec_struct, 0x1002);
+
        // seek..
        mp3_src_pos = (int) (((float)pos / 1023.0f) * (float)mp3_src_size);
        sceIoLseek32(mp3_handle, mp3_src_pos, PSP_SEEK_SET);
@@ -458,7 +466,7 @@ int mp3_get_offset(void) // 0-1023
        unsigned int offs1024 = 0;
        int cdda_on;
 
-       cdda_on = (PicoMCD & 1) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&
+       cdda_on = (PicoIn.AHW & PAHW_MCD) && (PicoIn.opt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&
                        (Pico_mcd->scd.Status_CDC & 1) && mp3_handle >= 0;
 
        if (cdda_on) {
@@ -471,3 +479,17 @@ int mp3_get_offset(void) // 0-1023
 }
 
 
+void mp3_reopen_file(void)
+{
+       if (mp3_fname == NULL) return;
+       lprintf("mp3_reopen_file(%s)\n", mp3_fname);
+
+       // try closing, just in case
+       if (mp3_handle >= 0) sceIoClose(mp3_handle);
+
+       mp3_handle = sceIoOpen(mp3_fname, PSP_O_RDONLY, 0777);
+       if (mp3_handle >= 0)
+               sceIoLseek32(mp3_handle, mp3_src_pos, PSP_SEEK_SET);
+       lprintf("mp3_reopen_file %s\n", mp3_handle >= 0 ? "ok" : "failed");
+}
+