| version 1.52, 2004/02/16 05:31:31 | version 1.54, 2004/02/25 19:30:40 | 
| Line 38 | Line 38 | 
 | #include        "np2opening.h" | #include        "np2opening.h" | 
 | #include        "toolwin.h" | #include        "toolwin.h" | 
 | #include        "aboutdlg.h" | #include        "aboutdlg.h" | 
 |  | #include        "keystat.h" | 
 |  |  | 
 | #include        <QuickTime/QuickTime.h> | #include        <QuickTime/QuickTime.h> | 
 | #define USE_RESUME | #define USE_RESUME | 
| Line 707  static void flagload(const char *ext) { | Line 708  static void flagload(const char *ext) { | 
 | ret = IDOK; | ret = IDOK; | 
 | getstatfilename(path, ext, sizeof(path)); | getstatfilename(path, ext, sizeof(path)); | 
 | r = statsave_check(path, buf, sizeof(buf)); | r = statsave_check(path, buf, sizeof(buf)); | 
| if (r & (~NP2FLAG_DISKCHG)) { | if (r & (~STATFLAG_DISKCHG)) { | 
 | ResumeErrorDialogProc(); | ResumeErrorDialogProc(); | 
 | ret = IDCANCEL; | ret = IDCANCEL; | 
 | } | } | 
| else if (r & NP2FLAG_DISKCHG) { | else if (r & STATFLAG_DISKCHG) { | 
 | ret = ResumeWarningDialogProc(buf); | ret = ResumeWarningDialogProc(buf); | 
 | } | } | 
 | if (ret == IDOK) { | if (ret == IDOK) { | 
| Line 742  int main(int argc, char *argv[]) { | Line 743  int main(int argc, char *argv[]) { | 
 |  |  | 
 | TRACEINIT(); | TRACEINIT(); | 
 |  |  | 
| toolwin_readini(); | keystat_initialize(); | 
|  |  | 
|  | toolwin_readini(); | 
 | if (!(setupMainWindow())) { | if (!(setupMainWindow())) { | 
 | return(0); | return(0); | 
 | } | } | 
| Line 790  int main(int argc, char *argv[]) { | Line 793  int main(int argc, char *argv[]) { | 
 | S98_init(); | S98_init(); | 
 |  |  | 
 | hid_init(); | hid_init(); | 
| #ifndef SUPPORT_WAVEMIX | #ifndef SUPPORT_SWSEEKSND | 
 | if (soundmng_initialize() == SUCCESS) { | if (soundmng_initialize() == SUCCESS) { | 
 | soundmng_pcmvolume(SOUND_PCMSEEK, np2cfg.MOTORVOL); | soundmng_pcmvolume(SOUND_PCMSEEK, np2cfg.MOTORVOL); | 
 | soundmng_pcmvolume(SOUND_PCMSEEK1, np2cfg.MOTORVOL); | soundmng_pcmvolume(SOUND_PCMSEEK1, np2cfg.MOTORVOL); | 
| Line 914  int main(int argc, char *argv[]) { | Line 917  int main(int argc, char *argv[]) { | 
 | #if defined(NP2GCC) | #if defined(NP2GCC) | 
 | mousemng_disable(MOUSEPROC_SYSTEM); | mousemng_disable(MOUSEPROC_SYSTEM); | 
 | #endif | #endif | 
| #ifndef SUPPORT_WAVEMIX | #ifndef SUPPORT_SWSEEKSND | 
 | soundmng_deinitialize(); | soundmng_deinitialize(); | 
 | #endif | #endif | 
 | scrnmng_destroy(); | scrnmng_destroy(); |