move more globals to PicoInterface

[picodrive.git] / pico / pico.h

diff --git a/pico/pico.h b/pico/pico.h
index 2d63d18..f22ef60 100644 (file)
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -97,6 +97,15 @@ typedef struct
 \r
        unsigned short quirks;         // game-specific quirks: PQUIRK_*\r
        unsigned short overclockM68k;  // overclock the emulated 68k, in %\r
+\r
+       int sndRate;                   // rate in Hz\r
+       short *sndOut;                 // PCM output buffer\r
+       void (*writeSound)(int len);   // write .sndOut callback, called once per frame\r
+\r
+       void (*osdMessage)(const char *msg); // output OSD message from emu, optional\r
+\r
+       void (*mcdTrayOpen)(void);\r
+       void (*mcdTrayClose)(void);\r
 } PicoInterface;\r
 \r
 extern PicoInterface PicoIn;\r
@@ -108,18 +117,12 @@ int  PicoReset(void);
 void PicoLoopPrepare(void);\r
 void PicoFrame(void);\r
 void PicoFrameDrawOnly(void);\r
-extern void (*PicoWriteSound)(int bytes); // called once per frame at the best time to send sound buffer (PsndOut) to hardware\r
-extern void (*PicoMessage)(const char *msg); // callback to output text message from emu\r
 typedef enum { PI_ROM, PI_ISPAL, PI_IS40_CELL, PI_IS240_LINES } pint_t;\r
 typedef union { int vint; void *vptr; } pint_ret_t;\r
 void PicoGetInternal(pint_t which, pint_ret_t *ret);\r
 \r
 struct PicoEState;\r
 \r
-// cd/mcd.c\r
-extern void (*PicoMCDopenTray)(void);\r
-extern void (*PicoMCDcloseTray)(void);\r
-\r
 // pico.c\r
 #define XPCM_BUFFER_SIZE (320+160)\r
 typedef struct\r
@@ -230,8 +233,6 @@ void Pico32xSetClocks(int msh2_hz, int ssh2_hz);
 #define PICO_SSH2_HZ ((int)(7670442.0 * 2.4))\r
 \r
 // sound.c\r
-extern int PsndRate,PsndLen;\r
-extern short *PsndOut;\r
 extern void (*PsndMix_32_to_16l)(short *dest, int *src, int count);\r
 void PsndRerate(int preserve_state);\r
 \r