make OSS detect blocking, adjust audio API

[picodrive.git] / pico / pico.h

diff --git a/pico/pico.h b/pico/pico.h
index 870444a..ca7577f 100644 (file)
--- a/pico/pico.h
+++ b/pico/pico.h
@@ -12,7 +12,7 @@
 #ifndef PICO_H\r
 #define PICO_H\r
 \r
-#include <stdio.h>\r
+//#include <stdio.h>\r
 \r
 // port-specific compile-time settings\r
 #include <port_config.h>\r
@@ -22,8 +22,8 @@ extern "C" {
 #endif\r
 \r
 // external funcs for Sega/Mega CD\r
-extern int  mp3_get_bitrate(FILE *f, int size);\r
-extern void mp3_start_play(FILE *f, int pos);\r
+extern int  mp3_get_bitrate(void *f, int size);\r
+extern void mp3_start_play(void *f, int pos);\r
 extern void mp3_update(int *buffer, int length, int stereo);\r
 \r
 // this function should write-back d-cache and invalidate i-cache\r
@@ -90,7 +90,7 @@ void PicoLoopPrepare(void);
 void PicoFrame(void);\r
 void PicoFrameDrawOnly(void);\r
 extern int PicoPad[2]; // Joypads, format is MXYZ SACB RLDU\r
-extern void (*PicoWriteSound)(int len); // called once per frame at the best time to send sound buffer (PsndOut) to hardware\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
@@ -101,7 +101,7 @@ extern void (*PicoMCDopenTray)(void);
 extern void (*PicoMCDcloseTray)(void);\r
 extern int PicoCDBuffers;\r
 \r
-// Pico/Pico.c\r
+// pico.c\r
 #define XPCM_BUFFER_SIZE (320+160)\r
 typedef struct\r
 {\r
@@ -170,10 +170,9 @@ typedef enum
 } pdso_t;\r
 void PicoDrawSetOutFormat(pdso_t which, int allow_32x);\r
 void PicoDrawSetOutBuf(void *dest, int increment);\r
+void PicoDrawSetCallbacks(int (*begin)(unsigned int num), int (*end)(unsigned int num));\r
 extern void *DrawLineDest;\r
 extern unsigned char *HighCol;\r
-extern int (*PicoScanBegin)(unsigned int num);\r
-extern int (*PicoScanEnd)(unsigned int num);\r
 // utility\r
 #ifdef _ASM_DRAW_C\r
 void vidConvCpyRGB565(void *to, void *from, int pixels);\r
@@ -209,10 +208,16 @@ extern unsigned char  *PicoDraw2FB;  // buffer for fast renderer in format (8+32
 extern unsigned short *PicoCramHigh; // pointer to CRAM buff (0x40 shorts), converted to native device color (works only with 16bit for now)\r
 extern void (*PicoPrepareCram)();    // prepares PicoCramHigh for renderer to use\r
 \r
+// pico.c (32x)\r
+// multipliers against 68k clock\r
+extern int p32x_msh2_multiplier;\r
+extern int p32x_ssh2_multiplier;\r
+#define SH2_MULTI_SHIFT 10\r
+#define MSH2_MULTI_DEFAULT ((1 << SH2_MULTI_SHIFT) * 3 / 2)\r
+#define SSH2_MULTI_DEFAULT ((1 << SH2_MULTI_SHIFT) * 3 / 2)\r
+\r
 // 32x/draw.c\r
 void PicoDraw32xSetFrameMode(int is_on, int only_32x);\r
-extern int (*PicoScan32xBegin)(unsigned int num);\r
-extern int (*PicoScan32xEnd)(unsigned int num);\r
 \r
 // sound.c\r
 extern int PsndRate,PsndLen;\r