Commit `d4184b5`

Nick committed on Mar 31, 2020

Merge pull request #12 from RichardULZ/hUGETracker

Skip through song while playing, Envelope improvements, Scopes on/off

commit d4184b5e45cedc41ba4f7262139a5c17743030f5 parent 3e8ad4cparent 00be538

4 changed files Diffed against the first of 2 parents. +108−55

Modifiedoptions.lfm +32−19

 object frmOptions: TfrmOptions
-  Left = 1762
+  Left = 660
-  Height = 849
+  Height = 485
-  Top = 212
+  Top = 573
-  Width = 762
+  Width = 435
   BorderStyle = bsDialog
   Caption = 'Options'
-  ClientHeight = 849
+  ClientHeight = 485
-  ClientWidth = 762
+  ClientWidth = 435
-  DesignTimePPI = 168
   Position = poMainFormCenter
   LCLVersion = '2.0.6.0'
   object Label1: TLabel
-    Left = 24
+    Left = 14
-    Height = 30
+    Height = 15
-    Top = 24
+    Top = 14
-    Width = 211
+    Width = 119
     Caption = 'Pattern editor font size'
     ParentColor = False
+    ParentFont = False
   end
   object Button1: TButton
-    Left = 520
+    Left = 297
-    Height = 44
+    Height = 25
-    Top = 784
+    Top = 448
-    Width = 216
+    Width = 123
     Caption = 'OK'
     OnClick = Button1Click
+    ParentFont = False
     TabOrder = 0
   end
   object FontSizeSpinner: TSpinEdit
-    Left = 272
+    Left = 155
-    Height = 38
+    Height = 23
-    Top = 16
+    Top = 9
-    Width = 216
+    Width = 123
+    ParentFont = False
     TabOrder = 1
     Value = 12
   end
+  object ScopesCheck: TCheckBox
+    Left = 14
+    Height = 19
+    Top = 40
+    Width = 149
+    Alignment = taLeftJustify
+    Caption = 'Scopes (Uses More CPU)'
+    Checked = True
+    State = cbChecked
+    TabOrder = 2
+  end
 end

Modifiedoptions.pas +1−0

`@@ -13,6 +13,7 @@ type`
13		13
14	`TfrmOptions = class(TForm)`	14	`TfrmOptions = class(TForm)`
15	`Button1: TButton;`	15	`Button1: TButton;`
		16	`ScopesCheck: TCheckBox;`
16	`Label1: TLabel;`	17	`Label1: TLabel;`
17	`FontSizeSpinner: TSpinEdit;`	18	`FontSizeSpinner: TSpinEdit;`
18	`procedure Button1Click(Sender: TObject);`	19	`procedure Button1Click(Sender: TObject);`

Modifiedtracker.lfm +28−27

 object frmTracker: TfrmTracker
-  Left = 434
+  Left = 453
-  Height = 661
+  Height = 701
-  Top = 645
+  Top = 598
   Width = 1145
   AllowDropFiles = True
   Caption = 'hUGETracker'
-  ClientHeight = 641
+  ClientHeight = 681
   ClientWidth = 1145
   KeyPreview = True
   Menu = MainMenu1
   LCLVersion = '2.0.6.0'
   object TreeView1: TTreeView
     Left = 0
-    Height = 530
+    Height = 569
-    Top = 88
+    Top = 89
     Width = 193
     Align = alLeft
     ParentFont = False
   end
   object Splitter1: TSplitter
     Left = 193
-    Height = 530
+    Height = 569
-    Top = 88
+    Top = 89
     Width = 5
   end
   object Panel1: TPanel
     Left = 198
-    Height = 530
+    Height = 569
-    Top = 88
+    Top = 89
     Width = 947
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 530
+    ClientHeight = 569
     ClientWidth = 947
     ParentFont = False
     TabOrder = 2
     object PageControl1: TPageControl
       Left = 0
-      Height = 530
+      Height = 569
       Top = 0
       Width = 947
