Commit `3052808`

Nick committed on Jan 10, 2020

Start work towards a proper releas

commit 30528088379606c5ad6f58d5550bb24079db0ebd parent 0dd1717

7 changed files +143−100

Modified.gitignore +3−1

`@@ -12,4 +12,6 @@ lib`
12	`*.lnk`	12	`*.lnk`
13	`*.map`	13	`*.map`
14	`~*`	14	`~*`
15	`SDL2*`	15	`Pascal-SDL2*`
		16	`Release`
		17	`Pascal-SDL-2-Headers`

Modified.gitmodules +3−0

`@@ -1,3 +1,6 @@`
1	`[submodule "hUGEDriver"]`	1	`[submodule "hUGEDriver"]`
2	`path = hUGEDriver`	2	`path = hUGEDriver`
3	`url = http://github.com/SuperDisk/hUGEDriver`	3	`url = http://github.com/SuperDisk/hUGEDriver`
		4	`[submodule "Pascal-SDL-2-Headers"]`
		5	`path = Pascal-SDL-2-Headers`
		6	`url = https://github.com/ev1313/Pascal-SDL-2-Headers`

ModifiedGBEmu.lpi +6−5

       </Flags>
       <SessionStorage Value="InProjectDir"/>
       <MainUnit Value="0"/>
-      <Title Value="GBEmu"/>
+      <Title Value="hUGETracker"/>
       <Scaled Value="True"/>
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
           <PathDelim Value="\"/>
           <SearchPaths>
             <IncludeFiles Value="GPU;CPU;Sound;Global;$(ProjOutDir)"/>
-            <OtherUnitFiles Value="CPU;Sound;Global;SDL2_headers"/>
+            <OtherUnitFiles Value="CPU;Sound;Global;Pascal-SDL-2-Headers"/>
-            <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+            <UnitOutputDirectory Value="lib\Production\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
             <SyntaxOptions>
           </CodeGeneration>
           <Linking>
             <Debugging>
+              <GenerateDebugInfo Value="False"/>
               <UseLineInfoUnit Value="False"/>
               <StripSymbols Value="True"/>
             </Debugging>
     <PathDelim Value="\"/>
     <SearchPaths>
       <IncludeFiles Value="GPU;CPU;Sound;Global;$(ProjOutDir)"/>
-      <OtherUnitFiles Value="CPU;Sound;Global;SDL2_headers"/>
+      <OtherUnitFiles Value="CPU;Sound;Global;Pascal-SDL-2-Headers"/>
-      <UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
+      <UnitOutputDirectory Value="lib\Development\$(TargetCPU)-$(TargetOS)"/>
     </SearchPaths>
     <Parsing>
       <SyntaxOptions>

Modifiedeffecteditor.lfm +1−1

`@@ -59,7 +59,7 @@ object frmEffectEditor: TfrmEffectEditor`
59	`Height = 320`	59	`Height = 320`
60	`Top = 80`	60	`Top = 80`
61	`Width = 642`	61	`Width = 642`
62	`PageIndex = 0`	62	`PageIndex = 2`
63	`TabOrder = 1`	63	`TabOrder = 1`
64	`object OneParamPage: TPage`	64	`object OneParamPage: TPage`
65	`object OneParamTrackBar: TTrackBar`	65	`object OneParamTrackBar: TTrackBar`

Modifiedeffecteditor.pas +2−0

 procedure TfrmEffectEditor.VibratoDepthTrackBarChange(Sender: TObject);
 begin
   Cell^.EffectParams.Param2 := VibratoDepthTrackBar.Position;
