}\r
\r
\r
+/***********************************************************/\r
+\r
static int mp3_samples_ready = 0, mp3_buffer_offs = 0;\r
static int mp3_play_bufsel = 0, mp3_job_started = 0;\r
\r
void mp3_update(int *buffer, int length, int stereo)\r
{\r
int length_mp3;\r
- int cdda_on;\r
-\r
- // playback was started, track not ended\r
- cdda_on = loaded_mp3 && shared_ctl->mp3_offs < shared_ctl->mp3_len;\r
\r
- if (!cdda_on) return;\r
-\r
- if (!(PicoOpt&0x200)) {\r
+ if (!(PicoOpt & POPT_EXT_FM)) {\r
mp3_update_local(buffer, length, stereo);\r
return;\r
}\r
\r
+ // check if playback was started, track not ended\r
+ if (loaded_mp3 == NULL || shared_ctl->mp3_offs >= shared_ctl->mp3_len)\r
+ return;\r
+\r
length_mp3 = length;\r
if (PsndRate == 22050) length_mp3 <<= 1; // mp3s are locked to 44100Hz stereo\r
else if (PsndRate == 11025) length_mp3 <<= 2; // so make length 44100ish\r
}\r
\r
\r
-/***********************************************************/\r
-\r
void mp3_start_play(FILE *f, int pos) // pos is 0-1023\r
{\r
int byte_offs = 0;\r
\r
- if (!(PicoOpt&0x800)) { // cdda disabled?\r
+ if (!(PicoOpt & POPT_EN_MCD_CDDA) || f == NULL)\r
+ return;\r
+\r
+ if (!(PicoOpt & POPT_EXT_FM)) {\r
+ mp3_start_play_local(f, pos);\r
return;\r
}\r
\r
mp3_job_started = 0;\r
shared_ctl->mp3_buffsel = 1; // will change to 0 on first decode\r
\r
- if (PicoOpt & POPT_EXT_FM)\r
- {\r
- add_job_940(JOB940_MP3RESET);\r
- if (CHECK_BUSY(JOB940_MP3RESET)) wait_busy_940(JOB940_MP3RESET);\r
- }\r
- else\r
- mp3_start_local();\r
-}\r
-\r
-\r
-int mp3_get_offset(void)\r
-{\r
- unsigned int offs1024 = 0;\r
- int cdda_on;\r
-\r
- cdda_on = (PicoAHW & PAHW_MCD) && (PicoOpt&0x800) && !(Pico_mcd->s68k_regs[0x36] & 1) &&\r
- (Pico_mcd->scd.Status_CDC & 1) && loaded_mp3;\r
-\r
- if (cdda_on) {\r
- offs1024 = shared_ctl->mp3_offs << 7;\r
- offs1024 /= shared_ctl->mp3_len >> 3;\r
- }\r
- printf("offs1024=%u (%i/%i)\n", offs1024, shared_ctl->mp3_offs, shared_ctl->mp3_len);\r
-\r
- return offs1024;\r
+ add_job_940(JOB940_MP3RESET);\r
+ if (CHECK_BUSY(JOB940_MP3RESET)) wait_busy_940(JOB940_MP3RESET);\r
}\r
\r
-\r