From cc6321c8efa8eeaa2e8d382c78dae61669cac5c5 Mon Sep 17 00:00:00 2001 From: yamat0jp Date: Fri, 11 May 2018 22:36:32 +0900 Subject: [PATCH] =?utf8?q?=E4=BE=8B=E5=A4=96=E5=87=A6=E7=90=86=E3=82=92?= =?utf8?q?=E5=B7=A5=E5=A4=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit よくわからなくなってきました 適当に変更 --- wav.pas | 2 ++ wav_proj.dpr | 33 ++++++++++++++------------------- wav_proj.dproj.local | 18 +++++++++--------- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/wav.pas b/wav.pas index 8042601..397530c 100644 --- a/wav.pas +++ b/wav.pas @@ -97,6 +97,8 @@ begin break; end; end; + fPos:=0; + len:=0; if CompareStr(chank.hdrFmtData, STR_fmt) = 0 then begin len := chank.sizeOfFmtData; diff --git a/wav_proj.dpr b/wav_proj.dpr index 796e34b..93f971d 100644 --- a/wav_proj.dpr +++ b/wav_proj.dpr @@ -60,6 +60,7 @@ end; function wavDataWrite(fpIn, fpOut: TFileStream; posOfData, sizeOfData: LongInt; bytesPerSingleCh: SmallInt): integer; begin + fpIn.Position := posOfData; fpOut.Position := posOfData; if bytesPerSingleCh = 1 then result := effect8BitWav(fpIn, fpOut, sizeOfData) @@ -74,33 +75,27 @@ var fpIn, fpOut: TFileStream; begin try - if FileExists(inFile) = true then - fpIn := TFileStream.Create(inFile, fmOpenRead) - else - begin - result := -1; - Writeln(inFile, '‚ðƒI[ƒvƒ“‚Å‚«‚Ü‚¹‚ñ'); - Exit; - end; + fpIn := TFileStream.Create(inFile, fmOpenRead); fpOut := TFileStream.Create(outFile, fmCreate); bytesPerSingleCh := sampBits div 8; if waveHeaderWrite(fpOut, sizeOfData, bytesPerSingleCh, sampRate, sampBits) = -1 then - begin - result := -1; - Writeln('ƒwƒbƒ_‚ð‘‚«ž‚ß‚Ü‚¹‚ñ'); - Exit; - end; + raise EWriteError.Create('ƒwƒbƒ_‚ð‘‚«ž‚ß‚Ü‚¹‚ñ'); if wavDataWrite(fpIn, fpOut, posOfData, sizeOfData, bytesPerSingleCh) = -1 then + raise EWriteError.Create('ƒGƒ‰[”­¶'); + except + on EFOpenError do + Writeln(inFile, '‚ðƒI[ƒvƒ“‚Å‚«‚Ü‚¹‚ñ'); + on EFOpenError do + fpIn.Free; + else + begin - result := -1; - Write('ƒGƒ‰[”­¶'); - Exit; + fpIn.Free; + fpOut.Free; end; - finally - fpIn.Free; - fpOut.Free; + result := -1; end; result := 0; end; 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