|
|
| version 1.4, 2003/10/18 07:28:50 | version 1.7, 2003/10/20 06:36:33 |
|---|---|
| Line 43 typedef struct { | Line 43 typedef struct { |
| enum { | enum { |
| NP2FLAG_BIN = 0, | NP2FLAG_BIN = 0, |
| NP2FLAG_TERM, | NP2FLAG_TERM, |
| NP2FLAG_CORE, | NP2FLAG_CLOCK, |
| NP2FLAG_DMA, | NP2FLAG_DMA, |
| NP2FLAG_EGC, | NP2FLAG_EGC, |
| NP2FLAG_EXT, | NP2FLAG_EXT, |
| Line 349 static int flagload_common(NP2FFILE *f, | Line 349 static int flagload_common(NP2FFILE *f, |
| // ----- | // ----- |
| static int flagload_core(NP2FFILE *f, const STENTRY *t) { | static int flagload_clock(NP2FFILE *f, const STENTRY *t) { |
| int ret; | int ret; |
| ret = flagload_common(f, t); | ret = flagload_common(f, t); |
| if (opna_rate) { | sound_changeclock(); |
| pc.sampleclock = (pc.realclock / opna_rate) + 1; | |
| } | |
| else { | |
| pc.sampleclock = 0; | |
| } | |
| return(ret); | return(ret); |
| } | } |
| Line 499 static int flagload_ext(NP2FFILE *f, con | Line 494 static int flagload_ext(NP2FFILE *f, con |
| // ----- | // ----- |
| typedef struct { | typedef struct { |
| SINT32 remainclock; | |
| SINT32 baseclock; | |
| UINT32 clock; | |
| UINT readyevents; | UINT readyevents; |
| UINT waitevents; | UINT waitevents; |
| } NEVTSAVE; | } NEVTSAVE; |
| Line 540 static int flagsave_evt(NP2FFILE *f, con | Line 532 static int flagsave_evt(NP2FFILE *f, con |
| int ret; | int ret; |
| UINT i; | UINT i; |
| nevt.remainclock = nevent.remainclock; | |
| nevt.baseclock = nevent.baseclock; | |
| nevt.clock = nevent.clock; | |
| nevt.readyevents = nevent.readyevents; | nevt.readyevents = nevent.readyevents; |
| nevt.waitevents = nevent.waitevents; | nevt.waitevents = nevent.waitevents; |
| Line 601 static int flagload_evt(NP2FFILE *f, con | Line 590 static int flagload_evt(NP2FFILE *f, con |
| ret = flagload_load(f, &nevt, sizeof(nevt)); | ret = flagload_load(f, &nevt, sizeof(nevt)); |
| nevent.remainclock = nevt.remainclock; | |
| nevent.baseclock = nevt.baseclock; | |
| nevent.clock = nevt.clock; | |
| nevent.readyevents = 0; | nevent.readyevents = 0; |
| nevent.waitevents = 0; | nevent.waitevents = 0; |
| Line 1174 int statsave_save(const char *filename) | Line 1160 int statsave_save(const char *filename) |
| for (i=0; i<sizeof(np2tbl)/sizeof(STENTRY); i++) { | for (i=0; i<sizeof(np2tbl)/sizeof(STENTRY); i++) { |
| switch(np2tbl[i].type) { | switch(np2tbl[i].type) { |
| case NP2FLAG_BIN: | case NP2FLAG_BIN: |
| case NP2FLAG_CORE: | case NP2FLAG_CLOCK: |
| case NP2FLAG_BEEP: | case NP2FLAG_BEEP: |
| ret |= flagsave_common(&f, &np2tbl[i]); | ret |= flagsave_common(&f, &np2tbl[i]); |
| break; | break; |
| Line 1265 int statsave_check(const char *filename, | Line 1251 int statsave_check(const char *filename, |
| done = TRUE; | done = TRUE; |
| break; | break; |
| case NP2FLAG_CORE: | case NP2FLAG_CLOCK: |
| case NP2FLAG_DMA: | case NP2FLAG_DMA: |
| case NP2FLAG_EGC: | case NP2FLAG_EGC: |
| case NP2FLAG_EXT: | case NP2FLAG_EXT: |
| Line 1344 int statsave_load(const char *filename) | Line 1330 int statsave_load(const char *filename) |
| done = TRUE; | done = TRUE; |
| break; | break; |
| case NP2FLAG_CORE: | case NP2FLAG_CLOCK: |
| ret |= flagload_core(&f, &np2tbl[i]); | ret |= flagload_clock(&f, &np2tbl[i]); |
| break; | break; |
| case NP2FLAG_DMA: | case NP2FLAG_DMA: |