Commit `df9ecae`

Nick committed on Dec 31, 2019

Various changes, fixed waveform selection

commit df9ecae02e163870affe2809f53dcfd48a2e9c5f parent 011029a

4 changed files +79−35

Modifiedsong.pas +38−1

`@@ -4,7 +4,7 @@ unit Song;`
4		4
5	`interface`	5	`interface`
6		6
7	`uses Classes, HugeDatatypes;`	7	`uses Classes, HugeDatatypes, instruments;`
8		8
9	`type`	9	`type`
10	`{ TSong }`	10	`{ TSong }`
`@@ -27,6 +27,7 @@ type`
27		27
28	`procedure WriteSongToStream(S: TStream; const ASong: TSong);`	28	`procedure WriteSongToStream(S: TStream; const ASong: TSong);`
29	`procedure ReadSongFromStream(S: TStream; var ASong: TSong);`	29	`procedure ReadSongFromStream(S: TStream; var ASong: TSong);`
		30	`procedure InitializeSong(var S: TSong);`
30		31
31	`implementation`	32	`implementation`
32		33
`@@ -96,5 +97,41 @@ begin`
96	`end;`	97	`end;`
97	`end;`	98	`end;`
98		99
		100	`procedure InitializeSong(var S: TSong);`
		101	`var`
		102	`I, J: Integer;`
		103	`begin`
		104	`with S do begin`
		105	`Version := 1;`
		106	`Name := '';`
		107	`Artist := '';`
		108	`Comment := '';`
		109	`end;`
		110	`for I := Low(S.Instruments) to High(S.Instruments) do`
		111	`with S.Instruments[I] do begin`
		112	`Type_ := Square;`
		113	`Length := 0;`
		114	`LengthEnabled := False;`
		115	`InitialVolume := 63;`
		116	`VolSweepDirection := Down;`
		117	`VolSweepAmount := 0;`
		118
		119	`SweepTime := 0;`
		120	`SweepIncDec := Down;`
		121	`SweepShift := 0;`
		122
		123	`Duty := 2;`
		124
		125	`OutputLevel := 1;`
		126	`end;`
		127	`for I := Low(S.Waves) to High(S.Waves) do begin`
		128	`for J := 0 to 32 do`
		129	`S.Waves[I][J] := random($F);`
		130	`end;`
		131
		132	`S.TicksPerRow := 7;`
		133	`S.Patterns := TPatternMap.Create;`
		134	`end;`
		135
99	`end.`	136	`end.`
100		137

Modifiedtracker.lfm +24−2

 object frmTracker: TfrmTracker
-  Left = 793
+  Left = 800
   Height = 1376
-  Top = 197
+  Top = 189
   Width = 2212
   Caption = 'hUGETracker'
   ClientHeight = 1342
               Top = 70
               Width = 308
               ItemHeight = 30
+              ItemIndex = 0
+              Items.Strings = (
+                'Wave #0'
+                'Wave #1'
+                'Wave #2'
+                'Wave #3'
+                'Wave #4'
+                'Wave #5'
+                'Wave #6'
+                'Wave #7'
+                'Wave #8'
+                'Wave #9'
+                'Wave #10'
+                'Wave #11'
+                'Wave #12'
+                'Wave #13'
+                'Wave #14'
+                'Wave #15'
+              )
               OnChange = WaveformComboboxChange
               ParentFont = False
               Style = csDropDownList
               TabOrder = 0
+              Text = 'Wave #0'
             end
             object Panel4: TPanel
               Left = 14
     object FileSaveAs1: TFileSaveAs
       Category = 'File'
       Caption = 'Save As ...'
+      Dialog.DefaultExt = '.uge'
+      Dialog.Filter = 'hUGETracker Modules|*.uge'
       Hint = 'Save As'
       ImageIndex = 59
       ShortCut = 16467

Modifiedtracker.pas +7−25

 end;
 function TfrmTracker.PreparePreview: Boolean;
+var
+  I: Integer;
 begin
   if RenderPreviewROM(Song) then begin
     // Load the new symbol table
     EmulationThread.Free;
     EmulationThread := TEmulationThread.Create('hUGEDriver/preview.gb');
     PokeSymbol(SYM_TICKS_PER_ROW, Song.TicksPerRow);
+    for I := 0 to 3 do
+      snd[I+1].ChannelOFF := HeaderControl1.Sections[I].ImageIndex = 0;
     Result := True;
   end
 procedure TfrmTracker.WaveformComboboxChange(Sender: TObject);
 begin
+  CurrentInstrument^.Waveform:=WaveformCombobox.ItemIndex;
   WavePaintbox.Invalidate;
 end;
 procedure TfrmTracker.FormCreate(Sender: TObject);
 var
-  I, J: Integer;
+  I: Integer;
   Section: TCollectionItem;
 begin
   ReturnNilIfGrowHeapFails := False;
-  Song.Version := UGE_FORMAT_VERSION;
+  InitializeSong(Song);
   // Create pattern editor control
-  Song.Patterns := TPatternMap.Create;
   RecreateTrackerGrid;
   // Initialize ticks per row
   for Section in HeaderControl1.Sections do
     (Section as THeaderSection).Width := TrackerGrid.ColumnWidth;
-  for I := Low(Song.Instruments) to High(Song.Instruments) do
-    with Song.Instruments[I] do begin
-      Type_ := Square;
-      Length := 0;
-      LengthEnabled := False;
-      InitialVolume := 63;
-      VolSweepDirection := Down;
-      VolSweepAmount := 0;
-      SweepTime := 0;
-      SweepIncDec := Down;
-      SweepShift := 0;
-      Duty := 2;
-    end;
-  for I := Low(Song.Waves) to High(Song.Waves) do begin
-    for J := 0 to 32 do
-      Song.Waves[I][J] := random($F);
-    WaveformCombobox.Items.Add('Wave #' + IntToStr(I));
-  end;
   LoadInstrument(1);
   LoadWave(0);

Modifiedtrackergrid.pas +10−7

   // a lot (every time the FD callback happens) so it needs to be fast. It can
   // sort of lag out the main thread if it just does a full invalidate.
-  RenderRow(OldRow);
-  RenderRow(Row);
   R.Left:=0;
   R.Width:=ColumnWidth*4;
   R.Height:=RowHeight*2;
-  R.Top:=(Row-1)*RowHeight;
+  if InRange(OldRow, Low(TPattern), High(TPattern)) then begin
-  InvalidateRect(Self.Handle, @R, True);
+    RenderRow(OldRow);
-  R.Top:=(OldRow-1)*RowHeight;
+    R.Top:=(Row-1)*RowHeight;
-  InvalidateRect(Self.Handle, @R, True);
+    InvalidateRect(Self.Handle, @R, True);
+  end;
+  if InRange(Row, Low(TPattern), High(TPattern)) then begin
+    RenderRow(Row);
+    R.Top:=(OldRow-1)*RowHeight;
+    InvalidateRect(Self.Handle, @R, True);
+  end;
 end;
 procedure TTrackerGrid.SetSelectionGridRect(R: TRect);

Commit df9ecae

Commit `df9ecae`