--- xmil/sound/opmgenc.c	2004/08/01 05:31:31	1.1
+++ xmil/sound/opmgenc.c	2008/06/02 20:07:32	1.9
@@ -1,19 +1,18 @@
 #include	"compiler.h"
+
+#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM)
+
+#ifndef		PALMOS
 #include	<math.h>
+#endif
 #include	"sound.h"
 #include	"sndctrl.h"
-#include	"juliet.h"
-#include	"x1f.h"
-
-
-extern	int		s_cnt;
-extern	DWORD	basedclk;
 
 
 #define	OPM_ARRATE		 399128L
 #define	OPM_DRRATE		5514396L
 
-#define	EG_STEP	(96.0 / EVC_ENT)					// dB step
+#define	EG_STEP	(96.0 / EVC_ENT)					/* dB step */
 #define	SC(db)	(SINT32)((db) * ((3.0 / EG_STEP) * (1 << ENV_BITS))) + EC_DECAY
 #define	KF(sn)	((sn) << KF_BITS)
 #define	D2(value)		(SINT32)(((double)(6 << KF_BITS)*log((double)value) / \
@@ -23,7 +22,6 @@ extern	DWORD	basedclk;
 
 
 		OPMCFG	opmcfg;
-		UINT8	fmop[256];
 static	SINT32	detunetable[8][32];
 static	SINT32	attacktable[94];
 static	SINT32	decaytable[94];
@@ -63,7 +61,7 @@ void opmgen_initialize(UINT rate) {
 	UINT	rate1;
 	UINT	rate2;
 
-	rate1 = rate;	// 44100
+	rate1 = rate;	/* 44100 */
 	rate2 = 62500;
 	while((rate1 * 2) < rate2) {
 		rate2 >>= 1;
@@ -102,7 +100,7 @@ void opmgen_initialize(UINT rate) {
 	}
 	for (i=4; i<64; i++) {
 		freq = (double)(EVC_ENT << ENV_BITS) * FREQBASE4096;
-		if (i < 8) {							// 忘れてます。
+		if (i < 8) {							/* 忘れてます。 */
 			freq *= 1.0 + (i & 2) * 0.25;
 		}
 		else if (i < 60) {
@@ -125,8 +123,13 @@ void opmgen_initialize(UINT rate) {
 	detune2table[3] = D2(3.0);
 }
 
+void opmgen_setvol(UINT vol) {
 
-// ----
+	opmcfg.fmvol = vol;
+}
+
+
+/* ---- */
 
 static void keyon(OPMCH *ch, REG8 value) {
 
@@ -139,7 +142,7 @@ static void keyon(OPMCH *ch, REG8 value)
 	slot = ch->slot;
 	bit = 0x08;
 	for (i=0; i<4; i++) {
-		if (value & bit) {							// keyon
+		if (value & bit) {							/* keyon */
 			if (slot->env_mode <= EM_RELEASE) {
 				slot->freq_cnt = 0;
 				if (i == OPMSLOT1) {
@@ -151,7 +154,7 @@ static void keyon(OPMCH *ch, REG8 value)
 				slot->env_end = EC_DECAY;
 			}
 		}
-		else {										// keyoff
+		else {										/* keyoff */
 			if (slot->env_mode > EM_RELEASE) {
 				slot->env_mode = EM_RELEASE;
 				if (!(slot->env_cnt & EC_DECAY)) {
@@ -182,16 +185,20 @@ static void set_algorithm(OPMCH *ch, REG
 		ch->feedback = 0;
 	}
 
-	switch(value & 0xc0) {
-		case 0x40:
+	switch((value >> 6) & 3) {
+		case 0:
+			outd = &opmgen.feedback4;
+			break;
+
+		case 1:
 			outd = &opmgen.outdl;
 			break;
 
-		case 0x80:
+		case 2:
 			outd = &opmgen.outdr;
 			break;
 
-		default:
+		case 3:
 			outd = &opmgen.outdc;
 			break;
 	}
@@ -344,7 +351,7 @@ static void channelupdate(OPMCH *ch) {
 }
 
 
-//-----------------------------------------------------------------------------
+/*----------------------------------------------------------------------------- */
 
 void opmgen_reset(void) {
 
@@ -353,9 +360,6 @@ void opmgen_reset(void) {
 	OPMSLOT	*slot;
 	UINT	j;
 
-	juliet_YM2151Reset();
-	juliet_YMF288Reset();
-
 	opmgen.mode = 0;
 	ch = opmch;
 	for(i=0; i<OPMCH_MAX; i++) {
@@ -387,25 +391,18 @@ void opmgen_setreg(REG8 reg, REG8 value)
 	OPMCH		*ch;
 	OPMSLOT		*slot;
 
-	fmop[reg] = value;
-	x1f_opm(reg, value);
-
-	if (romeo_exist) {
-		juliet2_YM2151W(reg, value, (basedclk * s_cnt / 1600));
-		return;
-	}
-
+	sound_sync();
 	c = reg & 7;
 	ch = opmch + c;
 	slot = ch->slot + fmslot[(reg >> 3) & 3];
 	switch(reg & 0xe0) {
 		case 0x00:
 			switch(reg) {
-				case 0x08:				// key on/off
+				case 0x08:				/* key on/off */
 					keyon(opmch + (value & 7), value);
 					break;
 
-				case 0x14:				// mode
+				case 0x14:				/* mode */
 					opmgen.mode = value;
 					if ((value & 0x81) == 0x81) {
 						opmgen.playing++;
@@ -431,18 +428,18 @@ void opmgen_setreg(REG8 reg, REG8 value)
 
 		case 0x20:
 			switch(reg & 0x18) {
-				case 0x00: 			// pan feedback connection
+				case 0x00: 			/* pan feedback connection */
 					set_algorithm(ch, value);
 					break;
 
-				case 0x08:			// keycode
+				case 0x08:			/* keycode */
 					ch->kcode = (UINT8)((value >> 2) & 0x1f);
 					ch->keynote = (((value >> 4) & 7) * (12 << KF_BITS)) +
 									halftunetable[value & 0x0f] + ch->keyfunc;
 					channelupdate(ch);
 					break;
 
-				case 0x10:			// keyfunction
+				case 0x10:			/* keyfunction */
 					ch->keyfunc = (UINT8)(value >> (8 - KF_BITS));
 					ch->keynote &= (((UINT32)-1) << KF_BITS);
 					ch->keynote += ch->keyfunc;
@@ -451,32 +448,34 @@ void opmgen_setreg(REG8 reg, REG8 value)
 			}
 			break;
 
-		case 0x40:					// DT1 MUL
+		case 0x40:					/* DT1 MUL */
 			set_dt1_mul(slot, value);
 			channelupdate(ch);
 			break;
 
-		case 0x60:					// TL
+		case 0x60:					/* TL */
 			set_tl(slot, value);
 			break;
 
-		case 0x80:					// KS AR
+		case 0x80:					/* KS AR */
 			set_ks_ar(slot, value);
 			channelupdate(ch);
 			break;
 
-		case 0xa0:					// D1R
+		case 0xa0:					/* D1R */
 			set_d1r(slot, value);
 			break;
 
-		case 0xc0:					// DT2 D2R
+		case 0xc0:					/* DT2 D2R */
 			set_dt2_d2r(slot, value);
 			channelupdate(ch);
 			break;
 
-		case 0xe0:					// D1L RR
+		case 0xe0:					/* D1L RR */
 			set_d1l_rr(slot, value);
 			break;
 	}
 }
 
+#endif
+