mixer: allow to use sdl 1.2 + sdl_mixer

[d2df-sdl.git] / src / engine / e_soundfile.pas

diff --git a/src/engine/e_soundfile.pas b/src/engine/e_soundfile.pas
index 6cae52c6a5739335df7329212bfed65d266f09cf..c508593235bc070b10a2d348efcc7942131e4885 100644 (file)
--- a/src/engine/e_soundfile.pas
+++ b/src/engine/e_soundfile.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
@@ -34,25 +33,23 @@ type
   protected
     FFormat: TSoundFormat;
     FStreaming: Boolean;
-    FLooping: Boolean;
 
   public
-    function Load(Data: Pointer; Len: LongWord; SStreaming: Boolean): Boolean; virtual; abstract; overload;
-    function Load(FName: string; SStreaming: Boolean): Boolean; virtual; abstract; overload;
+    function Load(Data: Pointer; Len: LongWord; Loop: Boolean): Boolean; virtual; abstract; overload;
+    function Load(FName: string; Loop: Boolean): Boolean; virtual; abstract; overload;
 
-    function SetPosition(Pos: LongWord): Boolean; virtual; abstract;
+    function Finished(): Boolean; virtual; abstract;
+    function Restart(): Boolean; virtual; abstract;
     function FillBuffer(Buf: Pointer; Len: LongWord): LongWord; virtual; abstract;
 
-    function GetAll(var OutPtr: Pointer): LongWord; virtual; abstract;
-
     procedure Free(); virtual; abstract;
 
     property Format: TSoundFormat read FFormat;
     property Streaming: Boolean read FStreaming;
-    property Looping: Boolean read FLooping write FLooping;
   end;
 
   TSoundLoaderFactory = class
+  public
     function MatchHeader(Data: Pointer; Len: LongWord): Boolean; virtual; abstract;
     function MatchExtension(FName: string): Boolean; virtual; abstract;
     function GetLoader(): TSoundLoader; virtual; abstract;