Changeset 666 for trunk/Music.pas

Timestamp:

Jul 9, 2025, 10:36:23 PM (17 hours ago)

Author:

chronos

Message:

• Added: Music volume option in game settings form.

File:

• trunk/Music.pas (modified) (8 diffs)

trunk/Music.pas

@@ -12 +12 @@
   TMusicPlayer = class
   private
+    FVolume: Single;
     PlayerIndex1: Integer;
     InputIndex1: Integer;
@@ -18 +19 @@
     InputLength: Integer;
     AutoPlayNext: Boolean;
+    function GetPlaying: Boolean;
     procedure Initialize;
     procedure EndPlay(PlayerIndex: cint32);
     function GetNextPlaylistItem: string;
     procedure PlayNext(Data: PtrInt);
+    procedure SetVolume(AValue: Single);
   public
     Playlist: TStringList;
@@ -30 +33 @@
     procedure Play;
     procedure Stop;
+    property Playing: Boolean read GetPlaying;
+    property Volume: Single read FVolume write SetVolume;
   end;
 
@@ -78 +83 @@
 end;
 
+function TMusicPlayer.GetPlaying: Boolean;
+begin
+  Result := PlayerIndex1 >= 0;
+end;
+
 procedure TMusicPlayer.EndPlay(PlayerIndex: cint32);
 begin
-  if AutoPlayNext and (PlayerIndex = PlayerIndex1) then Application.QueueAsyncCall(PlayNext, 0);
+  if AutoPlayNext then begin
+    if PlayerIndex = PlayerIndex1 then Application.QueueAsyncCall(PlayNext, 0);
+  end else PlayerIndex1 := -1;
 end;
 
@@ -95 +107 @@
 end;
 
+procedure TMusicPlayer.SetVolume(AValue: Single);
+begin
+  if FVolume = AValue then Exit;
+  FVolume := AValue;
+  if FVolume > 1 then FVolume := 1;
+  if FVolume < 0 then FVolume := 0;
+  if Playing then
+    uos_InputSetDSPVolume(PlayerIndex1, InputIndex1, Volume, Volume, True);
+end;
+
 constructor TMusicPlayer.Create;
 begin
   Playlist := TStringList.Create;
+  PlayerIndex1 := -1;
+  FVolume := 1;
 end;
 
@@ -154 +178 @@
 
   AutoPlayNext := False;
-  uos_Stop(PlayerIndex1);
+  if PlayerIndex1 >= 0 then uos_Stop(PlayerIndex1);
 
   Inc(PlayerIndex1);
@@ -171 +195 @@
   uos_InputSetPositionEnable(PlayerIndex1, InputIndex1, 1);
   InputLength := uos_InputLength(PlayerIndex1, InputIndex1);
-  uos_InputAddDSPVolume(PlayerIndex1, InputIndex1, 0.5, 0.5);
+  uos_InputAddDSPVolume(PlayerIndex1, InputIndex1, Volume, Volume);
 
   OutputIndex1 := uos_AddIntoDevOut(PlayerIndex1, -1, -1, -1, -1, -1, -1, -1);
@@ -185 +209 @@
 procedure TMusicPlayer.Stop;
 begin
-  Initialize;
   AutoPlayNext := False;
-  uos_Stop(PlayerIndex1);
+  if PlayerIndex1 >= 0 then begin
+    Initialize;
+    uos_Stop(PlayerIndex1);
+  end;
+  PlayerIndex1 := -1;
 end;