Changeset 173 for trunk

Timestamp:

Jun 16, 2019, 10:57:17 AM (5 years ago)

Author:

chronos

Message:

• Added: Sound support for Linux. By default it should execute asynchronously 'play' command for playing mp3 files.

Location:

trunk

Files:

• Install/deb/debian/control (modified) (1 diff)
• LocalPlayer/CityScreen.pas (modified) (1 diff)
• LocalPlayer/MessgEx.pas (modified) (1 diff)
• LocalPlayer/Term.pas (modified) (1 diff)
• Messg.pas (modified) (1 diff)
• Packages/CevoComponents/ScreenTools.pas (modified) (8 diffs)
• Packages/CevoComponents/Sound.pas (modified) (14 diffs)

trunk/Install/deb/debian/control

@@ -8 +8 @@
 Package: c-evo
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, sox, libsox-fmt-mp3
 Description: Empire building game
 HomePage: https://app.zdechov.net/c-evo

trunk/LocalPlayer/CityScreen.pas

@@ -90 +90 @@
 
 uses
-  Select, Messg, MessgEx, Help, Tribes, Directories, Math, PixelPointer;
+  Select, Messg, MessgEx, Help, Tribes, Directories, Math, PixelPointer, Sound;
 
 {$R *.lfm}

trunk/LocalPlayer/MessgEx.pas

@@ -74 +74 @@
 uses
   ClientTools, BaseWin, Term, Help, UnitStat, Tribes, PixelPointer,
-  IsoEngine, Diagram;
+  IsoEngine, Diagram, Sound;
 
 {$R *.lfm}

trunk/LocalPlayer/Term.pas

@@ -459 +459 @@
 procedure HelpOnTerrain(Loc, NewMode: integer);
 
+
 implementation
 
 uses
   Directories, IsoEngine, CityScreen, Draft, MessgEx, Select, CityType, Help,
-  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, PixelPointer,
+  UnitStat, Log, Diagram, NatStat, Wonders, Enhance, Nego, PixelPointer, Sound,
   Battle, Rates, TechTree, Registry;
 

trunk/Messg.pas

@@ -42 +42 @@
 
 implementation
+
+uses
+  Sound;
 
 {$R *.lfm}

trunk/Packages/CevoComponents/ScreenTools.pas

@@ -21 +21 @@
 {$ENDIF}
 procedure RestoreResolution;
-function Play(Item: string; Index: integer = -1): boolean;
-procedure PreparePlay(Item: string; Index: integer = -1);
 procedure EmptyMenu(MenuItems: TMenuItem; Keep: Integer = 0);
 function TurnToYear(Turn: integer): integer;
@@ -121 +119 @@
   hOrna = 26; // ornament
 
-  // sound modes
-  smOff = 0;
-  smOn = 1;
-  smOnAlt = 2;
-
   // color matrix
   clkAge0 = 1;
@@ -173 +166 @@
 
 var
-  Phrases, Phrases2, Sounds: TStringTable;
-  nGrExt: integer;
+  Phrases: TStringTable;
+  Phrases2: TStringTable;
+  nGrExt: Integer;
   GrExt: array [0 .. nGrExtmax - 1] of ^TGrExtDescr;
-  HGrSystem, HGrSystem2, ClickFrameColor, SoundMode, MainTextureAge: integer;
+  HGrSystem, HGrSystem2, ClickFrameColor, MainTextureAge: Integer;
   MainTexture: TTexture;
   Templates, Colors, Paper, BigImp, LogoBuffer: TBitmap;
@@ -227 +221 @@
   ResolutionChanged := False;
   {$ENDIF}
-end;
-
-function Play(Item: string; Index: integer = -1): boolean;
-{$IFNDEF DEBUG}
-var
-  WavFileName: string;
-{$ENDIF}
-begin
-  Result := False;
-{$IFNDEF DEBUG}
-  if (Sounds = nil) or (SoundMode = smOff) or (Item = '') then
-  begin
-    Result := True;
-    Exit;
-  end;
-  WavFileName := Sounds.Lookup(Item, Index);
-  Assert(WavFileName[1] <> '[');
-  Result := (WavFileName <> '') and (WavFileName[1] <> '[') and (WavFileName <> '*');
-  if Result then
-    // SndPlaySound(pchar(HomeDir+'Sounds' +DirectorySeparator+WavFileName+'.wav'),SND_ASYNC)
-    PlaySound(HomeDir + 'Sounds' + DirectorySeparator + WavFileName);
-{$ENDIF}
-end;
-
-procedure PreparePlay(Item: string; Index: Integer = -1);
-{$IFNDEF DEBUG}
-var
-  WavFileName: string;
-{$ENDIF}
-begin
-{$IFNDEF DEBUG}
-  if (Sounds = nil) or (SoundMode = smOff) or (Item = '') then
-    Exit;
-  WavFileName := Sounds.Lookup(Item, Index);
-  Assert(WavFileName[1] <> '[');
-  if (WavFileName <> '') and (WavFileName[1] <> '[') and (WavFileName <> '*') then
-    PrepareSound(HomeDir + 'Sounds' + DirectorySeparator + WavFileName);
-{$ENDIF}
 end;
 
