X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fengine%2Fe_soundfile_wav.pas;h=84ea42df4c5c12068309086e75f61ff2941c2593;hb=9193a04898bdd4020400c8acd8b1bcaccbe33dbf;hp=340aa920725f1cd69dca7054f4f70acd3c152eb2;hpb=78b58ea4463e493067016c5a4c315f24c3c430b7;p=d2df-sdl.git

diff --git a/src/engine/e_soundfile_wav.pas b/src/engine/e_soundfile_wav.pas
index 340aa92..84ea42d 100644
--- a/src/engine/e_soundfile_wav.pas
+++ b/src/engine/e_soundfile_wav.pas
@@ -24,15 +24,17 @@ type
 
   TWAVLoader = class (TSoundLoader)
   public
-    function Load(Data: Pointer; Len: LongWord; SStreaming: Boolean): Boolean; override; overload;
-    function Load(FName: string; SStreaming: Boolean): Boolean; override; overload;
-    function SetPosition(Pos: LongWord): Boolean; override;
+    function Load(Data: Pointer; Len: LongWord; Loop: Boolean): Boolean; override; overload;
+    function Load(FName: string; Loop: Boolean): Boolean; override; overload;
+    function Finished(): Boolean; override;
+    function Restart(): Boolean; override;
     function FillBuffer(Buf: Pointer; Len: LongWord): LongWord; override;
-    function GetAll(var OutPtr: Pointer): LongWord; override;
     procedure Free(); override;
   private
     FData: Pointer;
     FDataLen: LongWord;
+    FDataPos: LongWord;
+    FLooping: Boolean;
   end;
 
   TWAVLoaderFactory = class (TSoundLoaderFactory)
@@ -79,34 +81,29 @@ begin
 end;
 
 (* TWAVLoader *)
-function FixSoundEndian (Buf: PUInt8; Len: UInt32; format: UInt16; rate: cint; chan: UInt8): Boolean;
-  const
-    {$IFDEF FPC_LITTLE_ENDIAN}
-      TARGET_AUDIO_S16 = AUDIO_S16LSB;
-      TARGET_AUDIO_U16 = AUDIO_U16LSB;
-    {$ELSE}
-      TARGET_AUDIO_S16 = AUDIO_S16MSB;
-      TARGET_AUDIO_U16 = AUDIO_U16MSB;
-    {$ENDIF}
+function ConvertSound (var buf: PUInt8; var len: UInt32; var format: UInt16; rate: cint; chan: UInt8): Boolean;
   var cvt: TSDL_AudioCVT; tformat: UInt16;
 begin
+  result := true;
   case format of
-    AUDIO_U16LSB, AUDIO_U16MSB: tformat := TARGET_AUDIO_U16;
-    AUDIO_S16LSB, AUDIO_S16MSB: tformat := TARGET_AUDIO_S16;
-  else tformat := format
+    AUDIO_U8,     AUDIO_S8    : tformat := AUDIO_U8; (* yes, unsigned *)
+    AUDIO_U16LSB, AUDIO_U16MSB: tformat := AUDIO_S16SYS; (* and yes, signed *)
+    AUDIO_S16LSB, AUDIO_S16MSB: tformat := AUDIO_S16SYS;
+    AUDIO_S32LSB, AUDIO_S32MSB: tformat := AUDIO_S16SYS; (* 32bit not supported in al core *)
+    AUDIO_F32LSB, AUDIO_F32MSB: tformat := AUDIO_S16SYS; (* float not supported in al core *)
+  else result := false (* unsupported format *)
   end;
-  Result := True;
-  if format <> tformat then
+  if (result = true) and (format <> tformat) then
   begin
     Result := False;
     if SDL_BuildAudioCVT(@cvt, format, chan, rate, tformat, chan, rate) <> -1 then
     begin
