Changeset 664

Timestamp:

Jul 8, 2025, 9:52:53 PM (6 hours ago)

Author:

chronos

Message:

• Added: Ability to play music in background in start screen and in-game. Used uos as audio library.

Location:

trunk

Files:

• Direct.pas (modified) (2 diffs)
• Integrated.lpi (modified) (3 diffs)
• Integrated.lpr (modified) (1 diff)
• Music (added)
• Music.pas (added)
• Music/Beek & P5 - Propeller.it (added)
• Music/Nemesis - Legendary.s3m (added)
• Music/Nightbeat - Astral dreams.it (added)
• Music/Nightbeat - Bye For Now.s3m (added)
• Music/Nightbeat - Dreamstone.it (added)
• Music/Nightbeat - Flight of the Kingfisher.it (added)
• Music/Nightbeat - Motion.it (added)
• Music/Nightbeat - Seasons' passing.it (added)
• Music/Nightbeat - Tales of magic.it (added)
• Music/Nightbeat - The Steadfast.it (added)
• Music/Nightbeat - Wake.it (added)
• Music/Nightbeat - Waylands.it (added)
• Music/Skaven & Future Crew - Deep in her eyes - remake.it (added)
• Music/Start (added)
• Music/Start/Nightbeat - Approach.it (added)
• Music/Zaril & Xerxes & Hellven, Level-D - Vinter.xm (added)
• Packages/CevoComponents/CevoComponents.lpk (modified) (1 diff)
• Packages/CevoComponents/Directories.pas (modified) (2 diffs)
• Packages/uos (added)
• Packages/uos/laz_uos.lpk (added)
• Packages/uos/laz_uos.pas (added)
• Packages/uos/uos.pas (added)
• Packages/uos/uos_aac.pas (added)
• Packages/uos/uos_bs2b.pas (added)
• Packages/uos/uos_cdrom.pas (added)
• Packages/uos/uos_define.inc (added)
• Packages/uos/uos_dsp_noiseremoval.pas (added)
• Packages/uos/uos_dsp_utils.pas (added)
• Packages/uos/uos_fdkaacdecoder.pas (added)
• Packages/uos/uos_flat.pas (added)
• Packages/uos/uos_httpgetthread.pas (added)
• Packages/uos/uos_jni.pas (added)
• Packages/uos/uos_libsndfile.pas (added)
• Packages/uos/uos_libxmp.pas (added)
• Packages/uos/uos_mpg123.pas (added)
• Packages/uos/uos_opus.pas (added)
• Packages/uos/uos_opusfile.pas (added)
• Packages/uos/uos_opusurl.pas (added)
• Packages/uos/uos_portaudio.pas (added)
• Packages/uos/uos_shout.pas (added)
• Packages/uos/uos_soundtouch.pas (added)
• Start.pas (modified) (2 diffs)

trunk/Direct.pas

@@ -46 +46 @@
 uses
   ScreenTools, Protocol, Start, LocalPlayer, NoTerm, Back, Global, NetworkServer,
-  NetworkClient;
+  NetworkClient, Music, Directories;
 
 {$R *.lfm}
@@ -130 +130 @@
     *)
       end;
-    ntStartDone:
+    ntStartDone: begin
       if not Quick then begin
         StartDlg.Hide;
         Background.Update;
       end;
+      MusicPlayer.LoadPlaylistFromDir(GetMusicDir);
+      MusicPlayer.RandomizePlaylist;
+      if MusicPlayer.Playlist.Count > 0 then MusicPlayer.Play;
+    end;
     ntStartGo, ntStartGoRefresh, ntStartGoRefreshMaps:
       if Quick then Close

trunk/Integrated.lpi

@@ -79 +79 @@
       </Item2>
       <SharedMatrixOptions Count="2">