@@ -1403 +1359 @@
 procedure LoadPhrases;
 begin
-  if Phrases = nil then
-    Phrases := TStringTable.Create;
-  if Phrases2 = nil then
-    Phrases2 := TStringTable.Create;
+  if Phrases = nil then Phrases := TStringTable.Create;
+  if Phrases2 = nil then Phrases2 := TStringTable.Create;
   Phrases2FallenBackToEnglish := False;
   if FileExists(LocalizedFilePath('Language.txt')) then
   begin
-    Phrases.loadfromfile(LocalizedFilePath('Language.txt'));
+    Phrases.LoadFromFile(LocalizedFilePath('Language.txt'));
     if FileExists(LocalizedFilePath('Language2.txt')) then
-      Phrases2.loadfromfile(LocalizedFilePath('Language2.txt'))
+      Phrases2.LoadFromFile(LocalizedFilePath('Language2.txt'))
     else
     begin
-      Phrases2.loadfromfile(HomeDir + 'Language2.txt');
+      Phrases2.LoadFromFile(HomeDir + 'Language2.txt');
       Phrases2FallenBackToEnglish := True;
     end;
@@ -1421 +1375 @@
   else
   begin
-    Phrases.loadfromfile(HomeDir + 'Language.txt');
-    Phrases2.loadfromfile(HomeDir + 'Language2.txt');
-  end;
-
-  if Sounds = nil then
-    Sounds := TStringTable.Create;
-  if not Sounds.loadfromfile(HomeDir + 'Sounds' + DirectorySeparator + 'sound.txt') then
+    Phrases.LoadFromFile(HomeDir + 'Language.txt');
+    Phrases2.LoadFromFile(HomeDir + 'Language2.txt');
+  end;
+
+  if Sounds = nil then Sounds := TStringTable.Create;
+  if not Sounds.LoadFromFile(HomeDir + 'Sounds' + DirectorySeparator + 'sound.txt') then
   begin
     FreeAndNil(Sounds);
@@ -1454 +1407 @@
         if s[1] = '#' then begin
           s := TrimRight(s);
-          if s = '#SMALL' then
-            Section := ftSmall
-          else if s = '#TINY' then
-            Section := ftTiny
-          else if s = '#CAPTION' then
-            Section := ftCaption
-          else if s = '#BUTTON' then
-            Section := ftButton
-          else
-            Section := ftNormal;
+          if s = '#SMALL' then Section := ftSmall
+          else if s = '#TINY' then Section := ftTiny
+          else if s = '#CAPTION' then Section := ftCaption
+          else if s = '#BUTTON' then Section := ftButton
+          else Section := ftNormal;
         end else begin
           p := Pos(',', s);
@@ -1599 +1547 @@
   FreeAndNil(Phrases);
   FreeAndNil(Phrases2);
-  if Sounds <> nil then
-    FreeAndNil(Sounds);
   FreeAndNil(LogoBuffer);
   FreeAndNil(BigImp);

trunk/Packages/CevoComponents/Sound.pas

@@ -4 +4 @@
 
 uses
-  Messages, SysUtils, Classes, Graphics, Controls, Forms, fgl
-  {$IFDEF WINDOWS}, MMSystem, Windows{$ENDIF};
+  Messages, SysUtils, Classes, Graphics, Controls, Forms, fgl, FileUtil,
+  StringTables, Directories
+  {$IFDEF WINDOWS}, MMSystem, Windows{$ENDIF}
+  {$IFDEF LINUX}, Process, AsyncProcess{$ENDIF};
 
 type
+  TPlayStyle = (psAsync, psSync);
+
   TSoundPlayer = class(TForm)
   private
@@ -15 +19 @@
   end;
 
-function PrepareSound(FileName: string): integer;
-procedure PlaySound(FileName: string);
-
-implementation
-
-{$R *.lfm}
-
-type
+  { TSound }
+
   TSound = class
+  private
+    PlayCommand: string;
+    {$IFDEF LINUX}
+    SoundPlayerAsyncProcess: TAsyncProcess;
+    SoundPlayerSyncProcess: TProcess;
+    {$ENDIF}
+    function GetNonWindowsPlayCommand: string;
   public
-    FDeviceID: word;
+    FDeviceID: Word;
     FFileName: string;
+    PlayStyle: TPlayStyle;
     constructor Create(const FileName: string);
     destructor Destroy; override;
