Changeset 173 for trunk/Packages/CevoComponents/ScreenTools.pas

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.

File:

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

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