-      ActivePage = CommentsTabSheet
+      ActivePage = PatternTabSheet
       Align = alClient
       ParentFont = False
-      TabIndex = 4
+      TabIndex = 1
       TabOrder = 0
       object GeneralTabSheet: TTabSheet
         Caption = 'General'
       end
       object PatternTabSheet: TTabSheet
         Caption = 'Patterns'
-        ClientHeight = 502
+        ClientHeight = 541
         ClientWidth = 939
         ParentFont = False
         object Panel3: TPanel
           Left = 224
-          Height = 502
+          Height = 541
           Top = 0
           Width = 715
           Align = alClient
-          ClientHeight = 502
+          ClientHeight = 541
           ClientWidth = 715
           ParentFont = False
           TabOrder = 0
           end
           object ScrollBox1: TScrollBox
             Left = 1
-            Height = 470
+            Height = 509
             Top = 31
             Width = 713
             HorzScrollBar.Increment = 1
         end
         object OrderEditStringGrid: TStringGrid
           Left = 0
-          Height = 502
+          Height = 541
           Top = 0
           Width = 224
           Align = alLeft
   end
   object Panel2: TPanel
     Left = 0
-    Height = 63
+    Height = 64
     Top = 25
     Width = 1145
     Align = alTop
     BevelOuter = bvNone
-    ClientHeight = 63
+    Caption = 'Hides if Scopes Off'
+    ClientHeight = 64
     ClientWidth = 1145
     ParentFont = False
     TabOrder = 3
     object LEDMeter1: TLEDMeter
       AnchorSideRight.Control = Duty1Visualizer
       Left = 0
-      Height = 31
+      Height = 32
       Top = 32
       Width = 357
       Anchors = [akTop, akLeft, akRight]
     end
     object Duty1Visualizer: TPaintBox
       Left = 357
-      Height = 63
+      Height = 64
       Top = 0
       Width = 197
       Align = alRight
     end
     object Duty2Visualizer: TPaintBox
       Left = 554
-      Height = 63
+      Height = 64
       Top = 0
       Width = 197
       Align = alRight
     end
     object WaveVisualizer: TPaintBox
       Left = 751
-      Height = 63
+      Height = 64
       Top = 0
       Width = 197
       Align = alRight
     end
     object NoiseVisualizer: TPaintBox
       Left = 948
-      Height = 63
+      Height = 64
       Top = 0
       Width = 197
       Align = alRight
   object StatusBar1: TStatusBar
     Left = 0
     Height = 23
-    Top = 618
+    Top = 658
     Width = 1145
     AutoHint = True
     Panels = <

Modifiedtracker.pas +47−9

     Playing: Boolean;
     LoadingFile: Boolean;
     SaveSucceeded: Boolean;
+    ScopesOn: Boolean;
     {PatternsNode, }
     WaveInstrumentsNode,
 begin
   W := PB.Width;
   H := PB.Height-3;
-  V := CurrentInstrument^.InitialVolume;
+  V := Min(CurrentInstrument^.InitialVolume,15);
-  S := CurrentInstrument^.VolSweepAmount*2;
+  S := Min(CurrentInstrument^.VolSweepAmount,7)*2;
   case CurrentInstrument^.LengthEnabled of
     True:   L := (64-CurrentInstrument^.Length) div 2;
     False:  L := 400;
        LineTo(L*Interval, H-V*HInterval); // no sweep
        MoveTo(L*Interval, H-(V*HInterval));
        LineTo(L*Interval, H);
+       LineTo(W, H);
     end
     else begin
       case CurrentInstrument^.VolSweepDirection of
            For I := 0 to V do
               LineTo( Min(I*S,L)*Interval, H-(V-I)*HInterval);
            LineTo(W, H);
-           MoveTo(Trunc(L*Interval), 0);
            LineTo(Trunc(L*Interval), H);
            end;
         Up: begin    // Envelope up, check length cut
             For I := 0 to 15-V do
                 LineTo( Min(I*S,L)*Interval, (15-V-I)*HInterval+9);
             LineTo(L*Interval, H-15*HInterval);
