Sam Lantinga - Tue Sep 11 11:48:53 PDT 2001

* Updated MikMod code to version 3.1.9a
libsdl-org · Sep 11, 2001 · 8da131c · 8da131c
1 parent dd972d1
commit 8da131c
Show file tree

Hide file tree

Showing 11 changed files with 324 additions and 259 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,7 @@
 
 1.2.1:
+Sam Lantinga - Tue Sep 11 11:48:53 PDT 2001
+ * Updated MikMod code to version 3.1.9a
 Torbj�rn Andersson - Tue Sep 11 11:22:29 PDT 2001
  * Added support for loading AIFF audio chunks
 Max Horn - Tue Sep  4 20:38:11 PDT 2001

diff --git a/mikmod/AUTHORS b/mikmod/AUTHORS
@@ -16,14 +16,32 @@ Previous Unix maintainers
 
 * Steve McIntyre <steven@chiark.greenend.org.uk>
   maintained MikMod'Unix version 2.
-* Peter Amstutz <amstpi@freenet.tlh.fl.us>
+* Peter Amstutz <tetron@student.umass.edu>
   maintained MikMod'Unix version 3.0.
+
+General contributors
+--------------------
+
+* Arne de Bruijn <arne@knoware.nl>
+  wrote the compressed IT sample support.
+* Claudio Matsuoka <claudio@helllabs.org>
+  wrote the STX loader and submitted bug fixes.
+* Sebastiaan A. Megens <samegens@xs4all.nl>
+  fixed various bugs (memory leaks, endianness issues, etc).
+* ``UFO'' <ufo303@poczta.onet.pl>
+  wrote the OKT loader.
+* Kev Vance <kvance@zeux.org>
+  wrote the GDM loader.
+
+* Paul Fisher made decisive contributions and improvements.
+* Alexander Kerkhove fixed an ULT panning effect bug.
+* ``Kodiak'' helped on the interfaces of libmikmod.
+* Sylvain Marchand make MikMod more portable and GCC compilable.
+
 
 Contributors on the Unix side
 -----------------------------
 
-* Arne de Bruijn <arne@knoware.nl>
-  wrote the compressed IT sample support.
 * Douglas Carmichael <dcarmich@mcs.com>
   made MikMod work under FreeBSD.
 * Chris Conn <cconn@tohs.abacom.com>
@@ -42,15 +60,13 @@ Contributors on the Unix side
   updated the Ultra driver to work with libmikmod 3.
 * ``MenTaLguY'' <mental@kludge.org>
   autoconfized the Unix libmikmod distribution.
-* Claudio Matsuoka <claudio@helllabs.org>
-  wrote the STX loader and submitted bug fixes.
 * Tobias Gloth <gloth@geomagic.com>
   created the new I/O interface, made the code MT-safe and submitted bug fixes.
-* Kev Vance <kvance@zeux.org>
-  wrote the GDM loader.
 * Simon Hosie <gumboot@clear.net.nz>
   wrote the piped output driver, and submitted speed optimizations and bugfixes
   for the software mixer.
+* Gerd Rausch <gerd@alf.gun.de>
+  wrote the sam9407 driver.
 
 Contributors on the Windows side
 --------------------------------
@@ -94,17 +110,6 @@ Contributors on the BeOS side
 * Thomas Neumann <tneumann@polycode.dk>
   integrated libmikmod into his BeOS APlayer, and contributed many bug fixes.
 
-Other contributors
-------------------
-
-* Sebastiaan A. Megens <samegens@xs4all.nl>
-  fixed various bugs (memory leaks, endianness issues, etc).
-
-* Paul Fisher made decisive contributions and improvements.
-* Alexander Kerkhove fixed an ULT panning effect bug.
-* ``Kodiak'' helped on the interfaces of libmikmod.
-* Sylvain Marchand make MikMod more portable and GCC compilable.
-
 --
 If your name is missing, don't hesitate to remind me at
 <miodrag@mikmod.darkorb.net>
diff --git a/mikmod/README b/mikmod/README
@@ -1,14 +1,13 @@
 
- --> MikMod Sound Libraries Version 3.1.8
- --> libmikmod 3.1.8 was released on 10/25/1999.
+ --> MikMod Sound Libraries Version 3.1.9a
 
 --
 This version of the library is based on the official UNIX MikMod