@@ -34 +40 @@
   end;
 
+function PrepareSound(FileName: string): Integer;
+procedure PlaySound(FileName: string);
+function Play(Item: string; Index: Integer = -1): Boolean;
+procedure PreparePlay(Item: string; Index: Integer = -1);
+
+const
+  // sound modes
+  smOff = 0;
+  smOn = 1;
+  smOnAlt = 2;
+
+var
+  Sounds: TStringTable;
+  SoundMode: Integer;
+  SoundPlayer: TSoundPlayer;
+  SoundList: TFPGObjectList<TSound>;
+  PlayingSound: TSound;
+
+
+implementation
+
+{$R *.lfm}
+
+resourcestring
+  SUnableToPlay = 'PlayStyle=%s: Unable to play %s Message:%s';
+  SPlayCommandNotWork = 'The play command %s does not work on your system';
 
 constructor TSound.Create(const FileName: string);
@@ -41 +73 @@
 {$ENDIF}
 begin
+  PlayStyle := psAsync;
+  FFileName := FileName;
   {$IFDEF WINDOWS}
   FDeviceID := 0;
-  FFileName := FileName;
-  if FileExists(FFileName) then
-  begin
+  if FileExists(FFileName) then begin
     OpenParm.dwCallback := 0;
     OpenParm.lpstrDeviceType := 'WaveAudio';
@@ -54 +86 @@
   end
   {$ENDIF}
+  {$IFDEF LINUX}
+  PlayCommand := GetNonWindowsPlayCommand;
+  FDeviceID := 1;
+  {$ENDIF}
 end;
 
@@ -62 +98 @@
     mciSendCommand(FDeviceID, MCI_CLOSE, MCI_WAIT, 0);
   {$ENDIF}
+  {$IFDEF LINUX}
+  {$IFNDEF WINDOWS}
+  FreeAndNil(SoundPlayerSyncProcess);
+  FreeAndNil(SoundPlayerAsyncProcess);
+  {$ENDIF}
+  {$ENDIF}
   inherited Destroy;
 end;
+
+function TSound.GetNonWindowsPlayCommand: string;
+begin
+  Result := '';
+  // Try play
+  if (FindDefaultExecutablePath('play') <> '') then
+    Result := 'play';
+  // Try aplay
+  if (result = '') then
+    if (FindDefaultExecutablePath('aplay') <> '') then
+      Result := 'aplay -q';
+  // Try paplay
+  if (Result = '') then
+    if (FindDefaultExecutablePath('paplay') <> '') then
+      Result := 'paplay';
+  // Try mplayer
+  if (Result = '') then
+    if (FindDefaultExecutablePath('mplayer') <> '') then
+      Result := 'mplayer -really-quiet';
+  // Try CMus
+  if (Result = '') then
+    if (FindDefaultExecutablePath('CMus') <> '') then
+      Result := 'CMus';
+  // Try pacat
+  if (Result = '') then
+    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';
+  // Try canberra-gtk-play
+  if (Result = '') then
+    if (FindDefaultExecutablePath('canberra-gtk-play') <> '') then
+      Result := 'canberra-gtk-play -c never -f';
+  // Try Macintosh command?
+  if (Result = '') then
+    if (FindDefaultExecutablePath('afplay') <> '') then
+      Result := 'afplay';
+end;
+
 
 procedure TSound.Play(HWND: DWORD);
@@ -69 +156 @@
 var
   PlayParm: TMCI_Play_Parms;
+{$ENDIF}
+{$IFDEF LINUX}
+var
+  L: TStringList;
+  I: Integer;
 {$ENDIF}
 begin
@@ -78 +170 @@
   end
   {$ENDIF}
