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

Timestamp:

Mar 9, 2021, 9:19:49 AM (4 years ago)

Author:

chronos

Message:

• Modified: Synced code with current trunk version.

File:

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

branches/highdpi/Packages/CevoComponents/Sound.pas

@@ -5 +5 @@
 uses
   UDpiControls, SysUtils, Classes, Graphics, Controls, Forms, fgl, FileUtil,
-  StringTables, Directories
+  StringTables, Directories, LCLType
   {$IFDEF WINDOWS}, MMSystem, Windows{$ENDIF}
-  {$IFDEF LINUX}, Process, AsyncProcess{$ENDIF};
+  {$IFDEF LINUX}, Process, AsyncProcess2{$ENDIF};
 
 type
@@ -40 +40 @@
     constructor Create(const FileName: string);
     destructor Destroy; override;
-    procedure Play(HWND: DWORD);
+    procedure Play(Handle: HWND);
     procedure Stop;
     procedure Reset;
@@ -68 +68 @@
 {$R *.lfm}
 
+{$IFDEF LINUX}
 resourcestring
   SUnableToPlay = 'PlayStyle=%s: Unable to play %s Message:%s';
   SPlayCommandNotWork = 'The play command %s does not work on your system';
+{$ENDIF}
 
 constructor TSound.Create(const FileName: string);
@@ -113 +115 @@
 begin
   Result := '';
+  // Try ffplay
+  if (Result = '') then
+    if (FindDefaultExecutablePath('ffplay') <> '') then
+      Result := 'ffplay -autoexit -nodisp -loglevel quiet';
   // Try play
-  if (FindDefaultExecutablePath('play') <> '') then
-    Result := 'play';
+  if (Result = '') then
+    if (FindDefaultExecutablePath('play') <> '') then
+      Result := 'play -q';
   // Try aplay
-  if (result = '') then
+  if (Result = '') then
     if (FindDefaultExecutablePath('aplay') <> '') then
       Result := 'aplay -q';
@@ -136 +143 @@
     if (FindDefaultExecutablePath('pacat') <> '') then
       Result := 'pacat -p';
-  // Try ffplay
-  if (Result = '') then
-    if (FindDefaultExecutablePath('ffplay') <> '') then
-      result := 'ffplay -autoexit -nodisp';
   // Try cvlc
   if (Result = '') then
     if (FindDefaultExecutablePath('cvlc') <> '') then
-      result := 'cvlc -q --play-and-exit';
+      Result := 'cvlc -q --play-and-exit';
   // Try canberra-gtk-play
   if (Result = '') then
@@ -155 +158 @@
 
 
-procedure TSound.Play(HWND: DWORD);
+procedure TSound.Play(Handle: HWND);
 {$IFDEF WINDOWS}
 var
@@ -169 +172 @@
   if FDeviceID <> 0 then
   begin
-    PlayParm.dwCallback := HWND;
+    PlayParm.dwCallback := Handle;
     mciSendCommand(FDeviceID, MCI_PLAY, MCI_NOTIFY, DWORD_PTR(@PlayParm));
   end
@@ -217 +220 @@
       end;
     finally
-      L.Free;
+      FreeAndNil(L);
     end;
   end