Changeset 423 for trunk/Packages/CevoComponents/Sound.pas

Timestamp:

Apr 25, 2022, 6:01:01 PM (3 years ago)

Author:

chronos

Message:

• Modified: Do not use explicit mode delphi directive as it is already set in project.
• Modified: Use UNIX instead of LINUX for conditional code to work also on FreeBSD.

File:

• trunk/Packages/CevoComponents/Sound.pas (modified) (8 diffs)

trunk/Packages/CevoComponents/Sound.pas

@@ -7 +7 @@
   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;
@@ -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);