-        <Item1 ID="151739052537" Targets="CevoComponents,Common,DpiControls" Modes="Debug" Value="-g -gl -gh -CirotR -O1 -dDPI"/>
-        <Item2 ID="186701832267" Targets="CevoComponents,Common,DpiControls" Modes="Release" Value="-CX -XX -O3 -dDPI"/>
+        <Item1 ID="151739052537" Targets="CevoComponents,Common,DpiControls,laz_uos" Modes="Debug" Value="-g -gl -gh -CirotR -O1 -dDPI"/>
+        <Item2 ID="186701832267" Targets="CevoComponents,Common,DpiControls,laz_uos" Modes="Release" Value="-CX -XX -O3 -dDPI"/>
       </SharedMatrixOptions>
     </BuildModes>
@@ -92 +92 @@
       </Modes>
     </RunParams>
-    <RequiredPackages Count="4">
+    <RequiredPackages Count="5">
       <Item1>
+        <PackageName Value="laz_uos"/>
+        <DefaultFilename Value="Packages\uos\laz_uos.lpk" Prefer="True"/>
+      </Item1>
+      <Item2>
         <PackageName Value="DpiControls"/>
         <DefaultFilename Value="Packages\DpiControls\DpiControls.lpk" Prefer="True"/>
-      </Item1>
-      <Item2>
+      </Item2>
+      <Item3>
         <PackageName Value="Common"/>
         <DefaultFilename Value="Packages\Common\Common.lpk" Prefer="True"/>
-      </Item2>
-      <Item3>
+      </Item3>
+      <Item4>
         <PackageName Value="CevoComponents"/>
         <DefaultFilename Value="Packages\CevoComponents\CevoComponents.lpk" Prefer="True"/>
-      </Item3>
-      <Item4>
+      </Item4>
+      <Item5>
         <PackageName Value="LCL"/>
-      </Item4>
+      </Item5>
     </RequiredPackages>
-    <Units Count="48">
+    <Units Count="49">
       <Unit0>
         <Filename Value="Integrated.lpr"/>
@@ -374 +378 @@
         <IsPartOfProject Value="True"/>
       </Unit47>
+      <Unit48>
+        <Filename Value="Music.pas"/>
+        <IsPartOfProject Value="True"/>
+      </Unit48>
     </Units>
   </ProjectOptions>

trunk/Integrated.lpr

@@ -26 +26 @@
 
   DotNetClient := nil;
+  Randomize;
   Application.Initialize;
   Application.Title := CevoTitle;

trunk/Packages/CevoComponents/CevoComponents.lpk

@@ -123 +123 @@
     </Files>
     <CompatibilityMode Value="True"/>
-    <RequiredPkgs Count="4">
+    <RequiredPkgs Count="5">
       <Item1>
-        <PackageName Value="DpiControls"/>
+        <PackageName Value="laz_uos"/>
       </Item1>
       <Item2>
-        <PackageName Value="Common"/>
+        <PackageName Value="DpiControls"/>
       </Item2>
       <Item3>
-        <PackageName Value="LCL"/>
+        <PackageName Value="Common"/>
       </Item3>
       <Item4>
+        <PackageName Value="LCL"/>
+      </Item4>
+      <Item5>
         <PackageName Value="FCL"/>
-      </Item4>
+      </Item5>
     </RequiredPkgs>
     <UsageOptions>

trunk/Packages/CevoComponents/Directories.pas

@@ -14 +14 @@
 function GetGraphicsDir: string;
 function GetSoundsDir: string;
+function GetMusicDir: string;
 function GetAiDir: string;
 function GetAppSharePath(Path: string): string;
@@ -154 +155 @@
 end;
 
+function GetMusicDir: string;
+begin
+  Result := GetAppSharePath('Music');
+end;
+
 function GetAiDir: string;
 begin

trunk/Start.pas

@@ -155 +155 @@
 uses
   Global, Directories, Direct, ScreenTools, Inp, Back, Settings, KeyBindings,
-  Languages;
+  Languages, Music;
 
 {$R *.lfm}
@@ -942 +942 @@
   ChangeTab(ShowTab);
   Background.Enabled := False;
+
+  MusicPlayer.LoadPlaylistFromDir(GetMusicDir + DirectorySeparator + 'Start');
+  MusicPlayer.RandomizePlaylist;
+  if MusicPlayer.Playlist.Count > 0 then MusicPlayer.Play;
 end;