changeset 395:0923a41170bb trunk

[svn] Add S3M support back after receiving a convincing testcase.
author chainsaw
date Sat, 07 Jan 2006 06:18:13 -0800
parents df3895743234
children 329a48431102
files Plugins/Input/adplug/core/Makefile.am Plugins/Input/adplug/core/adplug.cpp
diffstat 2 files changed, 8 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Plugins/Input/adplug/core/Makefile.am	Thu Jan 05 10:21:15 2006 -0800
+++ b/Plugins/Input/adplug/core/Makefile.am	Sat Jan 07 06:18:13 2006 -0800
@@ -2,10 +2,10 @@
 
 libadplugcore_la_SOURCES = adplug.cpp emuopl.cpp fmopl.c diskopl.cpp debug.c \
 debug.h fprovide.cpp player.cpp database.cpp hsc.cpp sng.cpp imf.cpp \
-players.cpp protrack.cpp a2m.cpp adtrack.cpp amd.cpp bam.cpp d00.cpp dfm.cpp \
+players.cpp protrack.cpp a2m.cpp adtrack.cpp amd.cpp bam.cpp d00.cpp dfm.cpp dmo.cpp \
 hsp.cpp ksm.cpp mad.cpp mkj.cpp cff.cpp dtm.cpp fmc.cpp mtk.cpp rad.cpp raw.cpp \
-sa2.cpp xad.cpp flash.cpp bmf.cpp hybrid.cpp hyp.cpp psi.cpp rat.cpp u6m.cpp \
-rol.cpp mididata.h xsm.cpp adlibemu.c dro.cpp lds.cpp
+sa2.cpp s3m.cpp xad.cpp flash.cpp bmf.cpp hybrid.cpp hyp.cpp psi.cpp rat.cpp u6m.cpp \
+rol.cpp xsm.cpp adlibemu.c dro.cpp lds.cpp
 
 # This is a hack. Throughout AdPlug, stricmp() is used to do caseless string
 # comparations. UNIX libc's don't support stricmp(), but do support the BSD
@@ -17,4 +17,4 @@
 a2m.h amd.h bam.h d00.h dfm.h hsc.h hsp.h imf.h ksm.h lds.h mkj.h mtk.h \
 protrack.h rad.h raw.h sa2.h sng.h u6m.h player.h fmc.h mad.h xad.h bmf.h \
 flash.h hyp.h psi.h rat.h hybrid.h rol.h adtrack.h cff.h dtm.h fprovide.h \
-database.h players.h xsm.h adlibemu.h kemuopl.h dro.h
+database.h players.h xsm.h adlibemu.h kemuopl.h dro.h dmo.h s3m.h
--- a/Plugins/Input/adplug/core/adplug.cpp	Thu Jan 05 10:21:15 2006 -0800
+++ b/Plugins/Input/adplug/core/adplug.cpp	Sat Jan 07 06:18:13 2006 -0800
@@ -41,6 +41,8 @@
 #include "mad.h"
 #include "mkj.h"
 #include "cff.h"
+#include "dmo.h" 	 
+#include "s3m.h"
 #include "dtm.h"
 #include "fmc.h"
 #include "mtk.h"
@@ -81,6 +83,8 @@
   CPlayerDesc(CmadLoader::factory, "Mlat Adlib Tracker", ".mad\0"),
   CPlayerDesc(CmkjPlayer::factory, "MKJamz", ".mkj\0"),
   CPlayerDesc(CcffLoader::factory, "Boomtracker", ".cff\0"),
+  CPlayerDesc(CdmoLoader::factory, "TwinTeam", ".dmo\0"),
+  CPlayerDesc(Cs3mPlayer::factory, "Scream Tracker 3", ".s3m\0"),
   CPlayerDesc(CdtmLoader::factory, "DeFy Adlib Tracker", ".dtm\0"),
   CPlayerDesc(CfmcLoader::factory, "Faust Music Creator", ".sng\0"),
   CPlayerDesc(CmtkLoader::factory, "MPU-401 Trakker", ".mtk\0"),