Commit a2d4c98

Nick Faro committed on
WIP
commit a2d4c986e918b121472a5be6f5d13e84deea2bfa parent d3ac28d
5 changed files +468−313
Modifiedmodimport.pas +4−5
@@ -109,12 +109,11 @@ var
109 EP: TEffectParams absolute Params; 109 EP: TEffectParams absolute Params;
110 label IdentityEffect; 110 label IdentityEffect;
111 begin 111 begin
112 if Code in [$F, $B, $D] then begin
113 OutCode := Code;
114 OutParams.Value := Params + 1;
115 end
116 else
117 case Code of 112 case Code of
113 $F, $B, $D: begin
114 OutCode := Code;
115 OutParams.Value := Params + 1;
116 end;
118 $9: begin 117 $9: begin
119 OutCode := $C; 118 OutCode := $C;
120 OutParams.Param1 := Lo(Params); 119 OutParams.Param1 := Lo(Params);
Modifiedtbmimport.pas +172−41
@@ -11,33 +11,6 @@ function LoadSongFromTbmStream(Stream: TStream): TSong;
11 11
12 implementation 12 implementation
13 13
14 const
15 TBM_EFFECTS: array[0..22] of Byte = (
16 $0, // No effect, this effect column is unset.
17 $B, // `Bxx` begin playing given pattern immediately
18 $0, // `C00` stop playing
19 $D, // `D00` begin playing next pattern immediately
20 $F, // `Fxx` set the tempo
21 $0, // `Txx` play sound effect
22 $C, // `Exx` set the persistent envelope/wave id setting
23 $9, // `Vxx` set persistent duty/wave volume setting
24 $8, // `Ixy` set channel panning setting
25 $0, // `Hxx` set the persistent sweep setting (CH1 only)
26 $E, // `Sxx` note cut delayed by xx frames
27 $7, // `Gxx` note trigger delayed by xx frames
28 $0, // `L00` (lock) stop the sound effect on the current channel
29 $0, // `0xy` arpeggio with semi tones x and y
30 $1, // `1xx` pitch slide up
31 $2, // `2xx` pitch slide down
32 $3, // `3xx` automatic portamento
33 $4, // `4xy` vibrato
34 $0, // `5xx` delay vibrato xx frames on note trigger
35 $0, // `Pxx` fine tuning
36 $1, // `Qxy` note slide up
37 $2, // `Rxy` note slide down
38 $5 // `Jxy` set global volume scale
39 );
40
41 type 14 type
42 TTBMHeader = packed record 15 TTBMHeader = packed record
43 Signature: array[0..11] of Char; // ' TRACKERBOY ' 16 Signature: array[0..11] of Char; // ' TRACKERBOY '
@@ -113,6 +86,33 @@ type
113 function ReadLString: String; 86 function ReadLString: String;
114 end; 87 end;
115 88
89 //https://github.com/stoneface86/libtrackerboy/blob/bf4993d53bc34691ca75819a96d3d00b3b699dea/src/trackerboy/data.nim#L111
90 TTBMEffectType = (
91 etNoEffect = 0, // No effect, this effect column is unset.
92 etPatternGoto, // `Bxx` begin playing given pattern immediately
93 etPatternHalt, // `C00` stop playing
94 etPatternSkip, // `D00` begin playing next pattern immediately
95 etSetTempo, // `Fxx` set the tempo
96 etSfx, // `Txx` play sound effect
97 etSetEnvelope, // `Exx` set the persistent envelope/wave id setting
98 etSetTimbre, // `Vxx` set persistent duty/wave volume setting
99 etSetPanning, // `Ixy` set channel panning setting
100 etSetSweep, // `Hxx` set the persistent sweep setting (CH1 only)
101 etDelayedCut, // `Sxx` note cut delayed by xx frames
102 etDelayedNote, // `Gxx` note trigger delayed by xx frames
103 etLock, // `L00` (lock) stop the sound effect on the current channel
104 etArpeggio, // `0xy` arpeggio with semi tones x and y
105 etPitchUp, // `1xx` pitch slide up
106 etPitchDown, // `2xx` pitch slide down
107 etAutoPortamento, // `3xx` automatic portamento
108 etVibrato, // `4xy` vibrato
109 etVibratoDelay, // `5xx` delay vibrato xx frames on note trigger
110 etTuning, // `Pxx` fine tuning
111 etNoteSlideUp, // `Qxy` note slide up
112 etNoteSlideDown, // `Rxy` note slide down
113 etSetGlobalVolume // `Jxy` set global volume scale
114 );
115
116 function TStreamHelper.ReadLString: String; 116 function TStreamHelper.ReadLString: String;
117 var 117 var
118 Len: Word; 118 Len: Word;
@@ -124,15 +124,142 @@ begin
124 Result := UTF8CStringToUTF8String(@Buf[0], Len); 124 Result := UTF8CStringToUTF8String(@Buf[0], Len);
125 end; 125 end;
126 126
127 procedure ConvertEffect(Code, Params: Byte; Channel: TInstrumentType;
128 out OutCode: Integer; out OutParams: TEffectParams);
129 var
130 FXType: TTBMEffectType absolute Code;
131 EP: TEffectParams absolute Params;
132 begin
133 OutCode := 0;
134 OutParams.Value := 0;
135
136 case FXType of
137 etNoEffect: begin
138 // no op
139 end;
140 etPatternGoto: begin
141 OutCode := $B;
142 OutParams.Value := Params + 1;
143 end;
144 etPatternHalt: begin
145 // no op
146 end;
147 etPatternSkip: begin
148 OutCode := $D;
149 OutParams.Value := Params + 1;
150 end;
151 etSetTempo: begin
152 OutCode := $F;
153 OutParams.Value := Params;
154 end;
155 etSfx: begin
156 // no op
157 end;
158 etSetEnvelope: begin
159 OutCode := $C;
160 OutParams.Param2 := Params;
161 end;
162 etSetTimbre: begin
163 OutCode := $9;
164
165 if Channel = itSquare then
166 OutParams.Value := Params shl 6;
167
168 if Channel = itWave then
169 case Params of
170 0: OutParams.Value := $00;
171 1: OutParams.Value := $01;
172 2: OutParams.Value := $08;
173 3: OutParams.Value := $0F;
174 end;
175
176 if Channel = itNoise then begin
177 if Params > 0 then
178 OutParams.Value := $08
179 else
180 OutParams.Value := $00;
181 end;
182 end;
183 etSetPanning: begin
184 // TODO
185 end;
186 etSetSweep: begin
187 // no op
188 end;
189 etDelayedCut: begin
190 OutCode := $E;
191 OutParams.Value := Params;
192 end;
193 etDelayedNote: begin
194 OutCode := $7;
195 OutParams.Value := Params;
196 end;
197 etLock: begin
198 // no op
199 end;
200 etArpeggio: begin
201 OutCode := $0;
202 OutParams.Value := Params;
203 end;
204 etPitchUp: begin
205 OutCode := $1;
206 OutParams.Value := Params;
207 end;
208 etPitchDown: begin
209 OutCode := $2;
210 OutParams.Value := Params;
211 end;
212 etAutoPortamento: begin
213 OutCode := $3;
214 OutParams.Value := Params;
215 end;
216 etVibrato: begin
217 OutCode := $4;
218 OutParams.Param2 := $4;
219 OutParams.Param1 := Params;
220 end;
221 etVibratoDelay: begin
222 // no op
223 end;
224 etTuning: begin
225 OutCode := $4;
226 OutParams.Param2 := $0;
227 OutParams.Param1 := Abs(Params - $80);
228 end;
229 etNoteSlideUp: begin
230 OutCode := $1;
231 OutParams.Value := Params;
232 end;
233 etNoteSlideDown: begin
234 OutCode := $2;
235 OutParams.Value := Params;
236 end;
237 etSetGlobalVolume: begin
238 OutCode := $5;
239 OutParams.Value := Params;
240 end;
241 end;
242 end;
243
127 function ConverTBMRow(Row: TTBMTrackRow; RowType: TInstrumentType): TCell; 244 function ConverTBMRow(Row: TTBMTrackRow; RowType: TInstrumentType): TCell;
245 var
246 I: Integer;
128 begin 247 begin
248 BlankCell(Result);
249
129 with Result do begin 250 with Result do begin
130 Note := (Row.Note-1); 251 Note := (Row.Note-1);
131 if RowType = itNoise then 252 if RowType = itNoise then
132 Inc(Note, 4); 253 Inc(Note, 4);
254
133 Instrument := Row.Instrument; 255 Instrument := Row.Instrument;
134 EffectCode := TBM_EFFECTS[Row.Effects[0].EffectType]; 256
135 EffectParams.Value := Row.Effects[0].Param; 257 for I := Low(Row.Effects) to High(Row.Effects) do begin
258 if (Row.Effects[I].EffectType = 0) and (Row.Effects[I].Param = 0) then
259 Continue;
260
261 ConvertEffect(Row.Effects[I].EffectType, Row.Effects[I].Param, RowType, Result.EffectCode, Result.EffectParams);
262 end;
136 263
137 if Row.Note = 0 then 264 if Row.Note = 0 then
138 Note := NO_NOTE; 265 Note := NO_NOTE;
@@ -180,19 +307,14 @@ var
180 EnvReg: TEnvelopeRegister; 307 EnvReg: TEnvelopeRegister;
181 PitchOffset: Integer; 308 PitchOffset: Integer;
182 Offs: ShortInt; 309 Offs: ShortInt;
310
311 WaveId: Byte;
312 WaveName: String;
313 FourBitWave: T4bitWave;
183 begin 314 begin
184 InitializeSong(Result); 315 InitializeSong(Result);
185 316
186 Stream.ReadBuffer(Header, SizeOf(TTBMHeader)); 317 Stream.ReadBuffer(Header, SizeOf(TTBMHeader));
187 with Header do begin
188 writeln('Signature = ', signature);
189 writeln('Title = ', title);
190 writeln('Artist = ', artist);
191 writeln('Copyright = ', copyright);
192 writeln('icount = ', icount);
193 writeln('scount = ', scount);
194 writeln('wcount = ', wcount);
195 end;
196 318
197 // COMM block 319 // COMM block
198 Stream.ReadBuffer(BlockHeader, SizeOf(TTBMBlockHeader)); 320 Stream.ReadBuffer(BlockHeader, SizeOf(TTBMBlockHeader));
@@ -200,9 +322,8 @@ begin
200 322
201 // SONG block 323 // SONG block
202 Stream.ReadBuffer(BlockHeader, SizeOf(TTBMBlockHeader)); 324 Stream.ReadBuffer(BlockHeader, SizeOf(TTBMBlockHeader));
203 Writeln(Stream.ReadLString); // Song name 325 Result.Name := Stream.ReadLString;
204 Stream.ReadBuffer(SongFormat, SizeOf(TTBMSongFormat)); 326 Stream.ReadBuffer(SongFormat, SizeOf(TTBMSongFormat));
205 Writeln('Song has ', songformat.PatternCount, ' patterns ', songformat.NumberOfTracks, ' tracks');
206 Stream.ReadByte; // ????????????????? 327 Stream.ReadByte; // ?????????????????
207 328
208 Result.TicksPerRow := SongFormat.RowsPerBeat - 1; 329 Result.TicksPerRow := SongFormat.RowsPerBeat - 1;
@@ -237,7 +358,6 @@ begin
237 // INST block 358 // INST block
238 for I := 0 to Header.ICount-1 do begin 359 for I := 0 to Header.ICount-1 do begin
239 Stream.ReadBuffer(BlockHeader, SizeOf(TTBMBlockHeader)); 360 Stream.ReadBuffer(BlockHeader, SizeOf(TTBMBlockHeader));
240 writeln(blockheader.id);
241 361
242 InstId := Stream.ReadByte; 362 InstId := Stream.ReadByte;
243 InstName := Stream.ReadLString; 363 InstName := Stream.ReadLString;
@@ -256,6 +376,7 @@ begin
256 Ins^.InitialVolume := EnvReg.InitialVolume; 376 Ins^.InitialVolume := EnvReg.InitialVolume;
257 Ins^.VolSweepDirection := TSweepType(EnvReg.Direction); 377 Ins^.VolSweepDirection := TSweepType(EnvReg.Direction);
258 Ins^.VolSweepAmount := EnvReg.SweepNumber; 378 Ins^.VolSweepAmount := EnvReg.SweepNumber;
379 Ins^.Waveform := InstFormat.Envelope;
259 380
260 Ins^.SubpatternEnabled := True; 381 Ins^.SubpatternEnabled := True;
261 382
@@ -295,6 +416,16 @@ begin
295 else 416 else
296 Stream.Seek(SeqFormat.Length, soCurrent); 417 Stream.Seek(SeqFormat.Length, soCurrent);
297 end; 418 end;
419
420 // WAVE Block
421 for I := 0 to Header.WCount-1 do begin
422 Stream.ReadBuffer(BlockHeader, SizeOf(TTBMBlockHeader));
423 WaveId := Stream.ReadByte;
424 WaveName := Stream.ReadLString;
425 Stream.ReadBuffer(FourBitWave, SizeOf(T4bitWave));
426 Result.Waves[WaveId] := UnconvertWaveform(FourBitWave);
427 end;
428
298 end; 429 end;
299 430
300 end. 431 end.
Modifiedtracker.lfm +273−266
@@ -1,7 +1,7 @@
1 object frmTracker: TfrmTracker 1 object frmTracker: TfrmTracker
2 Left = 502 2 Left = 937
3 Height = 857 3 Height = 857
4 Top = 100 4 Top = 137
5 Width = 1318 5 Width = 1318
6 AllowDropFiles = True 6 AllowDropFiles = True
7 Caption = 'hUGETracker' 7 Caption = 'hUGETracker'
@@ -62,10 +62,10 @@ object frmTracker: TfrmTracker
62 Height = 725 62 Height = 725
63 Top = 0 63 Top = 0
64 Width = 1120 64 Width = 1120
65 ActivePage = GeneralTabSheet 65 ActivePage = WavesTabSheet
66 Align = alClient 66 Align = alClient
67 ParentFont = False 67 ParentFont = False
68 TabIndex = 0 68 TabIndex = 3
69 TabOrder = 0 69 TabOrder = 0
70 object GeneralTabSheet: TTabSheet 70 object GeneralTabSheet: TTabSheet
71 Caption = 'General' 71 Caption = 'General'
@@ -2051,6 +2051,11 @@ object frmTracker: TfrmTracker
2051 ImageIndex = 79 2051 ImageIndex = 79
2052 OnClick = MenuItem41Click 2052 OnClick = MenuItem41Click
2053 end 2053 end
2054 object MenuItem55: TMenuItem
2055 Caption = 'Import TrackerBoy TBM ...'
2056 ImageIndex = 86
2057 OnClick = MenuItem55Click
2058 end
2054 object MenuItem35: TMenuItem 2059 object MenuItem35: TMenuItem
2055 Caption = '-' 2060 Caption = '-'
2056 end 2061 end
@@ -2280,95 +2285,95 @@ object frmTracker: TfrmTracker
2280 Left = 152 2285 Left = 152
2281 Top = 32 2286 Top = 32
2282 Bitmap = { 2287 Bitmap = {
2283 4C7A560000001000000010000000C52200000000000078DAED5D077C1645DA9F 2288 4C7A570000001000000010000000F82200000000000078DAED5D077C1645DA9F
2284 144F3FFB89ED3CEFE43E4FBFF3103C054F3C0E08A2281E8A0D15051114144514 2289 144F3FFB89ED3CEFE43E4FBFF3103C054F3C0E08A0281E8A0D14051514144514
2285 95A31864512014A50642085D20A10941449A52A5BE205D424BE8103A865E9E6F 2290 95A308B228108A520321842E90D08420224DA982C00B862AA12574081D432FCF
2286 9EC9BB6F66F79DD99DD97D49427837BF7FE6DD9DF93FCFF49D999D4248B1B9C0 2291 37CFE4DD37B3FBCEECCEECBE2421BC9BDF3FB3EFCEFC9F67FACECC4E21A4D85C
2287 066D3BFEE2DC899E5BECE7CC9913E2F3B2ECDC027B90F2ED7A64BF55F58BE4DA 2292 6083B61D7F71EE44CF2DF6F3E6CD0BF17959766E813D48F9763DB27B55FD22B9
2288 C31749FD321996670EFAD5E28F68F93F3CFC62BE3D2F48C22CD46F188605BC3B 2293 F6F04552BF4C86E599837EB5F8235AFE0F0FBF986FCF0B92300BF51B866101EF
2289 BB1DA78F38C8564149BFFC84155CEE55F9A0C987283FCA77F92DBDB8BAC32233 2294 CE6EC7E9230EB25550D22F3F610597DFAA7CD0E443941FE5BBDC4B2FAEEEB0C8
2290 F89C68CA005D6E317A7F8316D7ACDF39535186DFBA374CAF92C9E72B819D9B0C 2295 0C3E279A3240975B8CDEDFA0C535EB77CE5494E1B7EE0DD3AB64F2F94A60E726
2291 7BFB8408DE8FDAFA05E1D4D6CFBDE38B24FC0EEF6B65FD0AA6937EEDF48FBEFF 2296 C3DE3E2182F7A3B67E4138B5F573EFF82209BFC3FB5A59BF82E9A45F3BFDA3EF
2292 DDDEF7AA61B6C7ADDBF348EA97B60F15D34DDABE953CF75B8759B832DD2E6DE0 2297 7FB7F7BD6A98ED71EBF63C92FAA5ED43C57493B66F25CFFDD66116AE4CB74B1B
2293 8BC9071DBE1F7B85F8F59B3EC42D8E54F89761FBFF52AEBFBCA697B48C7A68CF 2298 F862F24187EFC75E217EFDA60F718B2315FE65D8FEBF94EB2FAFE9252DA31EDA
2294 1435FF720BFFE5DE5F2FAEE5AEB0D2A3B8EB8D86BF64863F7A398D87E0180807 2299 3345CDBFDCC27FB9F7D78B6BB92BACF428EE7AA3E12F99E18F5E4EE3213806C2
2295 3F7C15775EF53BF19DECDDEC74FC78A9F25564A8DABBA5A14E5EF39AF7FCE6D9 2300 C10F5FC59D57FD4E7C277B373B1D3F5EAA7C1519AAF66E69A893D7BCE63DBF79
2296 CBA12CFBE1FBD1CF9BF67157EEFB8FB22C932BF9FEA8CC5785C8DFAA17118C4F 2301 F67228CB7EF87EF4F3A67DDC95FBFEA32CCBE44ABE3F2AF35521F2B7EA4504E3
2297 87BE69517B3753C657E132B3A4EAD781FBF7ED681B2432ED365248F117D51FD5 2302 D3A16F5AD4DECD94F155B8CC2CA9FA75E0FE7D3BDA06894CBB8D1452FC45F547
2298 5F94FA4B6AD955E23BCC31F1CC078DEF8FA2792F1AED47E17BDA103C97C8108E 2303 F517A5FE925A7695F80E734C3CF341E3FBA368DE8B46FB51F89E3604CF253284
2299 AFCBF8A6A9AA9F0F97242CCAFAEDF275F413DBF704C3A57C69E897B6CD14F53B 2304 E3EB32BE69AAEAE7C325098BB27EBB7C1DFDC4F63DC170295F1AFAA56D3345FD
2300 F2FDE88F545FA488CAB4D3FDA5C007C16F2F7E8008D48B914A07DD7E92AF7E9A 2305 8E7C3FFA23D51729A232EDF4FB52E083E0DE8B1F2002F562A4D241B79FE4AB9F
2301 97FE9EDDBDA58FA450669CFA7945C1D7EDB35EA2E305119983A37389F8AAFD2F 2306 E6A5BF67776FE923299419A77E5E51F075FBAC97E8784144E6E0E85C22BE6AFF
2302 19DFAF7EBE8FEE741FD57F69E91735D69CF82A0DC662D407F03BE6E0DA4E3134 2307 4BC6F7AB9FEFA33BFD8EEABFB4F48B1A6B4E7C95066331EA03F81D73706DA718
2303 F9BAF5088ECD40708CC6ADFD2DD263E60D5AFB06A1C7CF9F0F9ECFE5FB0F767F 2308 9A7CDD7A04C766203846E3D6FE16E931F306AD7D83D0E3E7CF07CFE7F2FD07BB
2304 89FC29D35FE0C60883294357BFE94647BF8C6BD76F0F971BD7655D824D8F35DC 2309 BF44FE94E92F706384C194A1ABDF74A3A35FC6B5EBB787CB8DEBB22EC1A6C71A
2305 BAFADDE25F96A714EDA57D4245FD17A34C5EEAE3005EDBF83AF3FC54E25D87EB 2310 6E5DFD6EF12FCB538AF6D23EA1A2FE8B51262FF57100AF6D7C9D797E2AF1AEC3
2306 1616FD39D1FED33A525C3F7E8F44DCA9CA504D7F2F69EF26A3B0FB6B25750CD1 2311 750B8BFE9C68FF691D29AE1FBF4722EE5465A8A6BF97B4779351D8FDB5923A86
2307 6D0C355271AD35D67231C7600CF95CB5420B7F54FFE5AB3FE40F856FCD4E5C30 2312 E836861AA9B8D61A6BB9986330867CAE5AA1853FAAFFF2D51FF287C2B766272E
2308 C74C583F9BE443E53B78419F8CFE0EBA37F92E32427DBA503B369F135CA41B92 2313 986326AC9F4DF2A1F21DBCA04F46EF83EE4DBE8B8C509F2ED48ECDE70417E986
2309 210B0BEF6FC27179D3C90F21BE110E8B1C17BEDDBF05FEB6F085DF9E435C1E86 2314 64C8C2C2FB9B705CDE74F243886F84C322C7856FF76F81BF2D7CE1B7E7109787
2310 55B72DFC96B1C9D07A338535380EEF62AD35374279EA6B6EE4DF611CD642B986 2315 61D56D0BBF656C32B4DE4C610D8EC3BB586BCD8D509EFA9A1BF9771887B550AE
2311 87E77AF886EF835B1027DEB884F8EC2F242424186E702AC3669F4676A17DE9D2 2316 E1E1B91EBEE1FBE016C489372E213EFB0B090909861B9CCAB0D9A7915D685FBA
2312 A5E7A8F27372724230F94E3254F43BF9C3B45FB97225D3699AE66FC4471F7DC4 2317 74E979AAFC9C9C9C104CBE930C15FD4EFE30ED333333994ED334EF111F7EF821
2313 CA119AF9D5B63ADF34CDB0C9F866784D53F4CC89EF577FD4FFFEFCCFE75B1164 2318 2B4768E657DBEA7CD334C326E39BE1354DD13327BE5FFD51FFFBF33F9F6F4590
2314 FC499326B972F9F0D8F9C17B1D245C22DF11D4B925690DB1FD3BB8E61A562328 2319 F1A74C99E2CAE5C363E7077FEB20E112F98EA0CE2D496B88EDDFC135D7B01A41
2315 D36EEAE8B7F47334F4F33CD1FDC5D61FA9F0FB89FFCB740DB1DFEFE67EF820D9 2320 99765347BFA59FA3A19FE7897E5F6CFD910ABF9FF8BF4CD710FBFD6EEE870F92
2316 372152E55FF55B3F383C53F5BBEC99EEB85761F10BF5F23BEE62B8AC41909991 2321 7D132255FE55BFF583C33355BFCB9EE98E7B1516BF502FBFE32E86CB1A049919
2317 1AFF31223487FDA2C6B1BF3D489CF29217AEDD4F4A7E968DA508C2C27D8BB2D7 2322 A9F11F234273D82F6A1CFBDB83C4292F79E1DAFDA4E467D9588A202CDCB7287B
2318 D2E2EFBDB2BE9FA8EFA9C717BF2D54F866F8B9FDB184FB8589C2CF8753B49EC0 2323 2D2DFEDE2BEBFB89FA9E7A7CF1DB42856F869FDB1F4BB85F9828FC7C3845EB09
2319 A53E55DB37CCA19E099B1F27CF7FDAF34714EA355D3E89009F68BEFF8BEDA5B0 2324 5CEA53B57DC31CEA99B0F971F2FCA73D7F44A15ED3E59308F089E6FBBFD85E0A
2320 5E0554C6FF5CE20FFCF09DBED76AE817CAD05A7FE381EF47BF5976CCF11343B2 2325 EB554065FCCF25FEC00FDFE97BAD867EA10CADF5371EF87EF49B65C71C3F3124
2321 7EC5891B6CED5AF6C9230E6B9FECF16E724DBE3D2DDCF83C74F97CD8D11F3AFE 2326 EB579CB8C1D6AE659F3CE2B0F6C91EEF26D7E4DBD3C28DCF4397CF871DFDA1E3
2322 77893FF0917E1619BC7C3738B435BDEE1D537CEB153F6D244C671F7BA7F969E3 2327 7F97F8031FE96791C1CB7783435BD3EBDE31C5B75EF1D346C274F6B1779A9F36
2323 85749BD0F483619BFFAAE3075377583834D6347A6DEBDA75EBFA41A6878F4F5D 2328 5E48B7094D3F18B6F9AF3A7E3075878543634DA3D7B6AE5DB7AE1F647AF8F8D4
2324 DD61E9215A3FE9104EE3D29B7B5F58FD7C9D3EB9769F52D2F7D5691779DE3F51 2329 D51D961EA2F5930EE1342EBDB9F785D5CFD7E9936BF729257D5F9D7691E7FD13
2325 D28FD01EC7E0E52897BF20C7A5BDABDC7FD2F18340B7D77104697C3A7D87F539 2330 25FD08ED710C5E8E72F90B725CDABBCAFD271D3F08747B1D4790C6A7D377589F
2326 E6A5DC37B4FBC121DCBAE324CAF94A92BE5EF627BA9CEA9CA29C0F7749B49922 2331 635ECA7D43BB1F1CC2AD3B4EA29CAF24E9EB657FA2CBA9CE29CAF97097449B29
2327 E14F8DF210F178B6B5CDBDF8C1733E89C0DEBD85324FE7526FABCBDA587EDAC7 2332 12FED4280F118F675BDBDC8B1F3CE79308ECDD5B28F3742EF5B6BAAC8DE5A77D
2328 2A6D33995B3FFA5DC22F7E1F7AFB26E1A9FDA1F10D41D476716A8B29713564F8 2333 ACD23693B9F5A3DF25FCE2F7A1B76F129EDA1F1ADF10446D17A7B69812574386
2329 F9EEA55C5F89BEB368C673497CFF4664FD5574FD9877FD2A001F798F9B23E8E5 2334 9FEF5ECAF595E83B8B663C97C4F76F44D65F45D78F79D7AF02F091F7B839825E
2330 650E324448BFDFF047D78FFAD35F1CDBF6CA6398AA63A7B27154B7B55EC479ED 2335 5EE6204384F4FB0D7F74FDA83FFDC5B16DAF3C86A93A762A1B47755BEB459CD7
2331 17777E8DFBCC0F677E789A8BBE0316967E3B4ABA7E3FE9EF23FFF9CDFF974A5F 2336 7E71E7D7B8CFFC70E687A7B9E83B6061E9B7A3A4EBF793FE3EF29FDFFC7FA9F4
2332 5DBDFD19FAE2C441B5FD299ABFAE2E43E6CE0F5F3F0CDEB96E7141B4F97EC65A 2337 D5D5DB9FA12F4E1C54DB9FA2F9EBEA3264EEFCF0F5C3E09DEB1617449BEF67AC
2333 8A964F7C7323117F7EE3E0F2183F50DE37D6107F57731EFBB5F5D705DF93C0A9 2338 A568F9C4373712F1E7370E2E8FF103E57D630DF17735E7B15F5B7F5DF03D099C
2334 AF6E88C68CE57C8800DFC9AF6EFE07D5F8701883768D0FCDF69B635CA8FA5D81 2339 FAEA8668CC58CE8708F09DFCEAE67F508D0F873168D7F8D06CBF39C685AADF15
2335 4F88F7F112A5711BC5B122BF7C4222334E1DDD67B0987C73F03296EE61EC2EAA 2340 F884781F2F511AB7511C2BF2CB272432E3D4D17D068BC937072F63E91EC6EEA2
2336 DB9FEEE85E9D85D787275EC73042EB8BC11B9FE30AC7603C70C3C670DCB8B239 2341 BAFDE98EEED559787D78E2750C23B4BE18BCF139AE700CC603376C0CC78D2B9B
2337 B8E65CB0B0FDC44DAE41646BB32D7CBB0CC2CDEB55E113EE5C5CFBDA4A153E7F 2342 836BCE050BDB4FDCE41A44B636DBC2B7CB20DCBC5E153EE1CEC5B5AFAD54E1F3
2338 56AE3D2C86C3FA593B5F24437446AF2EECFB0769F5DD393F11C1F9C02AF36145 2343 67E5DAC36238AC9FB5F345324467F4EAC2BE7F9056DF9DF313119C0FAC321F56
2339 6300AAFA45732075FC5102EBB5A25E3B15D51FD51FDDC3BFE4A75F34FCD1F047 2344 3406A0AA5F340752C71F25B05E2BEAB55351FD51FDD13DFC4B7EFA45C31F0D7F
2340 2FB531212DBEC39EEECAFA8D129846D1B88DC6D5E55487183ED6543B9C91A1CC 2345 F4521B13D2E23BECE9AEACDF288169148DDB685C5D4E7588E1634DB5C31919CA
2341 57399BE162F18B30FFB8BEEFA2E953BCD3A7B8D6B92AF64E75AE8ABDA170A664 2346 7C95B3192E16BF08F38FEBFB2E9A3EC53B7D8A6B9DAB62EF54E7AAD81B0A674A
2342 71AD93A3F1178DBFE855E4630F7633326BD1DCF7C294EF1764BA91715DF695B0 2347 16D73A391A7FD1F88B5E453EF6603723B316CD7D2F4CF97E41A61B19D7655F09
2343 BB15DE2BEA773415C34F9CF71715EAD7D84FD4CF7842F42AEA3A5CF3FB896CFD 2348 BB5BE16F45FD8EA662F889F3FEA242FD1AFB89FA194F885E455D876B7E3F91AD
2344 A66A9E11EDFFC0E751E9D9AFE65E7292FD239C64F0CF65FA456E45F72AFA65A6 2349 DF54CD33A2FD1FF83C2A3DFBD5DC4B4EB27F84930CFEB94CBFC8ADE8B78A7E99
2345 937E37BD4EE1778B3B5E865BF8DD4C11DFCB37B8088C4146AFE2F1FEF6337E0C 2350 E9A4DF4DAF53F8DDE28E97E1167E3753C4F7F20D2E026390D1AB78BCBFFD8C1F
2346 5E2EE272FEA598633DA34757BF5FBE93FF45E78CDAA1CABF18FA75F8BAFA49F4 2351 83978BB89C7F29E658CFE8D1D5EF97EFE47FD139A376A8F22F867E1DBEAE7E12
2347 FB5D61954557BED73DC054F8AA7BC87BD9834B272F46F925977FC9D51DDC7985 2352 FD7E575865D195EF750F3015BEEA1EF25EF6E0D2C98B517EC9E55F727507775E
2348 5C3BD0DAAE73DB93337476077F8E8761D941534586DD542EBF368E6CDD9828FD 2353 21D70EB4B6EBDCF6E40C9DDDC19FE3615876D05491613795CBAF8D235B37264A
2349 C2DC85EDFCE9B8879B25E3D8E7A839B7052C676F10519C79DD47D029DFB9ED69 2354 BF3077613B7F3AEEE166C938F6396ACE6D01CBD91B4414675EF71174CA776E7B
2350 E973FD6854BF4F7E09697FF8F13BB8C5A3EBB897BFFD5C2D67BCDBCFA3D7497B 2355 5AFA5C3F1AD5EF935F42DA1F7EFC0E6EF1E83AEEE56F3F57CB19EFF6F3E875D2
2351 AF7CC3610F3E55FD32DD179BEFE677D5F0CB741706FFB22AFB49CBF2D125D090 2356 DE2BDF70D8834F55BF4CF7C5E6BBF95D35FC32DD85C1BFACCA7EE2F27C740B34
2352 A283221A8678494B4D7CD965531EBC39771F34989D0BC69A3C18B4E33C8CD80D 2357 A2E8A48846215EE232135F74DB94076FCCDF07AFCFCD05634D1E0CD9711E46ED
2353 168CCEA5E1A76E43BC4E8B4D749A701460DCE10B90BCFD14345F7C10AAA74C87 2358 060BC6E6D2F053B7215E979F4D7499741460C2E10B90B4FD14B4F8F920D4489E
2354 1E3FCCB0A0EFAC99F0C78E93FA57E9D083546EFF15211D7F369134E6D07918B9 2359 09BDBE9F6541FF39B3E18F9DA70CACD2A917A9DCF14B423AFF642271DCA1F330
2355 EF1CC3D8C3E7E18389CBE1E0C19D9097B78762071C3BB60DE6CDCB841AED3B4D 2360 7ADF3986F187CFC3FB9357C0C1833B212F6F0FC50E38766C1B2C589001353B76
2356 4B4C7CE19E366D9E23E48B7926BA8DDE7F0E86EF3ECB80BF1B652C814D9BD6C2 2361 99D1BEFDF3F7B46DFB2C219F2F30D163ECFE733072F75906BC6F9CBE14366D5A
2357 860DBFC0FEFD5B60CF9EF53075EA28968694DB94E21ED27E3609E2EB6FF69E85 2362 0B1B36FC02FBF76F813D7BD6C3F4E963581A526E338A7B48C7B92488AFBEDE7B
2358 C13B4E33E0EF5787CE83CD9B7F65328E1CD9CD648C1CD937849A35EF4924ED66 2363 1686EE38CD80F72F0F5F009B37FFCA641C39B29BC9183DBA7F08B56ADDD39E74
2359 92207A0DD9751A06649F60C0DF2F0F9A0D5BB76631197979074232D01F189616 2364 984D82E8336CD76918947D8201EFEB0D990B5BB76631197979074232D01F1896
2360 2D9E6A463E9B4682484EDB761292691A20F0F70BA9B3203B7B139371FCF8618B 2365 962D9F6C4E3E9D4182484ADD761292681A20F0FEF99439909DBD89C9387EFCB0
2361 8CDF7EDB01CD9A3DDE9CB49E42824849D97A027A6D38C680BF6BF79F06DBB66D 2366 45C66FBFED80E6CD1F6B41DA4C234124276F3D017D361C63C0FB3A0367C0B66D
2362 61324E9E3C6A9171E2C45E78E79D848FC87F279120D2FA6CCC83EE6B8F30E0EF 2367 5B988C93278F5A649C38B117DE7E3BE143F2DF292488D47E1BF3A0E7DA230C78
2363 5A7DA6527E369371EA549E45C6A95387A051A37F7F4C5EF982904FC62386F458 2368 5FBBDF74CACF66324E9DCAB3C83875EA10346EFCEF8FC84B9F13F2F144C4B05E
2364 7F0C92561E64C0DF4FF59C0CDBB76F6332CE9C39619171E6CC31A85FFF914F59 2369 EB8F4162E64106BC7FB2F754D8BE7D1B9371E6CC098B8C33678E41C3868F7CC2
2365 1E7EE973423E4C1FD96DCD11F862F97E06FC5DA3FB44D8B1633B9371F6EC298B 2370 F2F08B9F11F241DAE81E6B8EC0E72BF633E07DCD9E9361C78EED4CC6D9B3A72C
2366 8C3367F2E0D5571FFA2F65FF0FC54DA449EAE42E2B0F43FBA5FB1892E8EFC7BB 2371 32CE9CC983975F7EE8BF94FD3F143791A62953BB651E868ECBF63124D2FBC7BA
2367 8E879D3B773219E7CE9DB5C8387BF638D4AE7D7F3BCAFD3DC55F498DF7063CDC 2372 4F849D3B773219E7CE9DB5C8387BF638D4A9737F07CAFD3DC55F49CD77073DDC
2368 EBC7634DA76D39F3C5B203D069C521A8D6390376EDDA45B1132E5C384F710ECE 2373 E78763CD666C39F3F9F203D065E521A8D6351D76EDDA45B1132E5C384F710ECE
2369 9F3F43659DA6BF4F43A54A7FEC122A87E59E20A471EA73E4ED94D43BDB8E99F3 2374 9F3F43659DA6F7A7A152A53F760B95C3728F13D224E559F25672CA9DEDC6CD7B
2370 C2A8E53957BED46AFB3DF75CDDB74C996BBB952D7B5D921D77DF7DCD7B16FEDB 2375 7ECC8A9C2B5F6CBDFD9E7BAEEE5FA6CCB53DCA96BD2ED18EBBEFBEE65D0BFFAD
2371 298434EA4BC81B3DFE41EA7D95485EEDD88FDADC45718704BFBF58DF6415BFB9 2376 64421AF727E4B55EFF200DBE6C4F5EEE3C80DADC45718704BFBF58DF6415BFB9
2372 89BF05B8AFDD52DAE34B97CFEF21EBE207D76FBD2E7E0027DD1679623FB8AE2D 2377 89BF05B8AFDD52DAE34B97CFEF21EBE207D76FBD2E7E0027DD1679623FB8AE2D
2373 75F10344A07D67F70188A1C317C9D34B7F17AEC27B54AED7FD4C0C473F8BFCE0 2378 75F10344A07D67F70188A1C317C9D34B7F17AEC27B54AED7FD4C0C473F8BFCE0
2374 C295EFA326D7ED35FE7D97FA4B21FD15F8CA69E8954BD4F39D6EFC155AFABBEE 2379 C295EFA326D7ED35FE7D97FA4B21FD15F8CA69E8954BD4F39D6EFC155AFABBEE
@@ -2386,179 +2391,181 @@ object frmTracker: TfrmTracker
2386 EE4B46E4F5735C0095BA5BCED5E20BB876E8E43F65FD0E71A5C02FFE2F76503A 2391 EE4B46E4F5735C0095BA5BCED5E20BB876E8E43F65FD0E71A5C02FFE2F76503A
2387 6FD391EF204318FFDAE9E7906795F483733E8896FF420ABF9FFAD74FFD5F3467 2392 6FD391EF204318FFDAE9E7906795F483733E8896FF420ABF9FFAD74FFD5F3467
2388 0D94ACB17CFDB59716AE9FB38B9CE6C0AB722FB26EE9F75F15DDE6BEAF7C3CAA 2393 0D94ACB17CFDB59716AE9FB38B9CE6C0AB722FB26EE9F75F15DDE6BEAF7C3CAA
2389 EE872BE082EED9F3B6EFCF5ED6DC5AEE9DF4DBF70096855DEA5F5B5F4C70CE0F 2394 EE872BE082EED9F3B6EFCF5ED6DC5A7E3BE9B7EF012C0BBBD4BFB6BE98E09C1F
2390 F1B28FB06CFC5525FC0EF9BF24AD3BF435FFDFE7D9659ECB7F21E9967EC3D05C 2395 E2651F61D9F8AB4AF81DF27F495A77E86BFEBFCFB3CB3C97FF42D22DFD86A1B9
2391 B36A3775F75CF776A69037BDD2B3DBDCEA53C17E0FB23810A60637EE4324E1F6 2396 66D56EEAEEB9EEED4C216F7AA567B7B9D5A782FD1E6471204C0D6EDC8748C2ED
2392 BC6E5CE027DDF82BA9E55F255C4AF3C41CDF452E6591DFC75EF87E71C8033C57 2397 79DDB8C04FBAF15752CBBF4AB894E68939BE8B5CCA22BF8FBDF0FDE2900778AE
2393 26C310AC419771ED326CFE0FE3CA6449E2CF52BFC8DA0C5ED7AE90425EB7E7A1 2398 4C862158832EE3DA65D8FC1FC695C992C49FA57E91B519BCAE5D2185BC6ECF43
2394 FEBEE4F593E8BE03453CB6E1EFEC54B0BE631CFB4651BE98EF63EF9E68198A5E 2399 FD7DC9EB27D17D078A786CC3DFD9A9607DC738F68DA27C31DFC7DE3DD13214BD
2395 FEC72C3CCEAD10CDDD36DFCF86C23C3943713EBDCC5F2A7E750A97A1390F4535 2400 FC8F59789C5B219ABB6DBE9F0D85797286E27C7A99BF54FCEA142E43731E8A6A
2396 FC22AEA33B0F678545AF42EDB347A2EF0C7EF8BA6D303C2F4B710F1FF9995D86 2401 F8455C47771ECE0A8B5E85DA678F44DF19FCF075DB60785E96E21E3EF233BB0C
2397 D21A72218F872ADFE2670FFAED7CC5368C3BC720CAE177F38B0ADF1E761DBE9F 2402 A535E4421E0F55BEC5CF1EF4DBF98A6D18778E4194C3EFE61715BE3DEC3A7C3F
2398 F8778B7BAFE1F7C2D768835ECEFB9715B7FDDB2EF7F3A7A2E1BF44CA5FCFB846 2403 F1EF16F75EC3EF85AFD106BD9CF72F2B6EFBB75DEEE74F45C37F8994BFDE718D
2399 A45710EDDBD7714562621D52A6CCE0476362B64E8C89599810E4BF4BD19DDA37 2404 499F203A76ACEB8AF6EDEB923265863E1A13B375724CCCE28420FF1D8A9ED4BE
2400 7143CB9675125FFE4B8B05F8B92B2626736ECFB886D40F0DBF3E363A2B58B35D 2405 A91B5AB5AADBBEDE5F5A2EC2CF5D313119F37BC735A27E68F4D5B1B159C19AED
2401 9062EEDE43F0DD77DFC1C99327A1F2EFEB2C2764688DAFE3DE24143D0F0C5B03 2406 8214F3F71E826FBFFD164E9E3C09957F5F770521C36B7E15F706A1E87D60C41A
2402 172EE4EFD120C2EC5DFBE0E9EF7F8636BB4F42D74689F0E155CF7E5323F673F2 2407 B870217F8F0611E6EEDA074F7DF713B4DD7D12BA376E0F1F5CF5CCD735633F23
2403 555C0344EFDC21ABD89E0E274E1C09C3CC6D3BA0E677F318B7DA900990D9E727 2408 5FC6BD8EE89B3B6C15DBD3E1C489236198BD6D07D4FA7601E3561B360932FAFD
2404 400E72BBC5BD8148DE3D70399C3A75188E1EDD63C10F5B37C39393E7306E95B4 2409 08C8416E8FB8D71049BB07AF8053A70EC3D1A37B2CF87EEB667862EA3CC6AD92
2405 B130EDD7F5806E9183DCA4D87A88941D294BA9AE7D70E04076084B37FF0A3526 2410 3A1E66FCBA1ED02D72909B18DB0091BC237919D5B50F0E1CC80E61D9E65FA1E6
2406 FDC4B8950766C084C012E606DD2207B99D625F430CCC495E0447B66C85BCBC9D 2411 941F19B7F2E074981458CADCA05BE420B74BEC2B88C139494BE0C896AD9097B7
2407 217C963903B2F200AA0E1A0353D7FDC29EA11B748B1CE47E195B17317873AFF9 2412 33844F336641561E40D521E360FABA5FD83374836E9183DC2F62EB23866EEEB3
2408 B02669860598479F6CD811867F9661798E6E91835C23F615C4B0ACAFE7C08897 2413 10D624CEB200F3E8138D3AC3C84FD32DCFD12D72906BC4BE841891F5D53C1855
2409 BBC2F03A5D84403B13DBFA2D06E420F7F3D83A8891EBBACE825175BF82C58B16 2414 AF3B8CACDB4D08B433B16DC0CF801CE47E165B17317A5DF73930A6FE97F0F392
2410 C1FC79F32CC0676837BFD558C8A8D713B6F45E00C841EE67B12F223256779E0E 2415 25B070C1020BF019DA2D6C3D1ED21BF4862D7D17017290FB69EC0B88F4D55D67
2411 63EAF78239336742BF9A890C3F4C9ECC80CFD00EF993DE4E818D3DE6027290DB 2416 C2B8867D60DEECD930A0567B86EFA74E65C0676887FC296F25C3C65EF30139C8
2412 2AF639C484B55D66C28486C9302333939988CC8C0C06F319F2A7351B0A1BBE9A 2417 6D1DFB2C62D2DA6EB36152A324989591C14C44467A3A83F90CF9339A0F870D5F
2413 0DC841EE9D31A5C88B3115AB358F797A46DA53C6E1E9E3C64166E3010CDFA7A7 2418 CE05E420F7CE9852E485988AD55AC43C352BF549E3F0CC091320A3C92086EFD2
2414 3398CF903FE7D37458DFED4740F7C8A5D79F29CA3D4CEE7EAB31A9BE303E3EBE 2419 D218CC67C89FF7491AACEFF103A07BE4D2EBCF14E51E2677BFD984D4581C1F1F
2415 9B0868C7A316293F24C8BD81E23622DFE34386DB82DCE2F61E77FA36E4B6F7A2 2420 DF4304B4E3519B941F16E4DE40711B91EFF121C36D416E717B8F3B7D1B72DB7B
2416 8AA9526713C9B72AA77EB3967EA3A02FE3F66D2DCC8F02AEFA384731E6CADCA8 2421 51C554A9B389E45B9553BF594BBF51D09771FBB616E64701577D9CA31873656E
2417 720D41DC181AF16548D619E984D910EFD7A61D574611A6B3D7F60E48BE93BA9E 2422 54B986206E0C8DF83224EB8C74C26C88F76BD38E2BA308D3D96B7B0724DF495D
2418 436C9DB76591E3343744C437DCF401B1F0C1B65ECB4D9F619B130E1C08776676 2423 CF21B6CEDBB2C8719A1B22E21B6EFA8058F8605BAFE5A6CFB0CD09070E843B33
2419 7EDC43983E91FF4DBEC1F145E75F8BF4F33254FC2F590B60896F47FD8448E7C4 2424 3B3FEE214C9FC8FF26DFE0F8A2F3AF45FA79192AFE97AC05B0C4B7A37E42A473
2420 8BCE0AB7EB735A8B10D225891349F8B5F4ABF09DC2EFB416447656B9ECAC7019 2425 E2456785DBF539AD4508E992C48924FC5AFA55F84EE1775A0B223BAB5C7656B8
2421 DF35BFCBD60FABCD658A5EDEFA7245C12F6CDDE0D2FEB8D87C1281BC0A118AB7 2426 8CEF9ADF65EB87D5E632452F6F7DB9A2E017B66E70697F5C6C3E89405E8508C5
2422 E815F93110F5B684E8FC1E95BD83051CC573A394CE0F7290A1CC158CDFEA7145 2427 5BF48AFC18887A5B42747E8FCADEC1028EE2B9514AE70739C850E60AC66FF5B8
2423 F30175B9A2334CDCCF2993CD85713CA7CC8B7EA53049E2D0033712E9AF2CC335 2428 A2F980BA5CD11926EEE794C9E6C2389E53E645BF52982471E8811B89F45796E1
2424 0F7BCFFF91287FBE2EC3C7DE0486C3B77243F11BB957FFF8E5ABF4058B413B45 2429 9A87BDE7FF48943F5F97E1636F02C3E15BB9A1F88DDCAB7FFCF255FA82C5A09D
2425 653F40C7BD2F5DF644755EDFEA3C77473ECE62EBAB08FCE0E6FF104761FE9045 2430 A2B21FA0E3DE972E7BA23AAF6F759EBB231F67B1F555047E70F37F88A3307FC8
2426 86AC4DADB9A6D86B1B035CC6C1A2ED14E73A8F10EFFB10796D4747F911E00BCA 2431 2243D6A6D65C53ECB58D012EE360D1768A739D4788F77D88BCB6A3A3FC08F005
2427 2BF8C8075044F92FDAFFBEC42FFB3B5C56EF8BDA2E866C4EA0408661DBBB55B7 2432 E5157CE40328A2FC17ED7F5FE297FD1D2EABF7456D174336275020C3B0EDDDAA
2428 ADA2D3CE70E3FBD56F5CA4797E4EF30CA35704F2BAC259BBEEDCE07A137EEE95 2433 DB56D16967B8F1FDEA372ED23C3FA77986D12B02795DE1AC5D776E70BD093FF7
2429 5B7EE2F6D991CDDD726A97323E37B60CF671F9A00C61B90B72793F1B1C87E7CB 2434 CA2D3F71FBECC8E66E39B54B199F1B5B06FBB87C5086B0DC05B9BC9F0D8EC3F3
2430 DAA616371CF2F33A27CF812F9361FA01883B5F26C7309CF9860B1F5CEA3E22F8 2435 656D538B1B0EF9799D93E7C097C930FD00C49D2F936318CE7CC3850F2E751F11
2431 0E426CDF5514DE832177A27D8FF87B6E2D54980CC13A29C7B5D0C2311CAEAF22 2436 7C0721B6EF2A0AEFC1903BD1BE47FC6F6E2D54980CC13A29C7B5D0C2311CAEAF
2432 5BFF2C1B43F0A99FF80CBFE776B0D7726F2903667B4DB1DCF3653FFF77D0BD6E 2437 225BFF2C1B43F0A99FF80CBFE776B0D7726F2903667B4DB1DCF3653FFF3EE85E
2433 DD617EAFB597178772CF459445A7C9732BF716BEA4CC128772C7F315CBAD78DD 2438 B7EE30BFD7DACB8B43B9E722CAA2D3E4B9957B0B5F52668943B9E3F98AE556BC
2434 8CA8CC1956DD4EEB674567A713FD75BB5A638D4279FAE375F2B1572FEB9079AE 2439 6E4654E60CAB6EA7F5B3A2B3D389FEBA5DADB146A13CFDF13AF9D8AB9775C83C
2435 7DEF3AF7BDECFC700BE2C41B979008CD372CA4F73FF87CFF0BCFEF94BDFFC563 2440 D7BE779DFB5E767EB80571E28D4B4884E61B16D2FB1F7CBEFF85E777CADEFFE2
2436 D7D6FD1F9CDEFF844877230C952DA7F7BF2A5FFAFE57F4BF4A3D22EA4B3BBEFF 2441 B16BEBFE0F4EEF7F42A4BB1186CA96D3FB5F952F7DFF2BFA5FA51E11F5A51DDF
2437 89F0FD0FAEEF7F237C5E82CAD8A4C1A5191746E53C5CF06E96C7B74A1FDE279F 2442 FF44F8FE07D7F7BF113E2F41656CD2E0D28C0BA3721E2E7837CBE35BA50FEF93
2438 78F5BF8F3113DDB147ED7A4087179A8361B67F0DE22AC75E07C8CAAEE1527F18 2443 4FBCFADFC79889EED8A3763DA0C30BCDC130DBBF06719563AF036465D770A93F
2439 867E5DC8FB99D8E6E414BC43256737705CDEEF10B6CF8D707E53F8BE3FA4A0CD 2444 0C43BF2EE4FD4C6C73720ADEA192B31B382EEF7708DBE74638BF297CDF1F52D0
2440 62BE0143EBF7437249D8FE37F67D4A79AE5D8661D36FD6D956BE950BFCFC2A09 2445 6631DF80A1F5FB21B9246CFF1BFB3EA53CD72EC3B0E937EB6C2BDFCA057E7E95
2441 BF20BD8D30AE937EBECD06DC7C1F3BD7E0F6F5E6D3806F6BF175907DCFA182A4 2446 845F90DE4618D7493FDF66036EBE8F9D6B70FB7AF369C0B7B5F83AC8BEE75041
2442 093F3B0704B0D67DF9FB4F03719761707599617BE626C370DEAF3DE8DEDCC35A 2447 D2849F9D030258EBBEFCFDA781B8CB30B8BACCB03D73936138EFD71E746FEE61
2443 AB3D7031EA179DBAC675DE92423DE3F6FD48E5CC28AD339D3C845BF7BC258844 2448 ADD51EB818F58B4E5DE33A6F49A19E71FB7EA4726694D6994E1EC2AD7BDE1244
2444 9D1D81F740617C9F74DBD347E91D23FAAD1A2E073EA8E4398577A2E33E4B1EFD 2449 A2CE8EC07BA030BE4FBAEDE9A3F48E11DDAB86CB810F2A794EE19DE8B8CF9247
2445 0F910CBFC5FF5593F391D02F9522A080D41087A1AF8940F3E1BBA061F27A689E 2450 FF4324C36FF17FD5A47C240C48A108282025C461E86F22D062E42E6894B41E5A
2446 B6127ED97C1072B6EF86394B3742D3E4A5F9CFA93DBAE3388454EE6D22D078C0 2451 A466C22F9B0F42CEF6DD306FD9466896B42CFF39B547771C8790CA7D4D049A0C
2447 6678ECD389307BD906E8D6AD1B54AA54097A2425C1886113D873B447771C8790 2452 DA0CD53F990C73976F801E3D7A40A54A95A05762228C1A31893D477B74C77108
2448 4A3D4C04DEEABF11FEDD7C346CC9DE06152A5480D4D45468D2A4092C983A8D3D 2453 A9D4CB44E0CD811BE1DF2DC6C296EC6D50A1420548494981A64D9BC2A2E933D8
2449 477B74C7710879B4BB89C09B7D7F858416E361D2B49F21A97D7B78E38D376058 2454 73B447771C8790477B9A08BCD1FF5748683911A6CCF809123B7684D75E7B0D46
2450 4A0A4C9E388B3D477B74C77108F9671713817A3DD7C013AD7E809ACD87C088A1 2455 2427C3D4C973D873B447771C87907F76331168D07B0D3CDEFA7BA8D562188C1A
2451 E3E167AA37F3DB99F04C8BE1EC39DAA33B8E4348858E26022F755A044FB64887 2456 3E117EA27A33BE990D4FB71CC99EA33DBAE3388454E86C22F0629725F044CB34
2452 3EE9F360C5BA2DB06DFB0E5818580B4903A7C0E3CD4702DAA33B8E43C8831D4C 2457 E897B60056AEDB02DBB6EF80C581B59038781A3CD66234A03DBAE338843CD8C9
2453 046AB51C0FB397AC873163C640FDFAF5E199679E8166CD9AC1E8A143A1D9F899 2458 44A076AB893077E97A18376E1C346CD8109E7EFA6968DEBC398C1D3E1C9A4F9C
2454 F087217320A6C9B06C52A52B09A15C3B1381BEA3E74246460654AC5811CA962D 2459 0D7F18360F629A8EC82655BA9310CA753011E83F763EA4A7A743C58A15A16CD9
2455 0BD5AB5767F1F77E8B8FA1DAB81990B6F320C477FDEE60CCE4655751100429D3 2460 B250A3460D167FEFB5FC08AA4D9805A93B0F427CF76F0FC64C5D7E1505419032
2456 C64460C5DACDF0EAABAFC2FDF7DF0FB7DF7E3B33EBD5AB076F260F827AB30330 2461 6D4D0456AEDD0C2FBFFC32DC7FFFFD70FBEDB733B3418306F046D21068303700
2457 EEF839A83A79F9F198498B9F8999B88820C8DF5A9A0860781F7BEC3106E4CE9C 2462 138E9F83AA53571C8F99F2F3D33193971004F95B2B13010C6FF5EAD519903B7B
2458 3913EABEFE3AFC7BD414E8BE7D3FD4A953071237E79E8B9DB07070CCB805F114 2463 F66CA8FFEAABF0EF31D3A0E7F6FD50B76E5D68BF39F75CECA4C54363262C8AA7
2459 84DCD3C24460E1D235D080A659A3468DE075CA7BEDB5D7A06EC76E507BC61248 2464 20E49E9626028B97AD81D7699A356EDC185EA5BC575E7905EA77EE0175662D85
2460 DC799495A37737EC81BBA70516C764CCA91E933E9B903B5E20E47F3F40049292 2465 F63B8FB272F4CE863D70F78CC0CF31E9F36AC4A4CD25E48EE709F9DFF71181C4
2461 27C190010358BA77EEDC1952070E84C7BEC984B7576F861A6B7E859653BE8784 2466 A429306CD02096EE5DBB768594C183A1FAD719F0D6EACD5073CDAFD06ADA7790
2462 95ABA1D2D255076246CE1A103362460C2B43B7D422E48F6F0512DE1C0823068F 2467 90B91A2A2D5B752066F49C4131A366C5B032744B6D42FEF86620E18DC1306AE8
2463 87A1C9C9D0AE4D1B68F045123C98F1033C969503E5697AA27E342B505C377EEE 2468 44189E94041DDAB685D73F4F8407D3BF87EA5939509EA627EA47B302C57513E7
2464 A2982153FF459F5D4D702DCE0D2F051E7E3B1DAAD44F81CFBF1806533232E1F9 2469 2F891936FD5FF4D9D504D7E2DCF062E0E1B7D2A04AC364F8ECF311302D3D039E
2465 F4A9509E969FFB36ED83BF6DDC076D0E1E6726E2CE4559B931A9998328171711 2470 4B9B0EE569F9B96FD33EF8DBC67DD0F6E0716622EE5C92951B93923184727111
2466 952557FC7334B9E2C980052FB7CB252D7AE659D0B2F701F2E580952469D052D2 2471 515972C53FC7922B9E085850AF432E69D93BCF82567D0F902F066592C421CB48
2467 7D443236896262624C3C4AD19F62BC00FD83F6CC2DDF31E2F829EFBCF3CE1E8C 2472 CF5149D8248A898931F128C5408A89020C0CDA33B77CC788E327BFFDF6DB7B30
2468 BBEEDDBB43AF5EBDA0478F1ED0B56B5768DAB4E91EB497F0279AC07A09F36CB9 2473 EE7AF6EC097DFAF4815EBD7A41F7EEDDA159B3667BD05EC29F6C02EB25CCB3E5
2469 72E5E0D65B6F6526DEE373DE9D8D5F9EC6C1F2E79E7B0EDAB56B078F3FFE385C 2474 CA95835B6FBD9599F81B9FF3EE6CFCF2340E563CFBECB3D0A1430778ECB1C7E0
2470 7D737B882BB58299788FCFD11EDDA17BBBFFE955819ADFB56DDB16AA54A902D7 2475 EA9B3B425CA995CCC4DFF81CEDD11DBAB7FB9F5E15A8F96DBB76EDA04A952A70
2471 DFB701AE2B93CB4CBCC7E7681F74270BFFD456AD5AC1F3CF3F0FF7250C813F3D 2476 FD7D1BE0BA32B9CCC4DFF81CED83EE64E19FDEBA756B78EEB9E7E0BE8461F0A7
2472 B99799788FCFD15E12FE69265AB66CC9DC3FF0C00370D75D773113EFF139EFCE 2477 27F632137FE373B497847F868956AD5A31F70F3CF000DC75D75DCCC4DFF89C77
2473 C67F84FA6BE3134F3C011F7F4CCB6AB56AF0E4934F42E3C68D9989F7F81CEDD1 2478 67E33F42FDB5F1F1C71F878F3EA265B55A3578E28927A0499326CCC4DFF81CED
2474 1DBA1784BF22357F6ADEBC392B7F5886685A3213EFF139DA07DDC9C23FF7FDF7 2479 D11DBA1784BF22357F6CD1A2052B7F5886685A32137FE373B40FBA93857FFE7B
2475 DF67FE7DE18517A0418306CCC47B7C8EF692F02F3041F309E3601D54A64C1966 2480 EFBDC7FCFBFCF3CFC3EBAFBFCE4CFC8DCFD15E12FE4526683E611CAC83CA9429
2476 E23D3EE7DDD9F895A8BF721F7DF451565FD5A851838515EB2234F11E9FA33DBA 2481 C34CFC8DCF7977367E25EAAFDC471F7D94D557356BD66461C5BA084DFC8DCFD1
2477 43F782F057A2E6D2B7DE7A8BE597975F7E19EAD6ADCB4CBCC7E7681F7427D95A 2482 1EDDA17B41F82B5173D99B6FBEC9F24BBD7AF5A07EFDFACCC4DFF81CED83EE24
2478 90AC6ED8B021D4AA558BC5FB4B2FBDC44CBCC7E7682F1A6408D601B7532CA0BA 2483 5B0B92D58D1A3582DAB56BB3787FF1C5179989BFF139DA8B06198275C0ED148B
2479 4E623DF7ECB3CF327FA389F7F81CED29FE40718D8D7F33C53F28DEA50850EC15 2484 A8AE9358CF3DF3CC33CCDF68E26F7C8EF6147FA0B8C6C6BF99E21F14EF500428
2480 2010B47F90E25649FA9598F2FFD4534FC1871F7EC84C2FE5FF830F3E60650E4D 2485 F60A1008DA3F4871AB24FD4A4CF97FF2C927E1830F3E60A697F2FFFEFBEFB332
2481 2FE51FF30DE67934A3E5BFF0CBFF5D1FDD05B70CBF85995ECA7F996965A0CC82 2486 87A697F28FF906F33C9AD1F25FF8E5FFAE0FEF825B46DEC24C2FE5BFCC8C3250
2482 32CCF452FEABF6AC0A35D7D56466B4FC47CB7F6197FF1B9A7E0271C32631D34B 2487 665119667A29FF557B57855AEB6A31335AFEA3E5BFB0CBFF0DCD3E86B8115398
2483 F98FFB61219005EB98E9A5FCFF99B6F9E3D7EE6466F4FD5FBCCB7F51828CB940 2488 E9A5FCC77DBF18C8A275CCF452FEFF4CDBFCF16B773233FAFE2FDEE5BF2841C6
2484 C8586088ED9C4DE21BCEBE29BED19CEE26488211E0C1DBA15B9E8F887B65DCBB 2489 5D20643C30C476CD26F18DE6DE14DF785E4F1324C108F0E0EDD02DCF47C4BD34
2485 357AAC5FD465E621403CDE6A6C08099F8C06F339BA41B7949F4A1108E1F3B581 2490 E19D9ABDD62FE936FB10201E6B3D3E84848FC782F91CDDA05BCA4FA10884F0D9
2486 B15B004CB4A2FF4C34490D006F17DF60466F32F274E0F95C805ABBF241DAAE0C 2491 DAC0F82D00265AD37F269AA60480B78B7F7D565F32FA74E0B95C80DABBF241DA
2487 0C5E790AFA2DFE8DA14E9799213C637C177A3E74F56988AB3F35F99D8763C6A6 2492 650686669E82013FFFC650B7DBEC109E36BE0D3D1FBEFA34C4359C9EF4F6C331
2488 B57D1510095994DF72592065E96FD073DE21E8BDE008E3BD943403605975383B 2493 E353DBBD0C88842CCA6FB53C90BCEC37E8BDE010F45D7484F15E4C9C05B0BC06
2489 BF121C9FFE201C99F87FD07FC931887B7D726A938AB123564CE80EA3921A43A5 2494 9C5D58098ECF7C108E4CFE3F18B8F418C4BD3A35A569C5D8512B27F58431894D
2490 B594FFE1CF811E730F40A769BBA1EBAC5C16EEC75A66C0F1E33B2DE83A6B37C4 2495 A0D25ACAFFE0A740AFF907A0CB8CDDD07D4E2E0B77F556E970FCF84E0BBACFD9
2491 D5FD7670E3CA7103D6CD4C85CC81ADE1E11594DFF4A740E7E9BBA1DDA41CE830 2496 0D71F5BF19DAA472DCA075B3532063701B787825E537FB31D075E66EE8302507
2492 650795B3073E1CB11A0E1CD80433668C81E5CB67B1DF6D276441DCCB6346BC55 2497 3A4DDB41E5EC810F46AD86030736C1AC59E360C58A39ECBEDDA42C88AB376ED4
2493 2DBEE7F2190360C0A451F0C062CA6F342DD06E52368DAF4DD066FC162A671B34 2498 9BD5E27BAF983508064D19030FFC4CF98D67043A4CC9A6F1B509DA4EDC42E56C
2494 4C5E08DBB7AFB2A0D9D0E510FBE2C874F2F1A2C043CB00EE9B970F527F72A0D5 2499 8346498B61FBF65516341FBE02625F189D463E5A12786839C07D0BF2411A4E0D
2495 D88DD062E47AF8343D8BC9693A6805D4FDEA2778EDEBD9217C327A1DC4D64E9B 2500 B41EBF115A8E5E0F9FA4653139CD86AC84FA5FFE08AF7C3537848FC7AE83D83A
2496 44CBE23892BA051EAC519FA154ADAE5BFE3B268B723740EB719B18DA4ED80A89 2501 A95368599C4052B6C083351B3294AADD7DCB7FC76551EE066833611343BB495B
2497 1373E0EDA46FA172F5BA0C4DBB6742CC135DE7C7C7C77727E4A683583F23F077 2502 A1FDE41C782BF11BA85CA33E43B39E1910F378F785F1F1F13D09B9E920D6CF08
2498 5C5CDC8714FD295229D26263638750B4B1BBA3BAC7D2E7B438DDF40B3EC3F10A 2503 BC8F8B8BFB806220450A456A6C6CEC308AB6767754F778FA9C16A79B7EC16738
2499 FC1D13F33B82CF4DE4D7795708DCB17AE7CFB43837A1F7ABF281BFC9BD6284B9 2504 5E81F73131BF23F8DC447E9D7785C01DAB77FE4C8B7353FA7B553EF09EDC2B46
2500 F3BDFF87EF323CB38E084051CAFE3CE1815BC30727E5FC8EF8FB42E67FC8F971 2505 983BDFFB7FF82EC3B3EB8A0014A5ECCF131EB8357C7052CEEF8CF71732FE43CE
2501 4F84F053870AE4D3DAA5C9474FDF499A3E7E9B13FF3CC5B3763E62EFE0AA243B 2506 4F783C841F3B55209FD4294D3E7CEA4ED2ECB1DB9CF8E7299EB1F3117B875625
2502 B922599D548EC91700762597CBA266DE856F9F7AD8897FA6DF0322C0D9C18F5C 2507 D94915C9EAC4724CBE00B02BA95C1635F32E7CF3E4C34EFC33031E1001CE0E7D
2503 BFB373E985F4F7BE53497FB9E3A47107411CED55D6C23F9978AB0870EACB3F11 2508 E4FA9D5D4B2FA6F7FB4E25FEE58E93C61D0471B44F590BFF64FB5B4580535FFC
2504 CABB727BDB9B97D0FB11A6DDD11E652CFC039DEF2687BBDE434E7F760B0F6026 2509 8950DE95DBDBDDBC94FE1E65DA1DED55C6C23FD0F56E72B8FB3DE4F4A7B7F000
2505 9541CDBF1EFAEC96A3A61D72797E4E7279B227F511722CF561023DFF66029899 2510 665219D4FCEBA14F6F396ADA2197E7E72495277B521E21C7521E26D0FB6F2680
2506 F220813E65AEA5BFF3F0FEB77EE5A5FC43432A91DF86562230B2320260541502 2511 99C90F12E857E65A7A9F87BF7F1B505ECA3F34AC12F96D782502A32B2300C654
2507 198FE5FF4EAB503AB7D73FC8EEB4CA64CFA02AA914F5447C26637815722EA33A 2512 21905E3DFF3EB542E9DC3EFF20BB532B933D43AAA4503410F1998C9155C8B9F4
2508 5030F3F888AAA5D7757B9020B27A5440BD01C4D6BE8FD433F93B531E4EA03296 2513 1A40C1CCE3A3AA965ED7E34182C8EA5501F506105BFB3FD2C0E4EF4C7E3881CA
2509 529CA3003473D31EA5F2FE4D56762A9B4ADD0578C0AE144093DAD55BD6E1AF84 2514 5846718E02D0CC4D7D94CAFB37C9EC523685BA0BF0805DC98026B56BB0BCD35F
2510 62CFDEF427E0CCBCFA7030F359A0F79BF0F9FC36772302B0A30FC0BAF70056D5 2515 09C59EBD698FC399050DE160C633407F6FC2E70BDBDE8D08C08E7E00EBDE0558
2511 2FC0864F00EDCADE7905F9F6DD1B8E6D1B5811B2073C02535BDC061D6B5FD70C 2516 D5B0001B3E06B42B7BE715E49B776E38B66D7045C81EF4084C6F791B74AE735D
2512 9F97BBF34AD2F5B952A9DFBF777B8007FC5C11D0FCA1D91FEAD12250FADD4AB1 2517 737C5EEECE2B49F7674BA57CF7EEED011EF0534540F3FBE67F68408B40E9772A
2513 4969AFC41E1BF84AECAE868FC476A2CFCA07DFD37707C7F7E23B3D7323F9F6AD 2518 C526A6BE147B6CF04BB1BB1A3D12DB853E2B1F7C4FDF1D1CDF8BEFF2F48DE49B
2514 5224BDDE7501C49837AEAF47656011BA5152BEB19D7053B06D81951419FCC2EF 2519 374B91B406D70510E35EBBBE01958145E84649F9C676C24DC1B605565264E8F3
2515 C8A0E77F974A518FCA20413EBBB09DA903BE0CE3FDEE5D3B61EFDE3D909B8B7B 2520 BF23439EFB5D0A45032A8304F9ECC276A60EF8328CBF77EFDA097BF7EE81DC5C
2516 58ED8783070F4076F656387CF8106CDB9603478E1C81A3478FD0BA7F1B337919 2521 DCC36A3F1C3C7800B2B3B7C2E1C38760DBB61C3872E4081C3D7A84D6FDDB98C9
2517 F87BE52F2B60106D2BA556ADCAB07EFD3A080496C1AFBFFE4ADF39CB21AD5A42 2522 CBC0FBCC5F56C210DA564AA95A9561FDFA7510082C875F7FFD95BE7356406AB5
2518 3E689B282B2B2B8CBF66CD6A18989040DDAF87214FD7A46E36507E00366DDA08 2523 847CD03651565656187FCD9AD530382181BA5F0FC39EAA45DD6CA0FC006CDAB4
2519 2B56503E6DC366AD5903BFFCF20B6CD9B2258CBF716316955F8DDA6D86AD5BB7 2524 1156AEA47CDA86CD5AB3067EF9E517D8B2654B187FE3C62C2ABF1AB5DB0C5BB7
2520 424E4E360CA2BA46D1B617FA61086D03323CFD34ECDCB9338C8FEED17EC78E1D 2525 6E859C9C6C1842758DA16D2FF4C330DA066478EA29D8B97367181FDDA3FD8E1D
2521 3092B67777EFDE0D9B376F867DFBF63179B9B9B930BF5F3F1844FDB17FFFFE30 2526 3B60346DEFEEDEBD1B366FDE0CFBF6ED63F272737361E180013084FA63FFFEFD
2522 3EC64FFA8B2FC237356B329C3A758A71CE9C39C3DC8FFACF7FF241659F3D7B36 2527 617C8C9FB4175E80AF6BD5623875EA14E39C397386B91FF39FFFE483CA3E7BF6
2523 8CBF7DFB76D845D300F5EEDDBB9771B3B3B31937272787A6C9019A2607695A6C 2528 6C187FFBF6EDB08BA601EADDBB772FE3666767336E4E4E0E4D9303344D0ED2B4
2524 63A69D8F6ED10EFDBF6BD72E2667D3A64D4C96190E04C61D9A763EBA5DBD3A9B 2529 D8C64C3B1FDDA21DFA7FD7AE5D4CCEA64D9B982C331C088C3B34ED7C74BB7A75
2525 E9423988B56BD73279EBD7AF6771867E5C43D300EDECFC152B36C11B6FE4FBB9 2530 36D38572106BD7AE65F2D6AF5FCFE20CFDB886A601DAD9F92B576E82D75ECBF7
2526 75EB5CE606E37DD6ACADB064C95AA617D37DD9B265B06EDD3AD62EE6F9E3C79F 2531 739B36B9CC0DC6FB9C395B61E9D2B54C2FA6FBF2E5CB61DDBA75AC5DCCF3274E
2527 82871E3A0F23469CA5FDB573F0E38FE7E0D0A143B40DBF1F060FDEC2FCB572E5 2532 3C050F3D741E468D3A4BFB6BE7E0871FCEC1A14387681B7E3F0C1DBA85F92B33
2528 4AEAC7553068D020D626E7F9FFFAD749DAD73C0D952A9DA67E3B49FB1C47A17E 2533 3393FA71150C193284B5C979FEBFFE7592F6354F43A54AA7A9DF4ED23EC75168
2529 7D4CA76D50B5EA4A68DFFE079626D3A64D83366DDA84E5FFE9D37329FF04F5EF 2534 D810D3691B54AD9A091D3B7ECFD264C68C19D0B66DDBB0FC3F73662EE59FA0FE
2530 21CAF90D162D3AC0C2FBDE7B393070E0721696E9D3A7B3FEACFD1D88FCDCDC13 2535 3D4439BFC19225075878DF7D3707060F5EC1C23273E64CD69FB5BF03919F9B7B
2531 D4EF2759DAFEF8E369387FFE3CF3FF81032768FED90243870E657D50D9473EA7 2536 82FAFD244BDB1F7E380DE7CF9F67FE3F70E004CD3F5B60F8F0E1AC0F2AFBC8E7
2532 B25ABB766DD67F54FDC6BA67CF1E1A8E59EC5BD0B871E360FEFCF9B41C1F76E5 2537 5456EBD4A9C3FA8FAADF58F7ECD943C331877D0B9A3061022C5CB89096E3C3AE
2533 E33C0DECF78F1C3912E6CE9DCBD26AECD8B134FC03A153A74E0C9827445C1C27 2538 7C9CA781FDFED1A347C3FCF9F3595A8D1F3F9E867F3074E9D28501F384888BE3
2534 C8CCCC64E1372FFC8D790F81F96BE9D2A5D0A1430718366C9845C6AA55AB983F 2539 041919192CFCE685F798F71098BF962D5B069D3A75821123465864AC5AB58AF9
2535 4D0E02E3EFF4E9D334BD57D3BCB582D521A81BF361FBF6ED691D74342403F562 2540 D3E42030FE4E9F3E4DD37B35CD5B2B591D82BA311F76ECD891D641474332502F
2536 5D8117F278FDC8C13A03816E366EDC08C9C9C92C3D4D7E7A7A3ACB9B26FFDCB9 2541 D61578218FD78F1CAC3310E866E3C68D909494C4D2D3E4A7A5A5B1BC69F2CF9D
2537 73213EE677CCAFE87F74837501E6BF850B1786F8A3468D626164BB1F5EB810D2 2542 3B17E2637EC7FC8AFE4737581760FE5BBC7871883F66CC181646B6FBE1850B21
2538 8F651FCBCEECD9B3E19B6FBE61407F0C1F3E1CE6CD9B67D18FE5AC6FDFBE50AA 2543 FD58F6B1ECCC9D3B17BEFEFA6B06F4C7C8912361C1820516FD58CEFAF7EF0FA5
2539 5429F6ED0BC387B25037F6A3B1EFFBF7BFFF9DE57BD4876963F2315F621C4E9E 2544 4A9562DFBE307C280B75633F1AFBBE7FFFFBDF59BE477D9836261FF325C6E1D4
2540 3C998D39DC71C71DB4CC0C667EC0E79887CA972F0FF7DE7B2F1B43C1EFAA589E 2545 A953D998C31D77DC41CBCC50E6077C8E79A87CF9F270EFBDF7B23114FCAE8AE5
2541 4C3E964D4C6733CC663C20B03CA35FD11E816530292989858D4FC3DEBD7B331E 2546 C9E463D9C47436C36CC60302CB33FA15ED11580613131359D8F834ECDBB72FE3
2542 C69D197F984E38EE60D60518F7988E389E64CF3F18A718D7BC1F302F26262632 2547 61DC99F187E984E30E665D80718FE988E349F6FC83718A71CDFB01F362FBF6ED
2543 3F60DEC1384E4B4B6365D8CECFCBCB63DF9CCDEBC489130C4B962C61F38F5037 2548 991F30EF601CA7A6A6B2326CE7E7E5E5B16FCEE675E2C40986A54B97B2F947A8
2544 C6198E2339E5FF010306303ED61553A64C813E7DFAB038C47CF4C9279F58E24D 2549 1BE30CC7919CF2FFA04183181FEB8A69D3A641BF7EFD581C623EFAF8E38F2DF1
2545 2603E367D1A2452C4D31ED316CAD5BB766F947A5FCA2BFA74E9D0AFDFBF78794 2550 269381F1B364C91296A698F618B6366DDAB0FCA3527ED1DFD3A74F8781030742
2546 94144B5EF1397F5838775AF5FC38DB196C617C2CD76E10ADAF50E5F2327839BA 2551 7272B225AFF89C3F2C9C3BAD7A7E9CED0CB6303E966B3788D657A8727919BC1C
2547 FA657C8FF1C09D57375509227EC89ECD65E77E87F648B3DA0BF9BC3BFEDE6EEA 2552 5DFD32BEC778E0CEAB9BAE04113F64CFE6B273F7A13DD2ACF6423EEF8EFF6D37
2548 F005BA5DF90E7A95FCEF952F8B3F05FFFB4D3F1FF9C76BF98568F92F66E57F03 2553 75F802DDAE7C07BD4AFEF7CA97C59F82FFFDA69F8FFCE3B5FC42B4FC17B3F2BF
2549 284158FEEDEED08EFF6D829321E5F35CFEDE0FDFF64C892F332F365F167F0EFE 2554 0194202CFF767768C7DF9BE06448F93C97FFED876F7BA6C49799179B2F8B3F07
2550 F79B7E455CFE237699ED2619B05D84ED5227BE39074C04FCB6E824C3E41F3D7C 2555 FFFB4DBF222EFF11BBCC76930CD82EC276A913DF9C0326027E5B749261F28F1E
2551 240CBC0CDC431CDBA75EF8BC0CAF7C04BAD5E1DB659524BE28AFE8F2ED71EB85 2556 3E12065E06EE218EED532F7C5E86573E02DDEAF0EDB24A125F945774F9F6B8F5
2552 EF573FCF77CAC72AFE578153FC15C51E02D1F21F2DFF3A7C2FB0F3B17F8CF768 2557 C2F7AB9FE73BE56315FFABC029FE8A620F8168F98F967F1DBE17D8F9D83FC6DF
2553 8ACA9169C7D70B3C9F77C7BB17956319DF5E6E797D76B3F907CD5DF5DBFD2FAA 2558 688ACA9169C7D70B3C9F77C7BB17956319DF5E6E797D76B3C5FB2D5CF5DBFD2F
2554 5FBC2242FD7F082D7CA6D795575E1976FEECD5575F0DB7DD769BF40C23B437AF 2559 AA5FBC2242FD7F082D7CA6D795575E1976FEECD5575F0DB7DD769BF40C23B437
2555 ABAEBA2A8C7FEDB5D73A9E8184F637DF7CB3F09C5A539E79DD70C30D4C9F896B 2560 AFABAEBA2A8C7FEDB5D73A9E8184F637DF7CB3F09C5A539E79DD70C30D4C9F89
2556 AEB986D9F37E20E1E7DC86EED1BDC8FFE8E6C61B6FB43CC731383B1FFD83EEAE 2561 6BAEB986D9F37E20E1E7DC867EA37B91FFD1CD8D37DE68798E6370763EFA07DD
2557 BFFEFA303EB19DFD141F1F2F7C2ED38F400E5EA8834F23A738443BBB5B513AE3 2562 5D7FFDF5617C623BFB293E3E5EF85CA61F811CBC50079F464E71887676B7A274
2558 733EEE4C10C9BEA07861BAD8F5CB3822BE3D3DBCF09DE2CB8D6FA6379FB63A7C 2563 C6E77CDC9920927D41F1C274B1EB9771447C7B7A78E13BC5971BDF4C6F3E6D75
2559 2C0F665A98E399BA7CF3990B9F88F8B2F22428BFBEA07BFE0F02DD2207B93AE7 2564 F8581ECCB430C73375F9E633173E11F165E549507E7D41F7FC1F04BA450E7275
2560 FFE40300DD2207B9AAE7FF984037E81639C85539FF8707BA41B7AAE7FFD8816E 2565 CEFFC90700BA450E7255CFFF31816ED02D7290AB72FE0F0F74836E55CFFFB103
2561 54CFFF1141E7FC1F1174CEFF91217AFE4FC939FFE7FF01078D246C 2566 DDA89EFF2382CEF93F22E89CFF2343F4FC9F9277FE0F685EF6CD4F4ADF7E9516
2567 4C192637F3540ED47BA70283FD1EF1E1BC6E96E7A68C28BFF8F079776EF7517E
2568 7819F0527EFC96DFFF075D73DC4E
2562 } 2569 }
2563 end 2570 end
2564 object OpenDialog1: TOpenDialog 2571 object OpenDialog1: TOpenDialog
Modifiedtracker.pas +8−1
@@ -44,6 +44,7 @@ type
44 TfrmTracker = class(TForm) 44 TfrmTracker = class(TForm)
45 FileSave1: TAction; 45 FileSave1: TAction;
46 MenuItem42: TMenuItem; 46 MenuItem42: TMenuItem;
47 MenuItem55: TMenuItem;
47 VGMSaveDialog: TSaveDialog; 48 VGMSaveDialog: TSaveDialog;
48 MenuItem10: TMenuItem; 49 MenuItem10: TMenuItem;
49 TempoBPMLabel: TLabel; 50 TempoBPMLabel: TLabel;
@@ -293,6 +294,7 @@ type
293 TableGrid: TTableGrid; 294 TableGrid: TTableGrid;
294 procedure FileSave1Execute(Sender: TObject); 295 procedure FileSave1Execute(Sender: TObject);
295 procedure MenuItem10Click(Sender: TObject); 296 procedure MenuItem10Click(Sender: TObject);
297 procedure MenuItem55Click(Sender: TObject);
296 procedure TimerDividerSpinEditChange(Sender: TObject); 298 procedure TimerDividerSpinEditChange(Sender: TObject);
297 procedure TimerEnabledCheckBoxChange(Sender: TObject); 299 procedure TimerEnabledCheckBoxChange(Sender: TObject);
298 procedure TrackerPopupMixPasteClick(Sender: TObject); 300 procedure TrackerPopupMixPasteClick(Sender: TObject);
@@ -2024,6 +2026,11 @@ begin
2024 end; 2026 end;
2025 end; 2027 end;
2026 2028
2029 procedure TfrmTracker.MenuItem55Click(Sender: TObject);
2030 begin
2031
2032 end;
2033
2027 procedure TfrmTracker.FileSave1Execute(Sender: TObject); 2034 procedure TfrmTracker.FileSave1Execute(Sender: TObject);
2028 begin 2035 begin
2029 if FileSaveAs1.Dialog.FileName = '' then 2036 if FileSaveAs1.Dialog.FileName = '' then
@@ -2065,7 +2072,7 @@ begin
2065 DestroySong(Song); 2072 DestroySong(Song);
2066 2073
2067 // TODO: Add error checking 2074 // TODO: Add error checking
2068 Stream := TFileStream.Create('C:/tmp/n1_navi_V2.tbm', fmOpenRead); 2075 Stream := TFileStream.Create('C:/tmp/n1_navi_v2.tbm', fmOpenRead);
2069 Song := LoadSongFromTbmStream(Stream); 2076 Song := LoadSongFromTbmStream(Stream);
2070 2077
2071 Stream.Free; 2078 Stream.Free;
Modifiedutils.pas +11−0
@@ -12,6 +12,7 @@ function Snap(Value, Every: Integer): Integer;
12 function ReMap(Value, Istart, Istop, Ostart, Ostop: Double): Double; 12 function ReMap(Value, Istart, Istop, Ostart, Ostop: Double): Double;
13 function IntReMap(Value, Istart, Istop, Ostart, Ostop: Integer): Integer; 13 function IntReMap(Value, Istart, Istop, Ostart, Ostop: Integer): Integer;
14 function ConvertWaveform(Waveform: TWave): T4bitWave; 14 function ConvertWaveform(Waveform: TWave): T4bitWave;
15 function UnconvertWaveform(Waveform: T4bitWave): TWave;
15 procedure BlankPattern(Pat: PPattern); 16 procedure BlankPattern(Pat: PPattern);
16 procedure BlankCell(var Cell: TCell); 17 procedure BlankCell(var Cell: TCell);
17 function EffectCodeToStr(Code: Integer; Params: TEffectParams): String; 18 function EffectCodeToStr(Code: Integer; Params: TEffectParams): String;
@@ -54,6 +55,16 @@ begin
54 end; 55 end;
55 end; 56 end;
56 57
58 function UnconvertWaveform(Waveform: T4bitWave): TWave;
59 var
60 I: Integer;
61 begin
62 for I := Low(T4BitWave) to High(T4BitWave) do begin
63 Result[I*2] := hi(Waveform[I]);
64 Result[(I*2)+1] := lo(Waveform[I]);
65 end;
66 end;
67
57 procedure BlankPattern(Pat: PPattern); 68 procedure BlankPattern(Pat: PPattern);
58 var 69 var
59 I: Integer; 70 I: Integer;