Commit `8198950`

Nick committed on Jan 10, 2020

Fixed bug where invalid instruments could be generated

commit 819895044af82001b7a54c1822d06daa29606f6b parent f050b7e

4 changed files +84−23

Modifiedcodegen.pas +8−2

   else
     SL.Add(NoteToDriverMap.KeyData[Cell.Note]);
-  SL.Add(IntToStr(Cell.Instrument));
+  if InRange(Cell.Instrument, 0, 15) then
+    SL.Add(IntToStr(Cell.Instrument))
+  else
+    SL.Add('0');
   SL.Add('$' + EffectCodeToStr(Cell.EffectCode, Cell.EffectParams));
   // RGBDS thinks you're defining a new macro if you don't have a space first.
     'Error!',
     'There was an error assembling the song for playback.'+LineEnding+LineEnding+
       Proc.Executable+' output:'+LineEnding+
-      OutSL.Text,
+      OutSL.Text+LineEnding+LineEnding+
+      'Please report this issue on the hUGETracker GitHub issues page, and '+
+      'post your song file!',
     mtError,
     [mbOK],
     0);

Modifiedtracker.lfm +33−17

 object frmTracker: TfrmTracker
-  Left = 550
+  Left = 861
   Height = 1275
-  Top = 338
+  Top = 189
   Width = 2056
   Caption = 'hUGETracker'
   ClientHeight = 1241
       Height = 845
       Top = 0
       Width = 1709
-      ActivePage = PatternTabSheet
+      ActivePage = WavesTabSheet
       Align = alClient
       ParentFont = False
-      TabIndex = 1
+      TabIndex = 3
       TabOrder = 0
       object GeneralTabSheet: TTabSheet
         Caption = 'General'
           AnchorSideTop.Side = asrBottom
           AnchorSideBottom.Side = asrBottom
           Left = 0
-          Height = 148
+          Height = 102
           Hint = 'Preview of how the resulting waveform will look with envelope applied'
-          Top = 654
+          Top = 700
           Width = 1701
           Align = alClient
           Color = clBlack
         end
         object FlowPanel1: TFlowPanel
           Left = 0
-          Height = 654
+          Height = 700
           Top = 0
           Width = 1701
           Align = alTop
           TabOrder = 0
           object InstrumentGroupBox: TGroupBox
             Left = 12
-            Height = 310
+            Height = 356
             Top = 12
             Width = 474
             Anchors = []
             BorderSpacing.Right = 12
             BorderSpacing.Bottom = 12
             Caption = 'Instrument'
-            ClientHeight = 275
+            ClientHeight = 321
             ClientWidth = 470
             ParentFont = False
             TabOrder = 0
             object InstrumentImportButton: TButton
               Left = 24
               Height = 44
-              Top = 200
+              Top = 256
               Width = 203
               Caption = 'Import'
               OnClick = InstrumentImportButtonClick
             object InstrumentExportButton: TButton
               Left = 245
               Height = 44
-              Top = 200
+              Top = 256
               Width = 203
               Caption = 'Export'
               OnClick = InstrumentExportButtonClick
               TabOrder = 6
             end
+            object Button1: TButton
+              Left = 24
+              Height = 44
+              Top = 192
+              Width = 424
+              Caption = 'Test C-5'
+              OnClick = Button1Click
+              TabOrder = 7
+            end
           end
           object EnvelopeGroupBox: TGroupBox
             Left = 510
               Left = 144
               Height = 24
               Hint = 'How much to change the volume each time'
-              Top = 157
+              Top = 152
               Width = 344
               Buttons.BtnBigDec.BtnOrder = 1
               Buttons.BtnBigDec.Visible = False
           object SquareGroupBox: TGroupBox
             Left = 12
             Height = 296
-            Top = 346
+            Top = 392
             Width = 558
             Anchors = []
             BorderSpacing.Left = 12
           object WaveGroupBox: TGroupBox
             Left = 594
             Height = 296
-            Top = 346
+            Top = 392
             Width = 520
             Anchors = []
             BorderSpacing.Left = 12
           object NoiseGroupBox: TGroupBox
             Left = 1138
             Height = 296
-            Top = 346
+            Top = 392
             Width = 462
             Anchors = []
             BorderSpacing.Left = 12
     end
     object DebugPlayNoteButton: TMenuItem
       Caption = 'Debug play note'
+      Visible = False
       OnClick = DebugPlayNoteButtonClick
     end
     object DebugShiteButton: TMenuItem
       0000000000000000000000000000
     }
   end
-  object Timer1: TTimer
+  object OscilloscopeUpdateTimer: TTimer
     Interval = 25
-    OnTimer = Timer1Timer
+    OnTimer = OscilloscopeUpdateTimerTimer
     left = 504
     top = 80
   end
     left = 456
     top = 184
   end
+  object NoteHaltTimer: TTimer
+    Enabled = False
+    OnTimer = NoteHaltTimerTimer
+    left = 344
+    top = 176
+  end
 end

Modifiedtracker.pas +39−3

   { TfrmTracker }
   TfrmTracker = class(TForm)
+    Button1: TButton;
     ShiftClockSpinner: TECSpinPosition;
     InstrumentExportButton: TButton;
     InstrumentImportButton: TButton;
     MenuItem23: TMenuItem;
     MenuItem24: TMenuItem;
     MenuItem8: TMenuItem;
