TAG182 2022/06/12

Driver OPMの音色設定時、パンが左右逆にセットされていたバグを修正
kuma4649 · Jun 12, 2022 · 1192027 · 1192027
1 parent 3a7262b
commit 1192027
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/CHANGE.txt b/CHANGE.txt
@@ -1,4 +1,8 @@
 �X�V����
+TAG182 2022/06/12
+  Driver
+    OPM�̉��F�ݒ莞�A�p�������E�t�ɃZ�b�g����Ă����o�O���C��
+
 TAG181 2022/06/09
   Compiler
     �p�[�g�ʃ��v���C�X�@�\��ǉ�

diff --git a/mucomDotNETConsole/Properties/launchSettings.json b/mucomDotNETConsole/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Console": {
       "commandName": "Project",
-      "commandLineArgs": "-LOGLEVEL=TRACE \"D:\\bootcamp\\FM音源\\data\\自作\\muc\\testPartReplace.muc\""
+      "commandLineArgs": "-LOGLEVEL=TRACE \"D:\\bootcamp\\FM音源\\data\\自作\\muc\\testOPM.muc\""
     }
   }
 }
diff --git a/mucomDotNETDriver/music2.cs b/mucomDotNETDriver/music2.cs
@@ -1307,7 +1307,7 @@ public void PSGOUT(byte d, byte e)
                 }
             }
 
-            //if (d == 0x42)// && d <= 0x1d)
+            //if (d == 0x27)// && d <= 0x1d)
             //{
             //    Console.WriteLine("{0:x} {1:x}", d, e);
             //}
@@ -2551,7 +2551,9 @@ public void STENVopm()
             } while (c != 0);
 
             e = work.fmVoiceAtMusData[hl];// GET FEEDBACK/ALGORIZM
-            e |= (byte)(work.pg.panValue << 6);// pan
+            a = (byte)(((work.pg.panValue & 1) << 1) 
+                | ((work.pg.panValue & 2) >> 1));//bit並び入れ替え
+            e |= (byte)(a << 6);// pan
 
             // GET ALGORIZM
             work.pg.algo = e & 0x07;// STORE ALGORIZM

diff --git a/mucomDotNETPlayer/Program.cs b/mucomDotNETPlayer/Program.cs
@@ -716,7 +716,10 @@ private static void OPMWrite(int chipId, ChipDatum dat)
 
             if (dat.address == -1) return;
 
-            //Log.WriteLine(LogLevel.TRACE, string.Format("Out ChipOPM:{0} Port:{1} Adr:[{2:x02}] val[{3:x02}]", chipId, dat.port, (int)dat.address, (int)dat.data));
+            //if (dat.address == 0x27)// && d <= 0x1d)
+            //{
+            //    Log.WriteLine(LogLevel.TRACE, string.Format("Out ChipOPM:{0} Port:{1} Adr:[{2:x02}] val[{3:x02}]", chipId, dat.port, (int)dat.address, (int)dat.data));
+            //}
             switch (device)
             {
                 case 0:

diff --git a/mucomDotNETPlayer/Properties/launchSettings.json b/mucomDotNETPlayer/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Player": {
       "commandName": "Project",
-      "commandLineArgs": "\"D:\\bootcamp\\FM音源\\data\\自作\\muc\\testPartReplace.mub\""
+      "commandLineArgs": "\"D:\\bootcamp\\FM音源\\data\\自作\\muc\\testOPM.mub\""
     }
   }
 }