Commit 169fccc

Nick Faro committed on
Remove DMF importing cruft, remove unneeded UI updates after load
commit 169fccc5243386749c487594c56b9a32a0ab5458 parent 82bf854
2 changed files +6−25
Modifiedtracker.lfm +4−4
@@ -1,7 +1,7 @@
1 object frmTracker: TfrmTracker 1 object frmTracker: TfrmTracker
2 Left = 674 2 Left = 1043
3 Height = 902 3 Height = 902
4 Top = 72 4 Top = 99
5 Width = 1458 5 Width = 1458
6 AllowDropFiles = True 6 AllowDropFiles = True
7 Caption = 'hUGETracker' 7 Caption = 'hUGETracker'
@@ -1971,12 +1971,12 @@ object frmTracker: TfrmTracker
1971 Caption = '-' 1971 Caption = '-'
1972 end 1972 end
1973 object MenuItem34: TMenuItem 1973 object MenuItem34: TMenuItem
1974 Caption = 'Import GBT Player ...' 1974 Caption = 'Import GBT Player MOD ...'
1975 ImageIndex = 78 1975 ImageIndex = 78
1976 OnClick = MenuItem34Click 1976 OnClick = MenuItem34Click
1977 end 1977 end
1978 object MenuItem41: TMenuItem 1978 object MenuItem41: TMenuItem
1979 Caption = 'Import DefleMask ...' 1979 Caption = 'Import DefleMask DMF ...'
1980 ImageIndex = 79 1980 ImageIndex = 79
1981 OnClick = MenuItem41Click 1981 OnClick = MenuItem41Click
1982 end 1982 end
Modifiedtracker.pas +2−21
@@ -10,8 +10,7 @@ uses
10 sound, vars, machine, about_hugetracker, TrackerGrid, lclintf, lmessages, 10 sound, vars, machine, about_hugetracker, TrackerGrid, lclintf, lmessages,
11 Buttons, Grids, DBCtrls, HugeDatatypes, LCLType, Clipbrd, RackCtls, Codegen, 11 Buttons, Grids, DBCtrls, HugeDatatypes, LCLType, Clipbrd, RackCtls, Codegen,
12 SymParser, options, bgrabitmap, effecteditor, RenderToWave, 12 SymParser, options, bgrabitmap, effecteditor, RenderToWave,
13 modimport, mainloop, strutils, Types, Keymap, hUGESettings, 13 modimport, mainloop, strutils, Types, Keymap, hUGESettings;
14 dmfimport;
15 14
16 // TODO: Move to config file? 15 // TODO: Move to config file?
17 const 16 const
@@ -1220,8 +1219,6 @@ begin
1220 end; 1219 end;
1221 1220
1222 itNoise: begin 1221 itNoise: begin
1223 //ShiftClockTrackbar.Position := CI^.ShiftClockFreq;
1224 //DivRatioTrackbar.Position := CI^.DividingRatio;
1225 SevenBitCounterCheckbox.Checked := CI^.CounterStep = swSeven; 1222 SevenBitCounterCheckbox.Checked := CI^.CounterStep = swSeven;
1226 end; 1223 end;
1227 end; 1224 end;
@@ -1470,10 +1467,8 @@ begin
1470 SampleSongsMenuItem.Enabled := False; 1467 SampleSongsMenuItem.Enabled := False;
1471 1468
1472 // If a command line param was passed, try to open it 1469 // If a command line param was passed, try to open it
1473 if FileExists(ParamStr(1)) and (ExtractFileExt(ParamStr(1)) = '.uge') then begin 1470 if FileExists(ParamStr(1)) and (ExtractFileExt(ParamStr(1)) = '.uge') then
1474 LoadSong(ParamStr(1)); 1471 LoadSong(ParamStr(1));
1475 UpdateUIAfterLoad(ParamStr(1));
1476 end
1477 else 1472 else
1478 UpdateUIAfterLoad; 1473 UpdateUIAfterLoad;
1479 end; 1474 end;
@@ -1632,7 +1627,6 @@ end;
1632 procedure TfrmTracker.FileOpen1Accept(Sender: TObject); 1627 procedure TfrmTracker.FileOpen1Accept(Sender: TObject);
1633 begin 1628 begin
1634 LoadSong(FileOpen1.Dialog.FileName); 1629 LoadSong(FileOpen1.Dialog.FileName);
1635 UpdateUIAfterLoad(FileOpen1.Dialog.FileName);
1636 end; 1630 end;
1637 1631
1638 procedure TfrmTracker.HeaderControl1MouseDown(Sender: TObject; 1632 procedure TfrmTracker.HeaderControl1MouseDown(Sender: TObject;
@@ -1831,21 +1825,8 @@ begin
1831 end; 1825 end;
1832 1826
1833 procedure TfrmTracker.MenuItem41Click(Sender: TObject); 1827 procedure TfrmTracker.MenuItem41Click(Sender: TObject);
1834 var
1835 Stream: TStream;
1836 begin 1828 begin
1837 if not CheckUnsavedChanges then Exit;
1838
1839 if True then begin
1840 DestroySong(Song);
1841
1842 Stream := TFileStream.Create('C:/test/pokemon3.dmf', fmOpenRead);
1843 Song := LoadSongFromDmfStream(Stream);
1844 1829
1845 Stream.Free;
1846
1847 UpdateUIAfterLoad('Bargus');
1848 end;
1849 end; 1830 end;
1850 1831
1851 procedure TfrmTracker.NoiseMacroPaintboxMouseDown(Sender: TObject; 1832 procedure TfrmTracker.NoiseMacroPaintboxMouseDown(Sender: TObject;