X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=Pico%2Fsound%2Fym2612.h;h=20147ff3f5946536ae1e85dd59c2ba1f9759061f;hb=88b3d7c16ae976d332b8462de839b86f856a7180;hp=c575baefdd978ee8f0d35948efa9c4992e32f862;hpb=cc68a136aa179a5f32fe40208371eb9c2b0aadae;p=picodrive.git

diff --git a/Pico/sound/ym2612.h b/Pico/sound/ym2612.h
index c575bae..20147ff 100644
--- a/Pico/sound/ym2612.h
+++ b/Pico/sound/ym2612.h
@@ -142,7 +142,7 @@ typedef struct
 
 void YM2612Init_(int baseclock, int rate);
 void YM2612ResetChip_(void);
-void YM2612UpdateOne_(short *buffer, int length, int stereo);
+int  YM2612UpdateOne_(int *buffer, int length, int stereo, int is_buf_empty);
 
 int  YM2612Write_(unsigned int a, unsigned int v);
 unsigned char YM2612Read_(void);
@@ -162,7 +162,7 @@ void *YM2612GetRegs(void);
 #define YM2612PicoStateLoad YM2612PicoStateLoad_
 #else
 /* GP2X specific */
-#include "../../platform/gp2x/940ctl_ym2612.h"
+#include "../../platform/gp2x/940ctl.h"
 extern int PicoOpt;
 #define YM2612Init(baseclock,rate) { \
 	if (PicoOpt&0x200) YM2612Init_940(baseclock, rate); \
@@ -172,10 +172,9 @@ extern int PicoOpt;
 	if (PicoOpt&0x200) YM2612ResetChip_940(); \
 	else               YM2612ResetChip_(); \
 }
-#define YM2612UpdateOne(buffer,length,stereo) { \
-	if (PicoOpt&0x200) YM2612UpdateOne_940(buffer, length, stereo); \
-	else               YM2612UpdateOne_(buffer, length, stereo); \
-}
+#define YM2612UpdateOne(buffer,length,stereo,is_buf_empty) \
+	(PicoOpt&0x200) ? YM2612UpdateOne_940(buffer, length, stereo, is_buf_empty) : \
+				YM2612UpdateOne_(buffer, length, stereo, is_buf_empty);
 #define YM2612Write(a,v) \
 	(PicoOpt&0x200) ?  YM2612Write_940(a, v) : YM2612Write_(a, v)
 #define YM2612Read() \