-            MoveTo(L*Interval, 0);
             LineTo(L*Interval, H);
+            LineTo(W, H);
             end;
         end;
     end;
   TrackerGrid.OnResize:=@OnTrackerGridResize;
   TrackerGrid.FontSize := OptionsFile.ReadInteger('hUGETracker', 'fontsize', 12);
+  ScopesOn := OptionsFile.ReadBool('hUGETracker', 'ScopesOn', True);
   // Fix the size of the channel headers
   for Section in HeaderControl1.Sections do
   ResetEmulationThread; //TODO: remove this hack
   // Start the Oscilloscope repaint timer
-  OscilloscopeUpdateTimer.Enabled := True;
+  OscilloscopeUpdateTimer.Enabled := ScopesOn;
+  Panel2.height :=  IfThen(ScopesOn, 64, 0);
   // Switch to general tab sheet
   PageControl1.ActivePageIndex := 0;
 procedure TfrmTracker.InstrumentNumberSpinnerChange(Sender: TObject);
 begin
   LoadInstrument(CurrentInstrumentBank, InstrumentNumberSpinner.Value);
+  DrawEnvelope(EnvelopePaintBox);
 end;
 procedure TfrmTracker.LengthSpinnerChange(Sender: TObject);
 procedure TfrmTracker.MenuItem26Click(Sender: TObject);
 begin
   frmOptions.FontSizeSpinner.Value := TrackerGrid.FontSize;
+  frmOptions.ScopesCheck.Checked := ScopesOn;
   frmOptions.ShowModal;
   TrackerGrid.FontSize := frmOptions.FontSizeSpinner.Value;
+  ScopesOn := frmOptions.ScopesCheck.Checked;
   OptionsFile.WriteInteger('hUGETracker', 'fontsize', TrackerGrid.FontSize);
+  OptionsFile.WriteBool('hUGETracker', 'ScopesOn', ScopesOn);
+  OscilloscopeUpdateTimer.Enabled := ScopesOn;
+  Panel2.height :=  IfThen(ScopesOn, 64, 0);
 end;
 procedure TfrmTracker.MenuItem31Click(Sender: TObject);
 begin
   if OrderEditStringGrid.Row > -1 then
     ReloadPatterns;
+  if Playing = True then begin
+     if TrackerGrid.HighlightedRow <> 0 then begin
+        if OrderEditStringGrid.Row = 1 then begin
+           if PreparePreview then
+              Playing := True;
+        end
+        else begin
+            PokeSymbol(SYM_CURRENT_ORDER, 2*(OrderEditStringGrid.Row-2));
+            PokeSymbol(SYM_ROW, 63);
+        end;
+     end;
+     EmulationThread.Start;
+  end
 end;
 procedure TfrmTracker.OrderEditStringGridColRowDeleted(Sender: TObject;
 var
   Highest: Integer;
 begin
-  Highest := Song.Patterns.MaxKey;
+  if Playing = True then begin
+     if  OrderEditStringGrid.Row = 1 then begin
+        if PreparePreview then begin
+           Playing := True;
+        end;
+     end
+     else begin
+       PokeSymbol(SYM_CURRENT_ORDER, 2*(OrderEditStringGrid.Row-2));
+       PokeSymbol(SYM_ROW, 63);
+     end;
+     EmulationThread.Start;
+  end
+  else begin
+    Highest := Song.Patterns.MaxKey;
-  with OrderEditStringGrid do begin
+    with OrderEditStringGrid do begin
-    Cells[Col, Row] := IntToStr(Highest);
+      Cells[Col, Row] := IntToStr(Highest);
-    TrackerGrid.LoadPattern(Col - 1, Highest);
+      TrackerGrid.LoadPattern(Col - 1, Highest);
+    end;
   end;
 end;

Commit d4184b5

Commit `d4184b5`