Merge pull request #955 from complexlogic/remove_bass_decoder

Remove BASS Audio Decoder
UltraStar-Deluxe · Feb 5, 2025 · 0e9ce45 · 0e9ce45
2 parents be78eb3 + 5960e49
commit 0e9ce45
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 326 deletions.
diff --git a/src/media/UAudioDecoder_Bass.pas b/src/media/UAudioDecoder_Bass.pas
diff --git a/src/switches.inc b/src/switches.inc
@@ -81,7 +81,6 @@
 // audio config
 {$IF Defined(HaveBASS)}
   {$DEFINE UseBASSPlayback}
-  {$DEFINE UseBASSDecoder}
   {$DEFINE UseBASSInput}
 {$ELSEIF Defined(HavePortaudio)}
   {$DEFINE UseSDLPlayback}
@@ -112,7 +111,7 @@
   {$DEFINE UseFFmpeg}
 {$IFEND}
 
-{$IF Defined(UseBASSInput) or Defined(UseBASSPlayback) or Defined(UseBASSDecoder)}
+{$IF Defined(UseBASSInput) or Defined(UseBASSPlayback)}
   {$DEFINE UseBASS}
 {$IFEND}
 

diff --git a/src/ultrastardx-travis.lpi b/src/ultrastardx-travis.lpi
@@ -44,7 +44,7 @@
         <PackageName Value="LazUtils"/>
       </Item1>
     </RequiredPackages>
-    <Units Count="129">
+    <Units Count="128">
       <Unit0>
         <Filename Value="ultrastardx.dpr"/>
         <IsPartOfProject Value="True"/>
@@ -410,7 +410,7 @@
         <IsPartOfProject Value="True"/>
       </Unit90>
       <Unit91>
-        <Filename Value="media\UAudioDecoder_Bass.pas"/>
+        <Filename Value="base\UFilesystem.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit91>
       <Unit92>
@@ -560,10 +560,6 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UUnicodeStringHelper"/>
       </Unit127>
-      <Unit128>
-        <Filename Value="base\UFilesystem.pas"/>
-        <IsPartOfProject Value="True"/>
-      </Unit128>
     </Units>
   </ProjectOptions>
   <CompilerOptions>

diff --git a/src/ultrastardx-unix.lpi b/src/ultrastardx-unix.lpi
@@ -29,7 +29,7 @@
         <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/>
       </local>
     </RunParams>
-    <Units Count="126">
+    <Units Count="125">
       <Unit0>
         <Filename Value="ultrastardx.dpr"/>
         <IsPartOfProject Value="True"/>
@@ -437,8 +437,9 @@
         <IsPartOfProject Value="True"/>
       </Unit99>
       <Unit100>
-        <Filename Value="media/UAudioDecoder_Bass.pas"/>
+        <Filename Value="lua/ULuaUsdx.pas"/>
         <IsPartOfProject Value="True"/>
+        <UnitName Value="ULuaUsdx"/>
       </Unit100>
       <Unit101>
         <Filename Value="media/UAudioDecoder_FFmpeg.pas"/>
@@ -546,11 +547,6 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="ULuaTexture"/>
       </Unit124>
-      <Unit125>
-        <Filename Value="lua/ULuaUsdx.pas"/>
-        <IsPartOfProject Value="True"/>
-        <UnitName Value="ULuaUsdx"/>
-      </Unit125>
     </Units>
   </ProjectOptions>
   <CompilerOptions>