Merge branch 'master' of https://github.com/yamat0jp/wav

[sample-delphi/sample-DELPHI.git] / wav.pas

diff --git a/wav.pas b/wav.pas
index 6bd78dd..c765bad 100644 (file)
--- a/wav.pas
+++ b/wav.pas
@@ -3,12 +3,10 @@ unit wav;
 interface
 
 uses
-  System.Classes, System.SysUtils;
+  System.Classes, System.SysUtils, spWav;
 
-{$INCLUDE spWav}
 function readFmtChank(fp: TFileStream; out waveFmtPcm: tWaveFormatPcm): integer;
-function wavHdrRead(wavefile: PChar; var sampRate: LongWord; var sampBits: Byte;
-  var posOfData, sizeOfData: LongInt): integer;
+function wavHdrRead(wavefile: PChar; var sp: SpParam): integer;
 
 implementation
 
@@ -21,7 +19,7 @@ begin
     Writeln('\83`\83\83\83\93\83l\83\8b\90\94\81F', waveFmtPcm.channels);
     Writeln('\83T\83\93\83v\83\8a\83\93\83O\8eü\94g\90\94\81F', waveFmtPcm.sampleParSec);
     Writeln('\83o\83C\83g\90\94\81@/\81@\95b\81F', waveFmtPcm.bytesPerSec);
-    Writeln('\83o\83C\83g\90\94 \82w\83`\83\83\83\93\83l\83\8b\90\94\81F', waveFmtPcm.blockAlign);
+    Writeln('\83o\83C\83g\90\94 \82w \83`\83\83\83\93\83l\83\8b\90\94\81F', waveFmtPcm.blockAlign);
     Writeln('\83r\83b\83g\90\94\81@/\81@\83T\83\93\83v\83\8b\81F', waveFmtPcm.bitsPerSample);
     with waveFmtPcm do
     begin
@@ -50,8 +48,7 @@ begin
   end;
 end;
 
-function wavHdrRead(wavefile: PChar; var sampRate: LongWord; var sampBits: Byte;
-  var posOfData, sizeOfData: LongInt): integer;
+function wavHdrRead(wavefile: PChar; var sp: SpParam): integer;
 var
   waveFileHeader: SWaveFileHeader;
   waveFmtPcm: tWaveFormatPcm;
@@ -89,7 +86,7 @@ begin
     Exit;
   end;
   fPos := 0;
-  len := 0;
+  len := waveFileHeader.sizeOfFile;
   while True do
   begin
     try
@@ -113,15 +110,17 @@ begin
         fp.Free;
         Exit;
       end;
-      sampRate := waveFmtPcm.sampleParSec;
-      sampBits := waveFmtPcm.bytesPerSec;
+      sp.samplePerSec := waveFmtPcm.sampleParSec;
+      sp.bitsPerSample := waveFmtPcm.bitsPerSample;
+      sp.channels := waveFmtPcm.channels;
+      sp.bytesPerSec := waveFmtPcm.bytesPerSec;
       fp.Seek(fPos + len, soFromBeginning);
     end
     else if CompareStr(chank.hdrFmtData, STR_data) = 0 then
     begin
-      sizeOfData := chank.sizeOfFmtData;
-      Writeln('data\82Ì\92·\82³:', sizeOfData, '[bytes]');
-      posOfData := fp.Position;
+      sp.sizeOfData := chank.sizeOfFmtData;
+      Writeln('data\82Ì\92·\82³:', sp.sizeOfData, '[bytes]');
+      sp.posOfData := fp.Position;
       fp.Seek(fPos + len, soFromBeginning);
       break;
     end