Remove sixpack.c, it is already implemented in a2m.cpp, which also co…

…ntains some minor bugfixes.
dmitrysmagin · Aug 4, 2024 · 2339479 · 2339479
1 parent 7c88658
commit 2339479
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 292 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -16,7 +16,6 @@ src_libadplug_la_SOURCES = \
 	src/fmopl.c \
 	src/nukedopl.c \
 	src/depack.c \
-	src/sixpack.c \
 	src/unlzh.c \
 	src/unlzss.c \
 	src/unlzw.c \
@@ -108,7 +107,6 @@ pkginclude_HEADERS = \
 	src/opl.h \
 	src/diskopl.h \
 	src/depack.h \
-	src/sixpack.h \
 	src/unlzh.h \
 	src/unlzss.h \
 	src/unlzw.h \

diff --git a/adplug.qpg b/adplug.qpg
@@ -103,7 +103,6 @@
          <QPG:Add permissions="0644" file="./src/s3m.h" install="/opt/include/adplug/"/>
          <QPG:Add permissions="0644" file="./src/sa2.h" install="/opt/include/adplug/"/>
          <QPG:Add permissions="0644" file="./src/silentopl.h" install="/opt/include/adplug/"/>
-         <QPG:Add permissions="0644" file="./src/sixpack.h" install="/opt/include/adplug/"/>
          <QPG:Add permissions="0644" file="./src/sng.h" install="/opt/include/adplug/"/>
          <QPG:Add permissions="0644" file="./src/sop.h" install="/opt/include/adplug/"/>
          <QPG:Add permissions="0644" file="./src/surroundopl.h" install="/opt/include/adplug/"/>

diff --git a/contrib/MSVC6/adplug.dsp b/contrib/MSVC6/adplug.dsp
diff --git a/contrib/Watcom/src.bt b/contrib/Watcom/src.bt
@@ -14,14 +14,14 @@ a2m.obj hsc.obj imf.obj sng.obj amd.obj d00.obj dfm.obj hsp.obj ksm.obj &
 mid.obj mkj.obj mtk.obj rad.obj raw.obj s3m.obj sa2.obj bam.obj xad.obj &
 mad.obj fmc.obj bmf.obj flash.obj hybrid.obj hyp.obj psi.obj rat.obj lds.obj &
 adtrack.obj cff.obj dtm.obj dmo.obj u6m.obj rol.obj xsm.obj dro.obj msc.obj &
-a2m-v2.obj depack.obj sixpack.obj unlzh.obj unlzss.obj unlzw.obj
+a2m-v2.obj depack.obj unlzh.obj unlzss.obj unlzw.obj
 
 include_INST = protrack.h a2m.h amd.h d00.h dfm.h hsc.h hsp.h imf.h ksm.h &
 mid.h mkj.h mtk.h rad.h raw.h s3m.h sa2.h sng.h bam.h xad.h mad.h fmc.h &
 bmf.h flash.h hybrid.h hyp.h psi.h rat.h adplug.h emuopl.h fmopl.h realopl.h &
 analopl.h diskopl.h player.h opl.h silentopl.h lds.h adtrack.h cff.h dtm.h &
 dmo.h u6m.h rol.h database.h fprovide.h players.h xsm.h dro.h strnlen.h &
-a2m-v2.h depack.h sixpack.h unlzh.h unlzss.h unlzw.h
+a2m-v2.h depack.h unlzh.h unlzss.h unlzw.h
 
 lib_INST = adplug.lib
 

diff --git a/contrib/vs2015/adplug/adplug.vcxproj b/contrib/vs2015/adplug/adplug.vcxproj
@@ -92,7 +92,6 @@
     <ClCompile Include="..\..\..\src\vgm.cpp" />
     <ClCompile Include="..\..\..\src\sop.cpp" />
     <ClCompile Include="..\..\..\src\herad.cpp" />
-    <ClCompile Include="..\..\..\src\sixpack.c" />
     <ClCompile Include="..\..\..\src\unlzh.c" />
     <ClCompile Include="..\..\..\src\unlzss.c" />
     <ClCompile Include="..\..\..\src\unlzw.c" />
@@ -176,7 +175,6 @@
     <ClInclude Include="..\..\..\src\vgm.h" />
     <ClInclude Include="..\..\..\src\sop.h" />
     <ClInclude Include="..\..\..\src\herad.h" />
-    <ClInclude Include="..\..\..\src\sixpack.h" />
     <ClInclude Include="..\..\..\src\unlzh.h" />
     <ClInclude Include="..\..\..\src\unlzss.h" />
     <ClInclude Include="..\..\..\src\unlzw.h" />
@@ -319,4 +317,4 @@
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\libbinio.1.4.20\build\native\libbinio.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\libbinio.1.4.20\build\native\libbinio.targets'))" />
   </Target>
-</Project>
+</Project>
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -9,7 +9,6 @@ set(SOURCES
     depack.c
     fmopl.c
     nukedopl.c
-    sixpack.c
     unlzh.c
     unlzss.c
     unlzw.c

diff --git a/src/a2m-v2.cpp b/src/a2m-v2.cpp
@@ -30,6 +30,7 @@
  */
 
 #include "a2m-v2.h"
+#include "a2m.h" // Ca2mLoader::sixdepak
 #include "debug.h"
 #include <climits>
 #include <math.h>
@@ -3184,7 +3185,7 @@ void Ca2mv2Player::a2t_depack(char *src, int srcsize, char *dst, int dstsize)
     switch (ffver) {
     case 1:
     case 5: // sixpack
-        sixdepak((unsigned short *)src, (unsigned char *)dst, srcsize, dstsize);
+        Ca2mLoader::sixdepak::decode((unsigned short *)src, srcsize, (unsigned char *)dst, dstsize);
         break;
     case 2:
     case 6: // lzw

diff --git a/src/a2m-v2.h b/src/a2m-v2.h
@@ -41,7 +41,6 @@
 
 #include "player.h"
 #include "depack.h"
-#include "sixpack.h"
 #include "unlzh.h"
 #include "unlzss.h"
 #include "unlzw.h"

diff --git a/src/a2m.h b/src/a2m.h
@@ -27,6 +27,8 @@
 class Ca2mLoader: public CmodPlayer
 {
 public:
+  friend class Ca2mv2Player;
+
   static CPlayer *factory(Copl *newopl);
 
   Ca2mLoader(Copl *newopl): CmodPlayer(newopl)

diff --git a/src/sixpack.c b/src/sixpack.c