Changeset 463 for branches/highdpi/Packages/CevoComponents/Sound.pas

Timestamp:

Nov 29, 2023, 2:35:44 PM (12 months ago)

Author:

chronos

Message:

• Modified: HighDpi branch updated to trunk version.

File:

• branches/highdpi/Packages/CevoComponents/Sound.pas (modified) (11 diffs)

branches/highdpi/Packages/CevoComponents/Sound.pas

@@ -4 +4 @@
 
 uses
-  UDpiControls, SysUtils, Classes, Graphics, Controls, Forms, fgl, FileUtil,
+  UDpiControls, SysUtils, Classes, Graphics, Controls, Forms, Generics.Collections, FileUtil,
   StringTables, Directories, LCLType
   {$IFDEF WINDOWS}, MMSystem, Windows{$ENDIF}
-  {$IFDEF LINUX}, Process, AsyncProcess2{$ENDIF};
+  {$IFDEF UNIX}, Process, AsyncProcess2{$ENDIF};
 
 type
@@ -29 +29 @@
   TSound = class
   private
-    {$IFDEF LINUX}
+    {$IFDEF UNIX}
     PlayCommand: string;
     SoundPlayerAsyncProcess: TAsyncProcess;
@@ -55 +55 @@
   SoundMode: TSoundMode;
   SoundPlayer: TSoundPlayer;
-  SoundList: TFPGObjectList<TSound>;
+  SoundList: TObjectList<TSound>;
   PlayingSound: TSound;
 
@@ -63 +63 @@
 {$R *.lfm}
 
-{$IFDEF LINUX}
+{$IFDEF UNIX}
 resourcestring
   SUnableToPlay = 'PlayStyle=%s: Unable to play %s Message:%s';
@@ -88 +88 @@
   end
   {$ENDIF}
-  {$IFDEF LINUX}
+  {$IFDEF UNIX}
   PlayCommand := GetNonWindowsPlayCommand;
   FDeviceID := 1;
@@ -100 +100 @@
     mciSendCommand(FDeviceID, MCI_CLOSE, MCI_WAIT, 0);
   {$ENDIF}
-  {$IFDEF LINUX}
+  {$IFDEF UNIX}
   FreeAndNil(SoundPlayerSyncProcess);
   FreeAndNil(SoundPlayerAsyncProcess);
@@ -162 +162 @@
   PlayParm: TMCI_Play_Parms;
 {$ENDIF}
-{$IFDEF LINUX}
+{$IFDEF UNIX}
 var
   L: TStringList;
@@ -175 +175 @@
   end
   {$ENDIF}
-  {$IFDEF LINUX}
+  {$IFDEF UNIX}
   // How to play in Linux? Use generic Linux commands
   // Use asyncprocess to play sound as SND_ASYNC
@@ -232 +232 @@
   mciSendCommand(FDeviceID, MCI_STOP, 0, 0);
   {$ENDIF}
-  {$IFDEF LINUX}
+  {$IFDEF UNIX}
   if SoundPlayerSyncProcess <> nil then SoundPlayerSyncProcess.Terminate(1);
   if SoundPlayerAsyncProcess <> nil then SoundPlayerAsyncProcess.Terminate(1);
@@ -280 +280 @@
 begin
   Result := 0;
-  while (Result < SoundList.Count) and (SoundList[result].FFileName <> FileName) do
+  while (Result < SoundList.Count) and (SoundList[Result].FFileName <> FileName) do
     Inc(Result);
   if Result = SoundList.Count then begin
@@ -333 +333 @@
 procedure UnitInit;
 begin
-  SoundList := TFPGObjectList<TSound>.Create;
+  SoundList := TObjectList<TSound>.Create;
   PlayingSound := nil;
   SoundPlayer := nil;