// feed it back it's own registers, just like after loading state\r
memcpy(YM2612GetRegs(), state, 0x204);\r
ym2612_unpack_state();\r
- if ((PicoAHW & PAHW_MCD) && !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))\r
- cdda_start_play();\r
}\r
\r
if (preserve_state) memcpy(state, sn76496_regs, 28*4); // remember old state\r
}\r
\r
// cdda\r
-static pm_file *cdda_stream = NULL;\r
-\r
static void cdda_raw_update(int *buffer, int length)\r
{\r
int ret, cdda_bytes, mult = 1;\r
- if (cdda_stream == NULL)\r
- return;\r
\r
cdda_bytes = length*4;\r
if (PsndRate <= 22050 + 100) mult = 2;\r
if (PsndRate < 22050 - 100) mult = 4;\r
cdda_bytes *= mult;\r
\r
- ret = pm_read(cdda_out_buffer, cdda_bytes, cdda_stream);\r
+ ret = pm_read(cdda_out_buffer, cdda_bytes, Pico_mcd->cdda_stream);\r
if (ret < cdda_bytes) {\r
memset((char *)cdda_out_buffer + ret, 0, cdda_bytes - ret);\r
- cdda_stream = NULL;\r
+ Pico_mcd->cdda_stream = NULL;\r
return;\r
}\r
\r
}\r
}\r
\r
-PICO_INTERNAL void cdda_start_play(void)\r
+void cdda_start_play(int lba_base, int lba_offset, int lb_len)\r
{\r
- int lba_offset, index, lba_length, i;\r
-\r
- elprintf(EL_STATUS, "cdda play track #%i", Pico_mcd->scd.Cur_Track);\r
-\r
- index = Pico_mcd->scd.Cur_Track - 1;\r
-\r
- lba_offset = Pico_mcd->scd.Cur_LBA - Track_to_LBA(index + 1);\r
- if (lba_offset < 0) lba_offset = 0;\r
- lba_offset += Pico_mcd->TOC.Tracks[index].Offset;\r
-\r
- // find the actual file for this track\r
- for (i = index; i > 0; i--)\r
- if (Pico_mcd->TOC.Tracks[i].F != NULL) break;\r
-\r
- if (Pico_mcd->TOC.Tracks[i].F == NULL) {\r
- elprintf(EL_STATUS|EL_ANOMALY, "no track?!");\r
- return;\r
- }\r
-\r
- if (Pico_mcd->TOC.Tracks[i].ftype == CT_MP3)\r
+ if (Pico_mcd->cdda_type == CT_MP3)\r
{\r
int pos1024 = 0;\r
\r
- lba_length = Pico_mcd->TOC.Tracks[i].Length;\r
- for (i++; i < Pico_mcd->TOC.Last_Track; i++) {\r
- if (Pico_mcd->TOC.Tracks[i].F != NULL) break;\r
- lba_length += Pico_mcd->TOC.Tracks[i].Length;\r
- }\r
-\r
if (lba_offset)\r
- pos1024 = lba_offset * 1024 / lba_length;\r
+ pos1024 = lba_offset * 1024 / lb_len;\r
\r
- mp3_start_play(Pico_mcd->TOC.Tracks[index].F, pos1024);\r
+ mp3_start_play(Pico_mcd->cdda_stream, pos1024);\r
return;\r
}\r
\r
- cdda_stream = Pico_mcd->TOC.Tracks[i].F;\r
- PicoCDBufferFlush(); // buffering relies on fp not being touched\r
- pm_seek(cdda_stream, lba_offset * 2352, SEEK_SET);\r
- if (Pico_mcd->TOC.Tracks[i].ftype == CT_WAV)\r
+ pm_seek(Pico_mcd->cdda_stream, (lba_base + lba_offset) * 2352, SEEK_SET);\r
+ if (Pico_mcd->cdda_type == CT_WAV)\r
{\r
// skip headers, assume it's 44kHz stereo uncompressed\r
- pm_seek(cdda_stream, 44, SEEK_CUR);\r
+ pm_seek(Pico_mcd->cdda_stream, 44, SEEK_CUR);\r
}\r
}\r
\r
\r
// CD: CDDA audio\r
// CD mode, cdda enabled, not data track, CDC is reading\r
- if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_CDDA) &&\r
- !(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))\r
+ if ((PicoAHW & PAHW_MCD) && (PicoOpt & POPT_EN_MCD_CDDA)\r
+ && Pico_mcd->cdda_stream != NULL\r
+ && !(Pico_mcd->s68k_regs[0x36] & 1))\r
{\r
// note: only 44, 22 and 11 kHz supported, with forced stereo\r
- int index = Pico_mcd->scd.Cur_Track - 1;\r
-\r
- if (Pico_mcd->TOC.Tracks[index].ftype == CT_MP3)\r
+ if (Pico_mcd->cdda_type == CT_MP3)\r
mp3_update(buf32, length, stereo);\r
else\r
cdda_raw_update(buf32, length);\r