Commit `5319254`

Nick committed on Mar 28, 2020

Implement #6

commit 531925471f1bd30dc136feae6315c937151e3685 parent 87a755a

2 changed files +52−17

Modifiedtracker.lfm +11−3

       Height = 480
       Top = 0
       Width = 982
-      ActivePage = InstrumentTabSheet
+      ActivePage = WavesTabSheet
       Align = alClient
       ParentFont = False
       TabIndex = 3
       end
       object WavesTabSheet: TTabSheet
         Caption = 'Waves'
-        ClientHeight = 414
+        ClientHeight = 452
-        ClientWidth = 960
+        ClientWidth = 974
         ParentFont = False
         object WaveEditPaintBox: TPaintBox
           AnchorSideTop.Control = WaveEditGroupBox
             Caption = 'Hex representation'
             ParentColor = False
           end
+          object PlayWaveWhileDrawingCheckbox: TCheckBox
+            Left = 176
+            Height = 19
+            Top = 40
+            Width = 149
+            Caption = 'Play wave while drawing'
+            TabOrder = 4
+          end
         end
       end
       object CommentsTabSheet: TTabSheet

Modifiedtracker.pas +41−14

   TfrmTracker = class(TForm)
     Button1: TButton;
+    PlayWaveWhileDrawingCheckbox: TCheckBox;
     Duty1Visualizer: TPaintBox;
     Duty2Visualizer: TPaintBox;
     HexWaveEdit: TEdit;
     procedure ReloadPatterns;
     procedure CopyOrderGridToOrderMatrix;
     procedure CopyOrderMatrixToOrderGrid;
+    procedure CopyWaveIntoWaveRam(Wave: Integer);
     function PreparePreview: Boolean;
     procedure ResetEmulationThread;
     procedure DrawWaveform(PB: TPaintBox; Wave: TWave);
     procedure DrawVizualizer(PB: TPaintBox; Channel: Integer);
-    procedure PreviewInstrument(Freq: Integer; Instr: Integer);
+    procedure PreviewInstrument(Freq: Integer; Instr: Integer); overload;
+    procedure PreviewInstrument(Freq: Integer; Instr: TInstrument); overload;
     procedure PreviewC5;
     procedure Panic;
   public
   RecreateTrackerGrid;
   CopyOrderMatrixToOrderGrid;
-  // PLACEHOLDER
   while InstrumentComboBox.Items.Count > 1 do
     InstrumentComboBox.Items.Delete(1);
 end;
 procedure TfrmTracker.PreviewInstrument(Freq: Integer; Instr: Integer);
+begin
+  PreviewInstrument(Freq, Song.Instruments.All[Instr]);
+end;
+procedure TfrmTracker.PreviewInstrument(Freq: Integer; Instr: TInstrument);
 var
   Regs: TRegisters;
-  I: Integer;
-  NewWaveform: T4bitWave;
 begin
   // TODO: Find some way to synchronize with the playback thread, so it doesn't
   // fail sometimes.
-  with Song.Instruments.All[Instr] do //PLACEHOLDER
+  with Instr do
   begin
     case Type_ of
       itSquare: begin
-        Regs := SquareInstrumentToRegisters(Freq, True, Song.Instruments.All[Instr]);
+        Regs := SquareInstrumentToRegisters(Freq, True, Instr);
         Spokeb(NR10, Regs.NR10);
         Spokeb(NR11, Regs.NR11);
         Spokeb(NR12, Regs.NR12);
         Spokeb(NR14, Regs.NR14);
       end;
       itWave: begin
-        NewWaveform := ConvertWaveform(Song.Waves[Waveform]);
+        CopyWaveIntoWaveRam(Waveform);
-        // Fill itWave RAM with the waveform
+        Regs := WaveInstrumentToRegisters(Freq, True, Instr);
-        for I := Low(NewWaveform) to High(NewWaveform) do
-          Spokeb(AUD3_WAVE_RAM+I, NewWaveform[I]);
-        Regs := WaveInstrumentToRegisters(Freq, True, Song.Instruments.All[Instr]);
         Spokeb(NR30, Regs.NR30);
         Spokeb(NR31, Regs.NR31);
         Spokeb(NR34, Regs.NR34)
       end;
       itNoise: begin
-        Regs := NoiseInstrumentToRegisters(Freq, True, Song.Instruments.All[Instr]);
+        Regs := NoiseInstrumentToRegisters(Freq, True, Instr);
         Spokeb(NR41, Regs.NR41);
         Spokeb(NR42, Regs.NR42);
         Spokeb(NR43, Regs.NR43);
           OrderEditStringGrid.Cells[C, R] := '0';
 end;
+procedure TfrmTracker.CopyWaveIntoWaveRam(Wave: Integer);
+var
+  NewWaveform: T4bitWave;
+  I: Integer;
+begin
+  NewWaveform := ConvertWaveform(Song.Waves[Wave]);
+  for I := Low(NewWaveform) to High(NewWaveform) do
+    Spokeb(AUD3_WAVE_RAM+I, NewWaveform[I]);
+end;
 function TfrmTracker.PreparePreview: Boolean;
 var
   I: Integer;
 procedure TfrmTracker.WaveEditPaintBoxMouseDown(Sender: TObject;
   Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
-begin
+var
+  TestInstrument: TInstrument;
+begin
+  TestInstrument := Default(TInstrument);
+  with TestInstrument do begin
+    Type_ := itWave;
+    OutputLevel := 1;
+    Waveform := WaveEditNumberSpinner.Value;
+    Length := 0;
+    LengthEnabled := False;
+  end;
   DrawingWave := True;
+  if PlayWaveWhileDrawingCheckbox.Checked then
+    PreviewInstrument(NotesToFreqs.Data[C_5], TestInstrument);
 end;
 procedure TfrmTracker.WaveEditPaintBoxMouseMove(Sender: TObject;
     CurrentWave^[Idx] := EnsureRange(Trunc((Y / WaveEditPaintBox.Height)*$F), 0, $F);
     UpdateHexWaveTextbox;
     WaveEditPaintBox.Invalidate;
+    if PlayWaveWhileDrawingCheckbox.Checked then
+      CopyWaveIntoWaveRam(WaveEditNumberSpinner.Value);
   end;
 end;
   Button: TMouseButton; Shift: TShiftState; X, Y: Integer);
 begin
   DrawingWave := False;
+  Panic;
 end;
 procedure TfrmTracker.WaveEditPaintBoxPaint(Sender: TObject);

Commit 5319254

Commit `5319254`