Commit ccca4e5

Nick committed on
Don't continue playing song after a new module is loaded
commit ccca4e5cc2f6faa6ee5edc56864b767c50d1f44f parent cae92c6
2 changed files +4−5
Modifiedtracker.pas +3−3
@@ -9,7 +9,7 @@ uses
9 Menus, Spin, StdCtrls, ActnList, StdActns, SynEdit, math, Instruments, Waves, 9 Menus, Spin, StdCtrls, ActnList, StdActns, SynEdit, math, Instruments, Waves,
10 Song, EmulationThread, Utils, Constants, sound, vars, machine, 10 Song, EmulationThread, Utils, Constants, sound, vars, machine,
11 about_hugetracker, TrackerGrid, lclintf, lmessages, Buttons, Grids, DBCtrls, 11 about_hugetracker, TrackerGrid, lclintf, lmessages, Buttons, Grids, DBCtrls,
12 HugeDatatypes, LCLType, IniPropStorage, RackCtls, Codegen, 12 HugeDatatypes, LCLType, RackCtls, Codegen,
13 SymParser, options, IniFiles; 13 SymParser, options, IniFiles;
14 14
15 type 15 type
@@ -329,7 +329,6 @@ type
329 OptionsFile: TIniFile; 329 OptionsFile: TIniFile;
330 330
331 VisualizerBuffer: TBitmap; 331 VisualizerBuffer: TBitmap;
332 PerformingOscilloscopeUpdate: Boolean;
333 332
334 procedure ChangeToSquare; 333 procedure ChangeToSquare;
335 procedure ChangeToWave; 334 procedure ChangeToWave;
@@ -377,6 +376,8 @@ procedure TfrmTracker.UpdateUIAfterLoad;
377 var 376 var
378 I: Integer; 377 I: Integer;
379 begin 378 begin
379 ResetEmulationThread;
380
380 LoadingFile := True; // HACK!!!!! 381 LoadingFile := True; // HACK!!!!!
381 LoadInstrument(1); 382 LoadInstrument(1);
382 LoadWave(0); 383 LoadWave(0);
@@ -929,7 +930,6 @@ end;
929 procedure TfrmTracker.FormCreate(Sender: TObject); 930 procedure TfrmTracker.FormCreate(Sender: TObject);
930 var 931 var
931 I: Integer; 932 I: Integer;
932 F: file;
933 Stream: TStream; 933 Stream: TStream;
934 begin 934 begin
935 if Screen.Fonts.IndexOf('PixeliteTTF') < 0 then 935 if Screen.Fonts.IndexOf('PixeliteTTF') < 0 then
Modifiedtrackergrid.pas +1−2
@@ -6,8 +6,7 @@ interface
6 6
7 uses 7 uses
8 Classes, SysUtils, Controls, Graphics, Constants, LCLType, math, LCLIntf, 8 Classes, SysUtils, Controls, Graphics, Constants, LCLType, math, LCLIntf,
9 LMessages, HugeDatatypes, ClipboardUtils, gdeque, gstack, utils, effecteditor, 9 LMessages, HugeDatatypes, ClipboardUtils, gdeque, gstack, utils, effecteditor;
10 About;
11 10
12 // TODO: Maybe read these from a config file 11 // TODO: Maybe read these from a config file
13 const 12 const