+  {$IFDEF LINUX}
+  // How to play in Linux? Use generic Linux commands
+  // Use asyncprocess to play sound as SND_ASYNC
+  // proceed if we managed to find a valid command
+  if PlayCommand <> '' then begin
+    L := TStringList.Create;
+    try
+      L.Delimiter := ' ';
+      L.DelimitedText := PlayCommand;
+      if PlayStyle = psASync then begin
+        if SoundPlayerAsyncProcess = nil then
+          SoundPlayerAsyncProcess := TAsyncProcess.Create(nil);
+        SoundPlayerAsyncProcess.CurrentDirectory := ExtractFileDir(FFilename);
+        SoundPlayerAsyncProcess.Executable := FindDefaultExecutablePath(L[0]);
+        SoundPlayerAsyncProcess.Parameters.Clear;
+        for I := 1 to L.Count - 1 do
+          SoundPlayerAsyncProcess.Parameters.Add(L[I]);
+        SoundPlayerAsyncProcess.Parameters.Add(FFilename);
+        try
+          SoundPlayerAsyncProcess.Execute;
+        except
+          On E: Exception do
+            E.CreateFmt(SUnableToPlay, ['paASync', FFilename, E.Message]);
+        end;
+        PlayingSound := nil;
+      end else begin
+        if SoundPlayerSyncProcess = nil then
+          SoundPlayerSyncProcess := TProcess.Create(nil);
+        SoundPlayerSyncProcess.CurrentDirectory := ExtractFileDir(FFilename);
+        SoundPlayerSyncProcess.Executable := FindDefaultExecutablePath(L[0]);
+        SoundPlayersyncProcess.Parameters.Clear;
+        for I := 1 to L.Count - 1 do
+          SoundPlayerSyncProcess.Parameters.Add(L[I]);
+        SoundPlayerSyncProcess.Parameters.Add(FFilename);
+        try
+          SoundPlayerSyncProcess.Execute;
+          SoundPlayersyncProcess.WaitOnExit;
+        except
+          On E: Exception do
+            E.CreateFmt(SUnableToPlay, ['paSync', FFilename, E.Message]);
+        end;
+        PlayingSound := nil;
+      end;
+    finally
+      L.Free;
+    end;
+  end
+  else
+    raise Exception.CreateFmt(SPlayCommandNotWork, [PlayCommand]);
+  {$ENDIF}
 end;
 
@@ -85 +227 @@
   mciSendCommand(FDeviceID, MCI_STOP, 0, 0);
   {$ENDIF}
+  {$IFDEF LINUX}
+  if SoundPlayerSyncProcess <> nil then SoundPlayerSyncProcess.Terminate(1);
+  if SoundPlayerAsyncProcess <> nil then SoundPlayerAsyncProcess.Terminate(1);
+  {$ENDIF}
 end;
 
@@ -93 +239 @@
   {$ENDIF}
 end;
-
-
-var
-  SoundPlayer: TSoundPlayer;
-  SoundList: TFPGObjectList<TSound>;
-  PlayingSound: TSound;
 
 {$IFDEF WINDOWS}
@@ -111 +251 @@
 {$ENDIF}
 
-function PrepareSound(FileName: string): integer;
+function PrepareSound(FileName: string): Integer;
 begin
   Result := 0;
-  while (result < SoundList.Count) and (SoundList[result].FFileName <> FileName) do
-    inc(result);
-  if result = SoundList.Count then begin
-    // first time this sound is played
+  while (Result < SoundList.Count) and (SoundList[result].FFileName <> FileName) do
+    Inc(Result);
+  if Result = SoundList.Count then begin
+    // First time this sound is played
     SoundList.Add(TSound.Create(FileName));
     Result := SoundList.Count - 1;
@@ -125 +265 @@
 procedure PlaySound(FileName: string);
 begin
-  if PlayingSound <> nil then
-    exit;
+  if PlayingSound <> nil then Exit;
   if SoundPlayer = nil then
     Application.CreateForm(TSoundPlayer, SoundPlayer);
@@ -136 +275 @@
 end;
 
+function Play(Item: string; Index: Integer = -1): Boolean;
+{$IFNDEF DEBUG}
+var
+  WavFileName: string;
+{$ENDIF}
+begin
+  Result := False;
+{$IFNDEF DEBUG}
+  if (Sounds = nil) or (SoundMode = smOff) or (Item = '') then
+  begin
+    Result := True;
+    Exit;
+  end;
+  WavFileName := Sounds.Lookup(Item, Index);
+  Assert(WavFileName[1] <> '[');
+  Result := (WavFileName <> '') and (WavFileName[1] <> '[') and (WavFileName <> '*');
+  if Result then
+    // SndPlaySound(pchar(HomeDir+'Sounds' +DirectorySeparator+WavFileName+'.wav'),SND_ASYNC)
+    PlaySound(HomeDir + 'Sounds' + DirectorySeparator + WavFileName);
+{$ENDIF}
+end;
+
+procedure PreparePlay(Item: string; Index: Integer = -1);
+{$IFNDEF DEBUG}
+var
+  WavFileName: string;
+{$ENDIF}
+begin
+{$IFNDEF DEBUG}
+  if (Sounds = nil) or (SoundMode = smOff) or (Item = '') then
+    Exit;
+  WavFileName := Sounds.Lookup(Item, Index);
+  Assert(WavFileName[1] <> '[');
+  if (WavFileName <> '') and (WavFileName[1] <> '[') and (WavFileName <> '*') then
+    PrepareSound(HomeDir + 'Sounds' + DirectorySeparator + WavFileName);
+{$ENDIF}
+end;
+
 procedure UnitInit;
 begin
@@ -150 +327 @@
   end;
   FreeAndNil(SoundList);
+  if Sounds <> nil then
+    FreeAndNil(Sounds);
 end;