From 3c48a54766c3da8dd7cd5a3564a18fea566ebd74 Mon Sep 17 00:00:00 2001 From: yamat0jp Date: Fri, 11 May 2018 17:42:33 +0900 Subject: [PATCH] =?utf8?q?ShortWord=E3=82=92=E4=BD=BF=E3=81=84=E5=A7=8B?= =?utf8?q?=E3=82=81=E3=81=BE=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- spWave.pas | 4 ++-- wav.pas | 2 +- wav_proj.dpr | 8 ++++---- wav_proj.dproj.local | 18 +++++++++--------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spWave.pas b/spWave.pas index 74b1eff..4687dba 100644 --- a/spWave.pas +++ b/spWave.pas @@ -14,8 +14,8 @@ type tWaveFormatPcm = record formatTag: Word; channels: Word; - samplePerSec: Cardinal; - bytesPerSec: Cardinal; + samplePerSec: LongWord; + bytesPerSec: LongWord; blockAlign: Word; bitsPerSample: Word; end; diff --git a/wav.pas b/wav.pas index 0c66dc0..1c1289a 100644 --- a/wav.pas +++ b/wav.pas @@ -19,7 +19,7 @@ begin fp.ReadBuffer(waveFmtPcm, SizeOf(tWaveFormatPcm)); Writeln('ƒf[ƒ^Œ`Ž®F', waveFmtPcm.formatTag); Writeln('ƒ`ƒƒƒ“ƒlƒ‹”F', waveFmtPcm.channels); - Writeln('ƒTƒ“ƒvƒŠƒ“ƒOŽü”g”F', waveFmtPcm.sampleParSec); + Writeln('ƒTƒ“ƒvƒŠƒ“ƒOŽü”g”F', waveFmtPcm.samplePerSec); Writeln('ƒoƒCƒg”@/@•bF', waveFmtPcm.bytesPerSec); Writeln('ƒoƒCƒg” ‚wƒ`ƒƒƒ“ƒlƒ‹”F', waveFmtPcm.blockAlign); Writeln('ƒrƒbƒg”@/@ƒTƒ“ƒvƒ‹F', waveFmtPcm.bitsPerSample); diff --git a/wav_proj.dpr b/wav_proj.dpr index 4f9e73b..b598808 100644 --- a/wav_proj.dpr +++ b/wav_proj.dpr @@ -11,7 +11,7 @@ function dump8BitWav(fpIn: TFileStream; sizeOfData: Word): integer; var i: integer; s: Single; - c: array [0 .. 1] of Word; + c: array [0 .. 1] of Byte; begin result := 0; i := 0; @@ -33,7 +33,7 @@ function dump16BitWav(fpIn: TFileStream; sizeOfData: Word): integer; var i: integer; s: Single; - c: array [0 .. 1] of SmallInt; + c: array [0 .. 1] of ShortInt; begin result := 0; i := 0; @@ -46,7 +46,7 @@ begin result := -1; break; end; - Writeln(c[0], ',', c[1]); + Writeln(c[0],',',c[1]); inc(i); end; end; @@ -87,7 +87,7 @@ end; var sampRate, sampBits: Word; - posOfData, sizeOfData: Cardinal; + posOfData, sizeOfData: LongWord; i: integer; begin diff --git a/wav_proj.dproj.local b/wav_proj.dproj.local index 74aa953..6b8a0be 100644 --- a/wav_proj.dproj.local +++ b/wav_proj.dproj.local @@ -11,8 +11,8 @@ 2017/10/19 20:49:15.000.988,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\Unit1.pas 2017/10/19 20:49:16.000.125,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerMethodsUnit1.pas 2017/10/19 20:49:16.000.218,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerContainerUnit1.pas - 2017/10/19 20:49:45.000.913,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerContainerUnit1.pas 2017/10/19 20:49:45.000.816,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerMethodsUnit1.pas + 2017/10/19 20:49:45.000.913,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerContainerUnit1.pas 2017/10/19 20:50:18.000.999,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerMethodsUnit1.pas 2017/10/19 20:50:19.000.049,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerContainerUnit1.pas 2017/10/19 21:37:00.000.271,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\Unit1.pas @@ -21,11 +21,11 @@ 2017/10/28 22:58:31.000.296,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\Unit1.pas 2017/10/29 14:44:00.000.024,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\Unit1.pas 2017/10/29 16:13:37.000.037,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\Unit1.pas - 2017/10/29 16:13:37.000.809,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerContainerUnit1.pas 2017/10/29 16:13:37.000.174,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerMethodsUnit1.pas - 2017/10/29 16:55:16.000.244,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerMethodsUnit1.pas - 2017/10/29 16:55:16.000.343,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerContainerUnit1.pas + 2017/10/29 16:13:37.000.809,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerContainerUnit1.pas 2017/10/29 16:55:16.000.109,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\Unit1.pas + 2017/10/29 16:55:16.000.343,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerContainerUnit1.pas + 2017/10/29 16:55:16.000.244,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerMethodsUnit1.pas 2017/10/30 15:04:38.000.106,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\WebModuleUnit1.pas 2017/11/01 16:00:52.000.956,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerMethodsUnit1.pas 2017/11/01 16:00:53.000.058,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerContainerUnit1.pas @@ -35,8 +35,8 @@ 2017/11/01 18:21:25.000.947,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerMethodsUnit1.pas 2017/11/01 18:21:26.000.254,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\WebModuleUnit1.pas 2017/11/01 18:23:22.000.440,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\WebModuleUnit1.pas - 2017/11/01 18:23:22.000.193,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\FormUnit1.pas 2017/11/01 18:23:22.000.344,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerMethodsUnit1.pas + 2017/11/01 18:23:22.000.193,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\FormUnit1.pas 2017/11/01 18:33:21.000.133,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerContainerUnit1.pas 2017/11/01 18:33:21.000.032,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\ServerMethodsUnit1.pas 2017/11/01 18:33:39.000.795,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\WebModuleUnit1.pas @@ -45,11 +45,11 @@ 2018/01/01 12:40:34.000.125,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\Unit1.pas 2018/01/01 12:40:55.000.044,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\Unit1.pas 2018/05/07 18:00:45.000.726,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\Unit1.pas - 2018/05/07 18:01:10.000.795,C:\Users\yamat\Documents\Embarcadero\Studio\Projects\Unit1.pas=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\wav.pas - 2018/05/07 18:01:39.000.274,C:\Users\yamat\Documents\Embarcadero\Studio\Projects\Project1.dproj=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\wav_proj.dproj + 2018/05/07 18:01:10.000.795,C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\wav.pas=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\Unit1.pas + 2018/05/07 18:01:39.000.274,C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\wav_proj.dproj=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\Project1.dproj 2018/05/07 21:20:21.000.796,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\Unit1.pas - 2018/05/07 21:20:27.000.646,C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\spWave.pas=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\Unit1.pas + 2018/05/07 21:20:27.000.646,C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\Unit1.pas=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\spWave.pas 2018/05/09 21:56:39.000.226,=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\Unit1.pas - 2018/05/09 21:56:54.000.027,C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\WriteHeader.pas=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\Unit1.pas + 2018/05/09 21:56:54.000.027,C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\Unit1.pas=C:\Users\yamat\Documents\Embarcadero\Studio\Projects\myapp\wav\WriteHeader.pas -- 2.11.0