+  Label2.Caption := 'Depth: '+IntToStr(VibratoDepthTrackBar.Position);
 end;
 procedure TfrmEffectEditor.VibratoRateRadioGroupSelectionChanged(Sender: TObject
     $F: VibratoRateRadioGroup.ItemIndex := 4;
   end;
   VibratoDepthTrackBar.Position := Cell^.EffectParams.Param2;
+  Label2.Caption := IntToStr(VibratoDepthTrackBar.Position);
 end;
 procedure TfrmEffectEditor.LoadMasterVolumeData;

Modifiedtracker.lfm +105−91

 object frmTracker: TfrmTracker
-  Left = 861
+  Left = 830
-  Height = 1275
+  Height = 1249
-  Top = 189
+  Top = 199
-  Width = 2056
+  Width = 2068
   Caption = 'hUGETracker'
-  ClientHeight = 1241
+  ClientHeight = 1215
-  ClientWidth = 2056
+  ClientWidth = 2068
   DesignTimePPI = 168
   KeyPreview = True
   Menu = MainMenu1
   LCLVersion = '2.0.6.0'
   object TreeView1: TTreeView
     Left = 0
-    Height = 845
+    Height = 819
     Top = 353
     Width = 338
     Align = alLeft
   end
   object Splitter1: TSplitter
     Left = 338
-    Height = 845
+    Height = 819
     Top = 353
     Width = 9
   end
   object Panel1: TPanel
     Left = 347
-    Height = 845
+    Height = 819
     Top = 353
-    Width = 1709
+    Width = 1721
     Align = alClient
     BevelOuter = bvNone
-    ClientHeight = 845
+    ClientHeight = 819
-    ClientWidth = 1709
+    ClientWidth = 1721
     ParentFont = False
     TabOrder = 2
     object PageControl1: TPageControl
       Left = 0
-      Height = 845
+      Height = 819
       Top = 0
-      Width = 1709
+      Width = 1721
-      ActivePage = WavesTabSheet
+      ActivePage = InstrumentTabSheet
       Align = alClient
       ParentFont = False
-      TabIndex = 3
+      TabIndex = 2
       TabOrder = 0
       object GeneralTabSheet: TTabSheet
         Caption = 'General'
-        ClientHeight = 802
+        ClientHeight = 450
-        ClientWidth = 1701
+        ClientWidth = 969
         ParentFont = False
         object SongInformationGroupbox: TGroupBox
           Left = 14
           TabOrder = 0
           object Label15: TLabel
             Left = 14
-            Height = 30
+            Height = 15
             Top = 28
-            Width = 47
+            Width = 27
             Caption = 'Song'
             ParentColor = False
             ParentFont = False
           end
           object Label16: TLabel
             Left = 12
-            Height = 30
+            Height = 15
             Top = 84
-            Width = 49
+            Width = 28
             Caption = 'Artist'
             ParentColor = False
             ParentFont = False
           end
           object SongEdit: TEdit
             Left = 98
-            Height = 38
+            Height = 23
             Hint = 'The name of your composition'
             Top = 14
             Width = 378
           end
           object ArtistEdit: TEdit
             Left = 98
-            Height = 38
+            Height = 23
             Hint = 'Your name or handle'
             Top = 70
             Width = 378
           end
           object Label21: TLabel
             Left = 14
-            Height = 30
+            Height = 15
             Top = 136
-            Width = 197
+            Width = 114
             Caption = 'Tempo (ticks per row)'
             ParentColor = False
             ParentFont = False
           end
           object TicksPerRowSpinEdit: TSpinEdit
-            Left = 232
+            Left = 233
-            Height = 38
+            Height = 23
             Hint = 'How many ticks should happen before the row changes. Higher means slower'
             Top = 128
             Width = 88
       end
       object PatternTabSheet: TTabSheet
         Caption = 'Patterns'
-        ClientHeight = 802
+        ClientHeight = 803
         ClientWidth = 1701
         ParentFont = False
         object Panel3: TPanel
           Left = 392
-          Height = 802
+          Height = 803
           Top = 0
           Width = 1309
           Align = alClient
-          ClientHeight = 802
+          ClientHeight = 803
           ClientWidth = 1309
           ParentFont = False
           TabOrder = 0
           end
           object ScrollBox1: TScrollBox
             Left = 1
-            Height = 748
+            Height = 749
             Top = 53
             Width = 1307
             HorzScrollBar.Increment = 1
         end
         object OrderEditStringGrid: TStringGrid
           Left = 0
-          Height = 802
+          Height = 803
           Top = 0
           Width = 392
           Align = alLeft
               Title.Caption = 'Nse'
               Width = 63
             end>
-          DefaultColWidth = 29
+          DefaultColWidth = 30
           DefaultRowHeight = 37
           ExtendedSelect = False
           Options = [goFixedVertLine, goFixedHorzLine, goRangeSelect, goRowMoving, goEditing, goAutoAddRows, goTabs, goSmoothScroll, goFixedRowNumbering, goRowHighlight]
       end
       object InstrumentTabSheet: TTabSheet
         Caption = 'Instruments'
-        ClientHeight = 802
+        ClientHeight = 776
-        ClientWidth = 1701
+        ClientWidth = 1713
         ParentFont = False
         object PaintBox1: TPaintBox
           AnchorSideTop.Control = FlowPanel1
           AnchorSideTop.Side = asrBottom
           AnchorSideBottom.Side = asrBottom
           Left = 0
-          Height = 102
+          Height = 77
           Hint = 'Preview of how the resulting waveform will look with envelope applied'
-          Top = 700
+          Top = 699
-          Width = 1701
+          Width = 1713
           Align = alClient
           Color = clBlack
           ParentColor = False
         end
         object FlowPanel1: TFlowPanel
           Left = 0
-          Height = 700
+          Height = 699
           Top = 0
-          Width = 1701
+          Width = 1713
           Align = alTop
           AutoSize = True
           BevelOuter = bvNone
           TabOrder = 0
           object InstrumentGroupBox: TGroupBox
             Left = 12
-            Height = 356
+            Height = 355
             Top = 12
             Width = 474
             Anchors = []
             BorderSpacing.Right = 12
             BorderSpacing.Bottom = 12
             Caption = 'Instrument'
-            ClientHeight = 321
+            ClientHeight = 320
             ClientWidth = 470
             ParentFont = False
             TabOrder = 0
               Width = 203
               Caption = 'Import'
               OnClick = InstrumentImportButtonClick
+              ParentFont = False
               TabOrder = 5
             end
             object InstrumentExportButton: TButton
               Width = 203
               Caption = 'Export'
               OnClick = InstrumentExportButtonClick
+              ParentFont = False
               TabOrder = 6
             end
             object Button1: TButton
               Width = 424
               Caption = 'Test C-5'
               OnClick = Button1Click
+              ParentFont = False
               TabOrder = 7
             end
           end
           object SquareGroupBox: TGroupBox
             Left = 12
             Height = 296
-            Top = 392
+            Top = 391
             Width = 558
             Anchors = []
             BorderSpacing.Left = 12
           object WaveGroupBox: TGroupBox
             Left = 594
             Height = 296
-            Top = 392
+            Top = 391
             Width = 520
             Anchors = []
             BorderSpacing.Left = 12
           object NoiseGroupBox: TGroupBox
             Left = 1138
             Height = 296
-            Top = 392
+            Top = 391
             Width = 462
             Anchors = []
             BorderSpacing.Left = 12
             object Label14: TLabel
               Left = 16
               Height = 30
-              Top = 90
+              Top = 89
               Width = 124
               Caption = 'Dividing ratio'
               ParentColor = False
     Left = 0
     Height = 312
     Top = 41
-    Width = 2056
+    Width = 2068
     Align = alTop
     BevelOuter = bvNone
     ChildSizing.HorizontalSpacing = 10
     ClientHeight = 312
-    ClientWidth = 2056
+    ClientWidth = 2068
     ParentFont = False
     TabOrder = 3
     object Panel6: TPanel
-      Left = 1366
+      Left = 1378
       Height = 312
       Top = 0
       Width = 690
       AutoSize = True
       ClientHeight = 312
       ClientWidth = 690
+      ParentFont = False
       TabOrder = 0
       object Duty1Visualizer: TPaintBox
         Left = 1
         Height = 152
         Top = 1
-        Width = 344
+        Width = 345
+        ParentFont = False
         OnPaint = Duty1VisualizerPaint
       end
       object WaveVisualizer: TPaintBox
         Left = 1
-        Height = 160
+        Height = 159
-        Top = 153
+        Top = 151
-        Width = 344
+        Width = 345
+        ParentFont = False
         OnPaint = WaveVisualizerPaint
       end
       object Duty2Visualizer: TPaintBox
-        Left = 345
+        Left = 344
         Height = 152
         Top = 1
-        Width = 344
+        Width = 345
+        ParentFont = False
         OnPaint = Duty2VisualizerPaint
       end
       object NoiseVisualizer: TPaintBox
-        Left = 345
+        Left = 344
-        Height = 160
+        Height = 159
-        Top = 153
+        Top = 151
-        Width = 344
+        Width = 345
+        ParentFont = False
         OnPaint = NoiseVisualizerPaint
       end
     end
     object LEDMeter1: TLEDMeter
       AnchorSideRight.Side = asrBottom
-      Left = 1276
+      Left = 1289
       Height = 312
       Top = 0
       Width = 88
     end
     object LEDMeter2: TLEDMeter
       AnchorSideRight.Side = asrBottom
-      Left = 1188
+      Left = 1200
       Height = 312
       Top = 0
       Width = 88
   object StatusBar1: TStatusBar
     Left = 0
     Height = 43
-    Top = 1198
+    Top = 1172
-    Width = 2056
+    Width = 2068
     AutoHint = True
     Panels = <
       item
     Left = 0
     Height = 41
     Top = 0
-    Width = 2056
+    Width = 2068
     AutoSize = True
     Caption = 'ToolBar1'
     EdgeBorders = [ebBottom]
       ParentShowHint = False
     end
     object PanicToolButton: TToolButton
-      Left = 547
+      Left = 561
       Hint = 'Stops all sound output'
       Top = 0
       AutoSize = True
       ShowHint = True
     end
     object ToolButton2: TToolButton
-      Left = 169
+      Left = 173
       Top = 0
       Caption = '⏯'
       ImageIndex = 75
       OnClick = ToolButton2Click
     end
     object ToolButton4: TToolButton
-      Left = 224
+      Left = 228
       Top = 0
       Caption = '⏹️'
       ImageIndex = 73
       OnClick = ToolButton4Click
     end
     object ExportGBButton: TToolButton
-      Left = 284
+      Left = 292
       Top = 0
       AutoSize = True
       Caption = 'Export .GB'
       Style = tbsDivider
     end
     object ToolButton6: TToolButton
-      Left = 279
+      Left = 283
       Height = 39
       Top = 0
       Caption = 'ToolButton6'
       Style = tbsDivider
     end
     object ToolButton7: TToolButton
-      Left = 539
+      Left = 547
       Height = 39
       Top = 0
       Caption = 'ToolButton7'
       Style = tbsSeparator
     end
     object OctaveSpinEdit: TSpinEdit
-      Left = 708
+      Left = 728
       Height = 38
       Top = 0
       Width = 158
       MaxValue = 5
       OnChange = OctaveSpinEditChange
+      ParentFont = False
       TabOrder = 0
     end
     object ToolButton9: TToolButton
-      Left = 623
+      Left = 637
       Height = 39
       Top = 0
       Caption = 'ToolButton9'
       Style = tbsSeparator
     end
     object Label22: TLabel
-      Left = 631
+      Left = 651
       Height = 30
       Top = 0
       Width = 77
       Caption = 'Octave  '
       ParentColor = False
+      ParentFont = False
     end
     object Label23: TLabel
-      Left = 866
+      Left = 886
       Height = 30
       Top = 0
       Width = 125
       Caption = '  Instrument  '
       ParentColor = False
+      ParentFont = False
     end
     object InstrumentComboBox: TComboBox
-      Left = 991
+      Left = 1011
       Height = 38
       Top = 0
-      Width = 375
+      Width = 374
       ItemHeight = 30
       ItemIndex = 0
       Items.Strings = (
         '15:'
       )
       OnChange = InstrumentComboBoxChange
+      ParentFont = False
       Style = csDropDownList
       TabOrder = 1
       Text = '(no instrument)'
     end
     object Label24: TLabel
-      Left = 1366
+      Left = 1385
       Height = 30
       Top = 0
       Width = 64
       Caption = '  Step  '
       ParentColor = False
+      ParentFont = False
     end
     object StepSpinEdit: TSpinEdit
-      Left = 1430
+      Left = 1449
       Height = 38
       Top = 0
       Width = 88
       MaxValue = 63
       OnChange = StepSpinEditChange
+      ParentFont = False
       TabOrder = 2
     end
     object ToolButton3: TToolButton
-      Left = 125
+      Left = 129
       Top = 0
       Caption = '▶️'
       ImageIndex = 74
       OnClick = ToolButton3Click
     end
     object ExportGBSButton: TToolButton
-      Left = 406
+      Left = 414
       Top = 0
       Caption = 'Export .GBS'
       ImageIndex = 77
     end
   end
   object ImageList1: TImageList
-    left = 232
+    left = 233
-    top = 80
+    top = 81
     Bitmap = {
       4C694E0000001000000010000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
   object InstrumentSaveDialog: TSaveDialog
     Filter = 'hUGETracker Instruments|*.ugi'
     left = 632
-    top = 192
+    top = 193
   end
   object OrderEditPopup: TPopupMenu
     left = 376
-    top = 80
+    top = 81
     object MenuItem17: TMenuItem
       Caption = 'Insert new row'
       Hint = 'Insert a new row filled with brand new patterns'
   object ImageList2: TImageList
     Height = 32
     Width = 32
-    left = 232
+    left = 233
     top = 168
     Bitmap = {
       4C69020000002000000020000000000000000000000000000000000000000000
     Interval = 25
     OnTimer = OscilloscopeUpdateTimerTimer
     left = 504
-    top = 80
+    top = 81
   end
   object GBSSaveDialog: TSaveDialog
     Filter = 'Gameboy Soundtrack|*.gbs'
-    left = 920
+    left = 921
     top = 200
   end
   object WaveSaveDialog: TSaveDialog
   end
   object GBSaveDialog: TSaveDialog
     Filter = 'Gameboy ROM|*.GB'
-    left = 456
+    left = 457
     top = 184
   end
   object NoteHaltTimer: TTimer
     Enabled = False
     OnTimer = NoteHaltTimerTimer
-    left = 344
+    left = 345
-    top = 176
+    top = 177
   end
 end

Modifiedtracker.pas +23−2

   Menus, Spin, StdCtrls, ActnList, StdActns, SynEdit, math, Instruments, Waves,
   Song, EmulationThread, Utils, Constants, sound, vars, machine,
   about_hugetracker, TrackerGrid, lclintf, lmessages, Buttons, Grids, DBCtrls,
-  ECProgressBar, HugeDatatypes, LCLType, RackCtls, Codegen,
+  ECProgressBar, HugeDatatypes, LCLType, BCTrackbarUpdown, RackCtls, Codegen,
   SymParser;
 type
 var
   I: Integer;
   Section: TCollectionItem;
+  F: file;
+  Stream: TStream;
 begin
   if Screen.Fonts.IndexOf('Pixelite') < 0 then
     MessageDlg('Warning', 'You don''t have the Pixelite .FON file installed, '+
   EmulationThread := TEmulationThread.Create('halt.gb');
   EmulationThread.Start;
   ResetEmulationThread; //TODO: remove this hack
+  if (not FileExists('firstrun')) and FileExists('Sample Songs\Cognition.uge') then begin
+    stream := TFileStream.Create('Sample Songs\Cognition.uge', fmOpenRead);
+    try
+      ReadSongFromStream(stream, Song);
+    finally
+      stream.Free;
+    end;
+    UpdateUIAfterLoad;
+    AssignFile(F, 'firstrun');
+    Rewrite(F);
+    CloseFile(F);
+  end;
 end;
 procedure TfrmTracker.FormKeyDown(Sender: TObject; var Key: Word;
   I: Integer;
   Samp: Integer;
 begin
-  if not Playing then Exit;
+  // Hack to prevent the effect editor from choking when it's trying to close.
+  if Playing then
+    OscilloscopeUpdateTimer.Interval := 25
+  else
+    OscilloscopeUpdateTimer.Interval := 200;
   Max1 := -1;
   Max2 := -1;
   for I := 0 to SAMPLE_BUFFER_SIZE do begin

Commit 3052808

Commit `3052808`