move more globals to PicoInterface

[picodrive.git] / platform / win32 / plat.c

diff --git a/platform/win32/plat.c b/platform/win32/plat.c
index aa3a7f2..8abb062 100644 (file)
--- a/platform/win32/plat.c
+++ b/platform/win32/plat.c
@@ -64,7 +64,6 @@ int plat_wait_event(int *fds_hnds, int count, int timeout_ms)
 void pemu_prep_defconfig(void)
 {
        memset(&defaultConfig, 0, sizeof(defaultConfig));
-       defaultConfig.s_PicoOpt|= POPT_6BTN_PAD; // for xmen proto
        defaultConfig.s_PicoCDBuffers = 0;
        defaultConfig.Frameskip = 0;
 }
@@ -124,7 +123,7 @@ static int sndbuff[2*44100/50/2 + 4];
 static void update_sound(int len)
 {
        /* avoid writing audio when lagging behind to prevent audio lag */
-       if (PicoSkipFrame != 2)
+       if (PicoIn.skipFrame != 2)
                DSoundUpdate(sndbuff, (currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) ? 0 : 1);
 }
 
@@ -132,7 +131,7 @@ void pemu_sound_start(void)
 {
        int ret;
 
-       PsndOut = NULL;
+       PicoIn.sndOut = NULL;
        currentConfig.EmuOpt &= ~EOPT_EXT_FRMLIMIT;
 
        // prepare sound stuff
@@ -140,14 +139,14 @@ void pemu_sound_start(void)
        {
                PsndRerate(0);
 
-               ret = DSoundInit(FrameWnd, PsndRate, (PicoOpt & POPT_EN_STEREO) ? 1 : 0, PsndLen);
+               ret = DSoundInit(FrameWnd, PicoIn.sndRate, (PicoIn.opt & POPT_EN_STEREO) ? 1 : 0, Pico.snd.len);
                if (ret != 0) {
                        lprintf("dsound init failed\n");
                        return;
                }
 
-               PsndOut = (void *)sndbuff;
-               PicoWriteSound = update_sound;
+               PicoIn.sndOut = (void *)sndbuff;
+               PicoIn.writeSound = update_sound;
                currentConfig.EmuOpt |= EOPT_EXT_FRMLIMIT;
        }
 }