cdrom: change pause timing again

[pcsx_rearmed.git] / plugins / dfsound / freeze.c

diff --git a/plugins/dfsound/freeze.c b/plugins/dfsound/freeze.c
index 32c07db..36b8995 100644 (file)
--- a/plugins/dfsound/freeze.c
+++ b/plugins/dfsound/freeze.c
@@ -107,7 +107,7 @@ typedef struct
  ADSRInfoEx_orig   ADSRX;                              // next ADSR settings (will be moved to active on sample start)\r
 } SPUCHAN_orig;\r
 \r
-typedef struct\r
+typedef struct SPUFreeze\r
 {\r
  char          szSPUName[8];\r
  uint32_t ulFreezeVersion;\r
@@ -236,8 +236,8 @@ static void load_register(unsigned long reg, unsigned int cycles)
 // SPUFREEZE: called by main emu on savestate load/save\r
 ////////////////////////////////////////////////////////////////////////\r
 \r
-long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,\r
- uint32_t cycles)\r
+long CALLBACK SPUfreeze(unsigned int ulFreezeMode, SPUFreeze_t * pF,\r
+ unsigned int cycles)\r
 {\r
  SPUOSSFreeze_t * pFO = NULL;\r
  int i;\r
@@ -303,6 +303,13 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
    pFO->xa_left = xa_left;\r
    pFO->cdda_left = cdda_left;\r
    pFO->cycles_played = spu.cycles_played;\r
+   pFO->cycles_dma_end = spu.cycles_dma_end;\r
+   pFO->decode_dirty_ch = spu.decode_dirty_ch;\r
+   pFO->dwNoiseVal = spu.dwNoiseVal;\r
+   pFO->dwNoiseCount = spu.dwNoiseCount;\r
+   pFO->XARepeat = spu.XARepeat;\r
+   pFO->XALastVal = spu.XALastVal;\r
+   pFO->last_keyon_cycles = spu.last_keyon_cycles;\r
 \r
    for(i=0;i<MAXCHAN;i++)\r
     {\r
@@ -331,6 +338,7 @@ long CALLBACK SPUfreeze(uint32_t ulFreezeMode, SPUFreeze_t * pF,
 \r
  spu.XAPlay = spu.XAFeed = spu.XAStart;\r
  spu.CDDAPlay = spu.CDDAFeed = spu.CDDAStart;\r
+ spu.cdClearSamples = 512;\r
  if (pFO && pFO->xa_left && pF->xaS.nsamples) {        // start xa again\r
   FeedXA(&pF->xaS);\r
   spu.XAPlay = spu.XAFeed - pFO->xa_left;\r