+    NoteHaltTimer: TTimer;
     WaveSaveDialog: TSaveDialog;
     Label22: TLabel;
     Label23: TLabel;
     OctaveSpinEdit: TSpinEdit;
     GBSSaveDialog: TSaveDialog;
     StepSpinEdit: TSpinEdit;
-    Timer1: TTimer;
+    OscilloscopeUpdateTimer: TTimer;
     ExportGBSButton: TToolButton;
     ToolButton3: TToolButton;
     ToolButton9: TToolButton;
     DivRatioSpinner: TECSpinPosition;
     TreeView1: TTreeView;
     TrackerGrid: TTrackerGrid;
+    procedure Button1Click(Sender: TObject);
     procedure EditDelete1Execute(Sender: TObject);
     procedure InstrumentComboBoxChange(Sender: TObject);
     procedure CopyActionExecute(Sender: TObject);
     procedure MenuItem5Click(Sender: TObject);
     procedure MenuItem8Click(Sender: TObject);
     procedure NoiseVisualizerPaint(Sender: TObject);
+    procedure NoteHaltTimerTimer(Sender: TObject);
     procedure OrderEditStringGridAfterSelection(Sender: TObject; aCol,
       aRow: Integer);
     procedure OrderEditStringGridColRowDeleted(Sender: TObject;
     procedure ShiftClockSpinnerChange(Sender: TObject);
     procedure StepSpinEditChange(Sender: TObject);
     procedure TicksPerRowSpinEditChange(Sender: TObject);
-    procedure Timer1Timer(Sender: TObject);
+    procedure OscilloscopeUpdateTimerTimer(Sender: TObject);
     procedure ExportGBSButtonClick(Sender: TObject);
     procedure ToolButton2Click(Sender: TObject);
     procedure ToolButton3Click(Sender: TObject);
     procedure DrawVizualizer(PB: TPaintBox; Channel: Integer);
     procedure PreviewInstrument(Freq: Integer; Instr: Integer);
+    procedure PreviewC5;
     procedure Panic;
   public
   end;
 end;
+procedure TfrmTracker.PreviewC5;
+begin
+  if not LoadingFile then begin
+    PreviewInstrument(NotesToFreqs.Data[C_5], InstrumentNumberSpinner.Value);
+    NoteHaltTimer.Enabled := False;
+    NoteHaltTimer.Enabled := True
+  end;
+end;
 procedure TfrmTracker.Panic;
 begin
   // Silence CH1
 end;
+procedure TfrmTracker.Button1Click(Sender: TObject);
+begin
+  PreviewC5;
+end;
 procedure TfrmTracker.PasteActionExecute(Sender: TObject);
 begin
   PostMessage(Screen.ActiveControl.Handle, LM_PASTE, 0, 0);
   for X := 0 to 3 do
     Song.Patterns.CreateNewPattern(Highest+X);
+  ReloadPatterns;
 end;
 procedure TfrmTracker.MenuItem18Click(Sender: TObject);
 begin
   with OrderEditStringGrid do
     InsertRowWithValues(Row, ['', '0', '0', '0', '0']);
+  ReloadPatterns;
 end;
 procedure TfrmTracker.MenuItem19Click(Sender: TObject);
 begin
   if OrderEditStringGrid.RowCount > 2 then
     OrderEditStringGrid.DeleteRow(OrderEditStringGrid.Row);
+  ReloadPatterns;
 end;
 procedure TfrmTracker.MenuItem21Click(Sender: TObject);
     InsertRowWithValues(Row, ['', '0', '0', '0', '0']);
     Rows[Row-1] := Rows[Row];
   end;
+  ReloadPatterns;
 end;
 procedure TfrmTracker.MenuItem22Click(Sender: TObject);
       Song.Patterns.CreateNewPattern(Highest+X)^ :=
         Song.Patterns.KeyData[StrToInt(Rows[Row][X+1])]^;
   end;
+  ReloadPatterns;
 end;
 procedure TfrmTracker.MenuItem5Click(Sender: TObject);
   DrawVizualizer(NoiseVisualizer, 4);
 end;
+procedure TfrmTracker.NoteHaltTimerTimer(Sender: TObject);
+begin
+  Panic;
+  NoteHaltTimer.Enabled := False;
+end;
 procedure TfrmTracker.OrderEditStringGridAfterSelection(Sender: TObject; aCol,
   aRow: Integer);
 begin
   if Key = VK_DELETE then begin
     // TODO: Make this stop the editor from showing
     OrderEditStringGrid.DeleteRow(OrderEditStringGrid.Row);
+    ReloadPatterns;
   end;
 end;
   Song.TicksPerRow := TicksPerRowSpinEdit.Value;
 end;
-procedure TfrmTracker.Timer1Timer(Sender: TObject);
+procedure TfrmTracker.OscilloscopeUpdateTimerTimer(Sender: TObject);
 var
   Max1, Max2: Integer;
   I: Integer;

Modifiedtrackergrid.pas +4−1

 var
   Temp: Nibble;
 begin
-  with Patterns[Cursor.X]^[Cursor.Y] do
+  with Patterns[Cursor.X]^[Cursor.Y] do begin
     if Key = VK_DELETE then Instrument := 0
     else if KeycodeToHexNumber(Key, Temp) and InRange(Temp, 0, 9) then
       Instrument := ((Instrument mod 10) * 10) + Temp;
+    Instrument := EnsureRange(Instrument, 0, 15);
+  end;
   Invalidate;
   SaveUndoState;
 end;

Commit 8198950

Commit `8198950`