Skip to content

Commit

Permalink
TAG756 2024/12/9 2nd
Browse files Browse the repository at this point in the history
  Core:PartCounter:mucomDotNETを演奏時、パート順が乱れるのを修正
  • Loading branch information
kumatan committed Dec 9, 2024
1 parent f1a14cf commit b715f81
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
3 changes: 3 additions & 0 deletions mml2vgm/CHANGE.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
�X�V����
TAG756 2024/12/9 2nd
Core:PartCounter:mucomDotNET�����t���A�p�[�g���������̂��C��

TAG755 2024/12/9
Core:XGM2:PCM�e�[�u�������̃o�O�C��

Expand Down
7 changes: 5 additions & 2 deletions mml2vgm/mml2vgmIDEx64/form/FrmPartCounter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public partial class FrmPartCounter : DockContent, IForm
};

private PartRowComparer comparer;
private bool requiresSorting=true;
private bool requiresSorting=false;


public FrmPartCounter(Setting setting)
Expand Down Expand Up @@ -447,11 +447,14 @@ private void Timer_Tick(object sender, EventArgs e)
}
if (r >= mmli.inst.Length) continue;

if (row.Cells["ClmPriority"].Value == null || (int)row.Cells["ClmPriority"].Value != mmli.partPriority[r])
if (
(!(mmli is YM2608_mucom) && !(mmli is YM2610B_mucom) && !(mmli is YM2151_mucom))
&& (row.Cells["ClmPriority"].Value == null || (int)row.Cells["ClmPriority"].Value != mmli.partPriority[r]))
{
row.Cells["ClmPriority"].Value = mmli.partPriority[r];
requiresSorting = true;
}

row.Cells["ClmInstrument"].Value = mmli.inst[r] == null ? "-" : mmli.inst[r].ToString();
row.Cells["ClmEnvelope"].Value = mmli.envelope[r] == null ? "-" : mmli.envelope[r].ToString();
row.Cells["ClmVolume"].Value = mmli.vol[r] == null ? "-" : mmli.vol[r].ToString();
Expand Down

0 comments on commit b715f81

Please sign in to comment.