--- xmil/sound/opmgenc.c	2004/08/01 05:31:31	1.1
+++ xmil/sound/opmgenc.c	2005/02/04 06:42:12	1.7
@@ -1,13 +1,10 @@
 #include	"compiler.h"
+
+#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM)
+
 #include	<math.h>
 #include	"sound.h"
 #include	"sndctrl.h"
-#include	"juliet.h"
-#include	"x1f.h"
-
-
-extern	int		s_cnt;
-extern	DWORD	basedclk;
 
 
 #define	OPM_ARRATE		 399128L
@@ -23,7 +20,6 @@ extern	DWORD	basedclk;
 
 
 		OPMCFG	opmcfg;
-		UINT8	fmop[256];
 static	SINT32	detunetable[8][32];
 static	SINT32	attacktable[94];
 static	SINT32	decaytable[94];
@@ -125,6 +121,11 @@ void opmgen_initialize(UINT rate) {
 	detune2table[3] = D2(3.0);
 }
 
+void opmgen_setvol(UINT vol) {
+
+	opmcfg.fmvol = vol;
+}
+
 
 // ----
 
@@ -182,16 +183,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;
 	}
@@ -353,9 +358,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,14 +389,7 @@ 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];
@@ -480,3 +475,5 @@ void opmgen_setreg(REG8 reg, REG8 value)
 	}
 }
 
+#endif
+