-library version 3.1.8, found at:  http://mikmod.darkorb.net/
+library version 3.1.9, found at:  http://www.mikmod.org/
 
 It has been stripped down for inclusion with Simple DirectMedia Layer,
 but the missing drivers and file loaders can be plugged right in from
-the MikMod 3.1.8 archive.
+the MikMod 3.1.9 archive.
 
 See COPYING.LESSER for copying information
 --
diff --git a/mikmod/drv_nos.c b/mikmod/drv_nos.c
@@ -1,5 +1,5 @@
 /*	MikMod sound library
-	(c) 1998, 1999 Miodrag Vallat and others - see file AUTHORS for
+	(c) 1998, 1999, 2000 Miodrag Vallat and others - see file AUTHORS for
 	complete list.
 
 	This library is free software; you can redistribute it and/or modify
@@ -69,7 +69,7 @@ static void NS_Update(void)
 		VC_WriteBytes(zerobuf,ZEROLEN);
 }
 
-MDRIVER drv_nos={
+MIKMODAPI MDRIVER drv_nos={
 	NULL,
 	"No Sound",
 	"Nosound Driver v3.0",

diff --git a/mikmod/drv_sdl.c b/mikmod/drv_sdl.c
@@ -43,7 +43,7 @@ static BOOL SDRV_Reset(void)
 }
 
 
-MDRIVER drv_sdl =
+MIKMODAPI MDRIVER drv_sdl =
 {   NULL,
     "SDL",
     "MikMod Simple DirectMedia Layer driver v1.1",

diff --git a/mikmod/load_it.c b/mikmod/load_it.c
@@ -1,5 +1,5 @@
 /*	MikMod sound library
-	(c) 1998, 1999 Miodrag Vallat and others - see file AUTHORS for
+	(c) 1998, 1999, 2000 Miodrag Vallat and others - see file AUTHORS for
 	complete list.
 
 	This library is free software; you can redistribute it and/or modify
@@ -753,7 +753,7 @@ BOOL IT_Load(BOOL curious)
 
 			d->volflg|=EF_VOLENV;
 			d->insname = DupStr(ih.name,26,0);
-			d->nnatype = ih.nna;
+			d->nnatype = ih.nna & NNA_MASK;
 
 			if(mh->cwt<0x200) {
 				d->volfade=ih.fadeout<< 6;
@@ -858,39 +858,6 @@ d->pitflg&=~EF_ON;
 					}
 #endif
 				}
-
-				d->volpts    = ih.volpts;
-				d->volbeg    = ih.volbeg;
-				d->volend    = ih.volend;
-				d->volsusbeg = ih.volsusbeg;
-				d->volsusend = ih.volsusend;
-
-				for(u=0;u<ih.volpts;u++) {
-					d->volenv[u].val=(ih.volnode[u]<<2);
-					d->volenv[u].pos=ih.voltick[u];
-				}
-
-				d->panpts    = ih.panpts;
-				d->panbeg    = ih.panbeg;
-				d->panend    = ih.panend;
-				d->pansusbeg = ih.pansusbeg;
-				d->pansusend = ih.pansusend;
-
-				for(u=0;u<ih.panpts;u++) {
-					d->panenv[u].val=ih.pannode[u]==32?255:(ih.pannode[u]+32)<<2;
-					d->panenv[u].pos=ih.pantick[u];
-				}
-
-				d->pitpts   =ih.pitpts;
-				d->pitbeg   =ih.pitbeg;
-				d->pitend   =ih.pitend;
-				d->pitsusbeg=ih.pitsusbeg;
-				d->pitsusend=ih.pitsusend;
-
-				for(u=0;u<ih.pitpts;u++) {
-					d->pitenv[u].val=ih.pitnode[u]+32;
-					d->pitenv[u].pos=ih.pittick[u];
-				}
 			}
 
 			for(u=0;u<ITNOTECNT;u++) {
@@ -996,7 +963,7 @@ CHAR *IT_LoadTitle(void)
 
 /*========== Loader information */
 
-MLOADER load_it={
+MIKMODAPI MLOADER load_it={
 	NULL,
 	"IT",
 	"IT (Impulse Tracker)",