-      cvt.buf := Buf;
-      cvt.len := Len;
-      assert(cvt.len_mult = 1);
-      Result := SDL_ConvertAudio(@cvt) = 0;
-      assert(cvt.len_ratio = 1);
-      assert(cvt.len = Len)
+      buf := SDL_realloc(buf, len * cvt.len_mult);
+      cvt.len := len;
+      cvt.buf := buf;
+      result := SDL_ConvertAudio(@cvt) = 0;
+      len := cvt.len_cvt;
+      format := tformat
     end
   end
 end;
@@ -124,7 +121,7 @@ begin
   if SDL_LoadWAV_RW(RW, 0, @Spec, PUInt8(@Buf), @Len) <> nil then
 {$ENDIF}
   begin
-    Result := FixSoundEndian(Buf, Len, Spec.format, Spec.freq, Spec.channels);
+    Result := ConvertSound(Buf, Len, Spec.format, Spec.freq, Spec.channels);
     if Result = True then
     begin
       with Loader do
@@ -136,7 +133,7 @@ begin
           FFormat.SampleBits := Spec.format and $FF;
         {$ENDIF}
         FFormat.Channels := Spec.channels;
-        FStreaming := False; // never stream wavs
+        FDataPos := 0;
         FDataLen := Len;
         FData := Buf;
       end
@@ -148,7 +145,7 @@ begin
   end
 end;
 
-function TWAVLoader.Load(Data: Pointer; Len: LongWord; SStreaming: Boolean): Boolean;
+function TWAVLoader.Load(Data: Pointer; Len: LongWord; Loop: Boolean): Boolean;
   var
     RW: PSDL_RWops;
 begin
@@ -157,9 +154,11 @@ begin
   if Result = False then
     e_LogWriteln('Could not load WAV: ' + SDL_GetError());
   SDL_RWclose(RW);
+  FStreaming := False;
+  FLooping := Loop;
 end;
 
-function TWAVLoader.Load(FName: string; SStreaming: Boolean): Boolean;
+function TWAVLoader.Load(FName: string; Loop: Boolean): Boolean;
   var
     RW: PSDL_RWops;
 begin
@@ -176,36 +175,50 @@ begin
     Result := False
   end;
   SDL_RWclose(RW);
+  FStreaming := False;
+  FLooping := Loop;
 end;
 
-function TWAVLoader.SetPosition(Pos: LongWord): Boolean;
+function TWAVLoader.Finished(): Boolean;
 begin
-  Result := False; // makes no sense when not streaming
+  Result := FDataPos >= FDataLen;
 end;
 
-function TWAVLoader.FillBuffer(Buf: Pointer; Len: LongWord): LongWord;
+function TWAVLoader.Restart(): Boolean;
 begin
-  if FDataLen < Len then
-    Len := FDataLen;
-  if FData <> nil then
-  begin
-    Move(FData^, Buf^, Len);
-    Result := Len;
-  end
-  else
-    Result := 0;
+  Result := True;
+  FDataPos := 0;
 end;
 
-function TWAVLoader.GetAll(var OutPtr: Pointer): LongWord;
+function TWAVLoader.FillBuffer(Buf: Pointer; Len: LongWord): LongWord;
+var
+  OutPos: LongWord;
+  Tx: LongWord;
 begin
-  OutPtr := FData;
-  Result := FDataLen;
+  OutPos := 0;
+  Result := 0;
+
+  while (FDataPos < FDataLen) and (OutPos < Len) do
+  begin
+    Tx := nmin(FDataLen - FDataPos, Len - OutPos);
+    Move((FData + FDataPos)^, (Buf + OutPos)^, Tx);
+
+    FDataPos := FDataPos + Tx;
+    OutPos := OutPos + Tx;
+    Result := Result + Tx;
+
+    if (FDataPos >= FDataLen) and FLooping then
+      FDataPos := 0;
+  end;
 end;
 
 procedure TWAVLoader.Free();
 begin
   if FData <> nil then
     SDL_FreeWAV(FData); // SDL allocates inside the DLL, so we need this
+  FDataPos := 0;
+  FData := nil;
+  FDataLen := 0;
 end;
 
 initialization