X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2FArea.c;h=a402d4eae8f7bab4292ccd1bf7e3527291fc22d1;hb=1832075ec7b43b166a9d5f83753832a05e7d4239;hp=b949a14e86db3b11a465eb55c7a719386d2f8228;hpb=602133e1c66666f9152b1edb3014e137a9768cad;p=picodrive.git

diff --git a/Pico/cd/Area.c b/Pico/cd/Area.c
index b949a14..a402d4e 100644
--- a/Pico/cd/Area.c
+++ b/Pico/cd/Area.c
@@ -121,12 +121,13 @@ PICO_INTERNAL int PicoCdSaveState(void *file)
 	}
 	if (PicoOpt&3)
 		CHECKED_WRITE(CHUNK_PSG, 28*4, sn76496_regs);
-	if (PicoOpt&1)
+	if (PicoOpt&1) {
+		ym2612_pack_state();
 		CHECKED_WRITE(CHUNK_FM, 0x200+4, ym2612_regs);
+	}
 
 	if (PicoAHW & PAHW_MCD)
 	{
-		Pico_mcd->m.audio_offset = mp3_get_offset();
 		memset(buff, 0, sizeof(buff));
 		PicoAreaPackCpu(buff, 1);
 		if (Pico_mcd->s68k_regs[3]&4) // 1M mode?
@@ -231,7 +232,7 @@ PICO_INTERNAL int PicoCdLoadState(void *file)
 			case CHUNK_PSG:   CHECKED_READ2(28*4, sn76496_regs); break;
 			case CHUNK_FM:
 				CHECKED_READ2(0x200+4, ym2612_regs);
-				YM2612PicoStateLoad();
+				ym2612_unpack_state();
 				break;
 
 			// cd stuff
@@ -280,8 +281,8 @@ PICO_INTERNAL int PicoCdLoadState(void *file)
 		if (Pico_mcd->s68k_regs[3]&4)
 			PicoMemResetCDdecode(Pico_mcd->s68k_regs[3]);
 #endif
-		if (Pico_mcd->m.audio_track > 0 && Pico_mcd->m.audio_track < Pico_mcd->TOC.Last_Track)
-			mp3_start_play(Pico_mcd->TOC.Tracks[Pico_mcd->m.audio_track].F, Pico_mcd->m.audio_offset);
+		if (!(Pico_mcd->s68k_regs[0x36] & 1) && (Pico_mcd->scd.Status_CDC & 1))
+			cdda_start_play();
 		// restore hint vector
         	*(unsigned short *)(Pico_mcd->bios + 0x72) = Pico_mcd->m.hint_vector;
 	}