Changeset 70

Timestamp:

Jan 11, 2023, 1:15:24 AM (2 years ago)

Author:

chronos

Message:

• Modified: Play sounds directly with play commands on Linux.

Location:

trunk

Files:

• AsyncProcess2.pas (added)
• Languages/Tunneler.cs.po (modified) (1 diff)
• Languages/Tunneler.pot (modified) (1 diff)
• UEngine.pas (modified) (4 diffs)
• USound.pas (added)
• tunneler.lpi (modified) (2 diffs)
• tunneler.lpr (modified) (1 diff)

trunk/Languages/Tunneler.cs.po

@@ -284 +284 @@
 msgid "%0:s of %1:s"
 msgstr "%0:s z %1:s"
+
+#: usound.splaynotsupported
+#, object-pascal-format
+msgid "The play command %s does not work on your system"
+msgstr ""
+
+#: usound.sunabletoplay
+msgid "Unable to play "
+msgstr ""
+

trunk/Languages/Tunneler.pot

@@ -247 +247 @@
 msgstr ""
 
+#: usound.splaynotsupported
+#, object-pascal-format
+msgid "The play command %s does not work on your system"
+msgstr ""
+
+#: usound.sunabletoplay
+msgid "Unable to play "
+msgstr ""
+

trunk/UEngine.pas

@@ -7 +7 @@
   IntfGraphics, FPImage, LCLType, SpecializedBitmap, GraphType, Math, URectangle,
   Syncobjs, UThreading, Forms, DateUtils, UAudioSystem, Generics.Collections,
-  UWorld, UMatter;
+  UWorld, UMatter, USound;
 
 const
@@ -243 +243 @@
     CurrentRound: Integer;
     MaxRound: Integer;
-    AudioShot: TMediaPlayer;
-    AudioExplode: TMediaPlayer;
+    AudioShot: TSound;
+    AudioExplode: TSound;
     DrawDuration: TDatetime;
     constructor Create(AOwner: TComponent); override;
@@ -645 +645 @@
     Engine.Redraw;
   end;
-  if Shield <= 0 then begin
+  if (Shield <= 0) and not Exploded then begin
     Shield := 0;
     Explosion(Position, ExplosionRange);
@@ -1817 +1817 @@
   World := TWorld.Create;
   //DefaultAudioSystem := TAudioSystemMPlayer.Create(nil);
-  AudioShot := TMediaPlayer.Create(nil);
-  AudioShot.FileName := 'Audio/GE_KF7_Soviet.wav';
-  AudioShot.Open;
-  AudioExplode := TMediaPlayer.Create(nil);
-  AudioExplode.FileName := 'Audio/bomb.wav';
-  AudioExplode.Open;
+  AudioShot := TSound.Create(nil);
+  AudioShot.FileName := GetCurrentDir + '/Audio/GE_KF7_Soviet.wav';
+  AudioExplode := TSound.Create(nil);
+  AudioExplode.FileName := GetCurrentDir + '/Audio/bomb.wav';
   InitPlayerPool;
   DigMasks := TObjectList<TMatrixByte>.Create;

trunk/tunneler.lpi

@@ -101 +101 @@
       </Item5>
     </RequiredPackages>
-    <Units Count="13">
+    <Units Count="15">
       <Unit0>
         <Filename Value="tunneler.lpr"/>
@@ -172 +172 @@
         <IsPartOfProject Value="True"/>
       </Unit12>
+      <Unit13>
+        <Filename Value="USound.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit13>
+      <Unit14>
+        <Filename Value="AsyncProcess2.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit14>
     </Units>
   </ProjectOptions>

trunk/tunneler.lpr

@@ -9 +9 @@
   Interfaces, // this includes the LCL widgetset
   Forms, TemplateGenerics, UPlatform, FileUtil, SysUtils, Common, UFormNewGame,
-  UFormMain, UFormMap, UFormGameResult, UCore, UWorld, UMatter, UFastPixel
+  UFormMain, UFormMap, UFormGameResult, UCore, UWorld, UMatter, UFastPixel,
+  USound, AsyncProcess2
   { you can add units after this };