[Scummvm-git-logs] scummvm master -> 35e2b3b15ed48840d7baa16bcdba2e2b34a29417

AndywinXp noreply at scummvm.org
Thu Oct 27 14:26:21 UTC 2022


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
35e2b3b15e AUDIO: Fix build


Commit: 35e2b3b15ed48840d7baa16bcdba2e2b34a29417
    https://github.com/scummvm/scummvm/commit/35e2b3b15ed48840d7baa16bcdba2e2b34a29417
Author: AndywinXp (andywinxp at gmail.com)
Date: 2022-10-27T16:25:51+02:00

Commit Message:
AUDIO: Fix build

Changed paths:
    audio/softsynth/opl/mame.cpp
    audio/softsynth/opl/mame.h


diff --git a/audio/softsynth/opl/mame.cpp b/audio/softsynth/opl/mame.cpp
index 818e352d35d..5b0bedaf801 100644
--- a/audio/softsynth/opl/mame.cpp
+++ b/audio/softsynth/opl/mame.cpp
@@ -893,11 +893,11 @@ void OPLWriteReg(FM_OPL *OPL, int r, int v) {
 		case 0xbd:
 			/* amsep,vibdep,r,bd,sd,tom,tc,hh */
 			{
-			uint8 rkey = OPL->rythm ^ v;
+			uint8 rkey = OPL->rhythm ^ v;
 			OPL->ams_table = &AMS_TABLE[v & 0x80 ? AMS_ENT : 0];
 			OPL->vib_table = &VIB_TABLE[v & 0x40 ? VIB_ENT : 0];
-			OPL->rythm  = v & 0x3f;
-			if (OPL->rythm & 0x20) {
+			OPL->rhythm  = v & 0x3f;
+			if (OPL->rhythm & 0x20) {
 				/* BD key on/off */
 				if (rkey & 0x10) {
 					if (v & 0x10) {
@@ -1069,8 +1069,8 @@ void YM3812UpdateOne(FM_OPL *OPL, int16 *buffer, int length) {
 		/* FM part */
 		for (CH = S_CH; CH < R_CH; CH++)
 			OPL_CALC_CH(CH);
-		/* Rythn part */
-		if (rythm)
+		/* Rhythm part */
+		if (rhythm)
 			OPL_CALC_RH(OPL, S_CH);
 		/* limit check */
 		data = CLIP(outd[0], OPL_MINOUT, OPL_MAXOUT);
diff --git a/audio/softsynth/opl/mame.h b/audio/softsynth/opl/mame.h
index 195dcb2eb52..3482afc31e1 100644
--- a/audio/softsynth/opl/mame.h
+++ b/audio/softsynth/opl/mame.h
@@ -121,7 +121,7 @@ typedef struct fm_opl_f {
 	int	max_ch;			/* maximum channel                   */
 
 	/* Rythm sention */
-	uint8 rythm;		/* Rythm mode , key flag */
+	uint8 rhythm;		/* Rhythm mode , key flag */
 
 	/* time tables */
 	int AR_TABLE[76];	/* atttack rate tables				*/




More information about the Scummvm-git-logs mailing list