X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fengine%2Fe_soundfile_opus.pas;h=e0b41e392fd078be32895fd36cc3d709bf891dce;hb=f9d99d6e5b67984253827ecf73be6f34a67d1a7c;hp=6a736097eec60ca0ad5db6d588cb5bc7a2e4c115;hpb=f2222ab3f47c52963493918b02a57438e8b27e38;p=d2df-sdl.git

diff --git a/src/engine/e_soundfile_opus.pas b/src/engine/e_soundfile_opus.pas
index 6a73609..e0b41e3 100644
--- a/src/engine/e_soundfile_opus.pas
+++ b/src/engine/e_soundfile_opus.pas
@@ -2,8 +2,7 @@
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -25,15 +24,17 @@ type
 
   TOpusLoader = 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
     FOpus: POggOpusFile;
     FBuf: Pointer;
+    FFinished: Boolean;
+    FLooping: Boolean;
   end;
 
   TOpusLoaderFactory = class (TSoundLoaderFactory)
@@ -79,7 +80,7 @@ end;
 
 (* TOpusLoader *)
 
-function TOpusLoader.Load(Data: Pointer; Len: LongWord; SStreaming: Boolean): Boolean;
+function TOpusLoader.Load(Data: Pointer; Len: LongWord; Loop: Boolean): Boolean;
 begin
   Result := False;
 
@@ -103,11 +104,13 @@ begin
   FFormat.SampleBits := 16;
   FFormat.SampleRate := 48000; // is this even correct?
   FStreaming := True; // opus is always streaming
+  FFinished := False;
+  FLooping := Loop;
 
   Result := True;
 end;
 
-function TOpusLoader.Load(FName: string; SStreaming: Boolean): Boolean;
+function TOpusLoader.Load(FName: string; Loop: Boolean): Boolean;
 begin
   Result := False;
 
@@ -122,15 +125,23 @@ begin
   FFormat.SampleBits := 16;
   FFormat.SampleRate := 48000; // is this even correct?
   FStreaming := True; // opus is always streaming
+  FFinished := False;
+  FLooping := Loop;
 
   Result := True;
 end;
 
-function TOpusLoader.SetPosition(Pos: LongWord): Boolean;
+function TOpusLoader.Finished(): Boolean;
+begin
+  Result := FFinished;
+end;
+
+function TOpusLoader.Restart(): Boolean;
 begin
   Result := False;
   if (FOpus = nil) or (op_seekable(FOpus) = 0) then Exit;
-  Result := op_pcm_seek(FOpus, Pos) = 0;
+  Result := op_pcm_seek(FOpus, 0) = 0;
+  FFinished := False;
 end;
 
 function TOpusLoader.FillBuffer(Buf: Pointer; Len: LongWord): LongWord;
@@ -148,18 +159,22 @@ begin
     Ret := op_read_stereo(FOpus, Buf + Rx, (Len - Rx) div 2);
     if Ret = OP_HOLE then continue;
     if Ret < 0 then break;
-    if FLooping and (Ret = 0) then op_pcm_seek(FOpus, 0); // loop
+    if Ret = 0 then
+    begin
+      if FLooping then
+        op_pcm_seek(FOpus, 0)
+      else
+      begin
+        FFinished := True;
+        break;
+      end;
+    end;
     Rx := Rx + Ret * 4;
   end;
 
   Result := Rx;
 end;
 
-function TOpusLoader.GetAll(var OutPtr: Pointer): LongWord;
-begin
-  Result := 0; // always streaming
-end;
-
 procedure TOpusLoader.Free();
 begin
   if FOpus <> nil then
@@ -169,6 +184,8 @@ begin
   FOpus := nil;
   FBuf := nil;
   FStreaming := False;
+  FFinished := False;
+  FLooping := False;
 end;
 
 initialization