Commit f050b7e

Nick committed on
Adding shift clock mask back in
commit f050b7e84e2d808c46ae3e80058a57e9e56b99c6 parent fba0189
3 changed files +16−7
Modifiedinstruments.pas +7−1
@@ -198,11 +198,17 @@ end;
198 function NoiseInstrumentToBytes(Instrument: TInstrument): TAsmInstrument; 198 function NoiseInstrumentToBytes(Instrument: TInstrument): TAsmInstrument;
199 var 199 var
200 Regs: TRegisters; 200 Regs: TRegisters;
201 Poly: TPolynomialCounterRegister absolute Result[2];
201 begin 202 begin
202 Regs := NoiseInstrumentToRegisters(0, True, Instrument); 203 Regs := NoiseInstrumentToRegisters(0, True, Instrument);
203 Result[0] := Regs.NR41; 204 Result[0] := Regs.NR41;
204 Result[1] := Regs.NR42; 205 Result[1] := Regs.NR42;
205 Result[2] := Regs.NR43 and %00001111; // remove shift clock freq 206 Result[2] := Regs.NR43;
207
208 // Because *InstrumentToRegisters is meant for previewing, it puts in
209 // a value for shift clock freq, so we have to remove it and put in the mask
210 // instead.
211 Poly.ShiftClockFrequency := Instrument.ShiftClockFreq;
206 Result[3] := Regs.NR44; 212 Result[3] := Regs.NR44;
207 end; 213 end;
208 214
Modifiedtracker.lfm +7−6
@@ -1,7 +1,7 @@
1 object frmTracker: TfrmTracker 1 object frmTracker: TfrmTracker
2 Left = 899 2 Left = 550
3 Height = 1275 3 Height = 1275
4 Top = 236 4 Top = 338
5 Width = 2056 5 Width = 2056
6 Caption = 'hUGETracker' 6 Caption = 'hUGETracker'
7 ClientHeight = 1241 7 ClientHeight = 1241
@@ -55,10 +55,10 @@ object frmTracker: TfrmTracker
55 Height = 845 55 Height = 845
56 Top = 0 56 Top = 0
57 Width = 1709 57 Width = 1709
58 ActivePage = InstrumentTabSheet 58 ActivePage = PatternTabSheet
59 Align = alClient 59 Align = alClient
60 ParentFont = False 60 ParentFont = False
61 TabIndex = 2 61 TabIndex = 1
62 TabOrder = 0 62 TabOrder = 0
63 object GeneralTabSheet: TTabSheet 63 object GeneralTabSheet: TTabSheet
64 Caption = 'General' 64 Caption = 'General'
@@ -297,6 +297,7 @@ object frmTracker: TfrmTracker
297 Color = clBlack 297 Color = clBlack
298 ParentColor = False 298 ParentColor = False
299 ParentFont = False 299 ParentFont = False
300 Visible = False
300 OnPaint = PaintBox1Paint 301 OnPaint = PaintBox1Paint
301 end 302 end
302 object FlowPanel1: TFlowPanel 303 object FlowPanel1: TFlowPanel
@@ -1105,7 +1106,7 @@ object frmTracker: TfrmTracker
1105 ProgressStyle = epsGradient 1106 ProgressStyle = epsGradient
1106 Scale.DateTimeFormat = 'hh:nn:ss' 1107 Scale.DateTimeFormat = 'hh:nn:ss'
1107 Scale.LogarithmBase = 10 1108 Scale.LogarithmBase = 10
1108 Scale.Max = 7 1109 Scale.Max = 15
1109 Scale.Min = 0 1110 Scale.Min = 0
1110 Scale.TickLongValue = 10 1111 Scale.TickLongValue = 10
1111 Scale.TickMiddleValue = 5 1112 Scale.TickMiddleValue = 5
@@ -1119,7 +1120,7 @@ object frmTracker: TfrmTracker
1119 object Label25: TLabel 1120 object Label25: TLabel
1120 Left = 16 1121 Left = 16
1121 Height = 30 1122 Height = 30
1122 Top = 22 1123 Top = 28
1123 Width = 149 1124 Width = 149
1124 Caption = 'Shift clock mask' 1125 Caption = 'Shift clock mask'
1125 ParentColor = False 1126 ParentColor = False
Modifiedtracker.pas +2−0
@@ -697,6 +697,7 @@ begin
697 end; 697 end;
698 698
699 Noise: begin 699 Noise: begin
700 ShiftClockSpinner.Position := CI^.ShiftClockFreq;
700 DivRatioSpinner.Position := CI^.DividingRatio; 701 DivRatioSpinner.Position := CI^.DividingRatio;
701 SevenBitCounterCheckbox.Checked := CI^.CounterStep = Seven; 702 SevenBitCounterCheckbox.Checked := CI^.CounterStep = Seven;
702 end; 703 end;
@@ -826,6 +827,7 @@ end;
826 827
827 procedure TfrmTracker.RandomizeNoiseButtonClick(Sender: TObject); 828 procedure TfrmTracker.RandomizeNoiseButtonClick(Sender: TObject);
828 begin 829 begin
830 ShiftClockSpinner.Position := 0;
829 DivRatioSpinner.Position := Random(Round(DivRatioSpinner.Max)); 831 DivRatioSpinner.Position := Random(Round(DivRatioSpinner.Max));
830 SevenBitCounterCheckbox.Checked := Random <= 0.5; 832 SevenBitCounterCheckbox.Checked := Random <= 0.5;
831 LengthEnabledCheckbox.Checked := Random <= 0.5; 833 LengthEnabledCheckbox.Checked := Random <= 0.5;