mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2025-02-09 01:01:07 +00:00
codecs: update libmikmod to latest 3.3.2 release
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@871 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
parent
a99f95af94
commit
db2ccc608e
11 changed files with 726 additions and 710 deletions
|
@ -20,11 +20,9 @@
|
|||
|
||||
/*==============================================================================
|
||||
|
||||
$Id$
|
||||
|
||||
MikMod sound library include file
|
||||
|
||||
==============================================================================*/
|
||||
==============================================================================*/
|
||||
|
||||
#ifndef _MIKMOD_H_
|
||||
#define _MIKMOD_H_
|
||||
|
@ -53,11 +51,15 @@ extern "C" {
|
|||
# else
|
||||
# define MIKMODAPI __declspec(dllimport) /* using libmikmod dll for windows */
|
||||
# endif
|
||||
/* FIXME: USE VISIBILITY ATTRIBUTES HERE */
|
||||
#elif defined(MIKMOD_BUILD)
|
||||
#define MIKMODAPI
|
||||
/* SYM_VISIBILITY should be defined if both the compiler
|
||||
* and the target support the visibility attributes. the
|
||||
* configury does that automatically. for the standalone
|
||||
* makefiles, etc, the developer should add the required
|
||||
* flags, i.e.: -DSYM_VISIBILITY -fvisibility=hidden */
|
||||
#elif defined(MIKMOD_BUILD) && defined(SYM_VISIBILITY)
|
||||
# define MIKMODAPI __attribute__((visibility("default")))
|
||||
#else
|
||||
#define MIKMODAPI
|
||||
# define MIKMODAPI
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
@ -284,8 +286,9 @@ MIKMODAPI extern void MikMod_Lock(void);
|
|||
MIKMODAPI extern void MikMod_Unlock(void);
|
||||
|
||||
MIKMODAPI extern void* MikMod_malloc(size_t);
|
||||
MIKMODAPI extern void* MikMod_realloc(void *, size_t);
|
||||
MIKMODAPI extern void* MikMod_calloc(size_t,size_t);
|
||||
MIKMODAPI extern void* MikMod_realloc(void*,size_t);
|
||||
MIKMODAPI extern CHAR* MikMod_strdup(const CHAR*);
|
||||
MIKMODAPI extern void MikMod_free(void*);
|
||||
|
||||
/*
|
||||
|
@ -303,10 +306,10 @@ typedef struct MREADER {
|
|||
} MREADER;
|
||||
|
||||
typedef struct MWRITER {
|
||||
BOOL (*Seek)(struct MWRITER*,long,int);
|
||||
BOOL (*Seek)(struct MWRITER*, long, int);
|
||||
long (*Tell)(struct MWRITER*);
|
||||
BOOL (*Write)(struct MWRITER*,const void*,size_t);
|
||||
BOOL (*Put)(struct MWRITER*,int);
|
||||
BOOL (*Write)(struct MWRITER*, const void*, size_t);
|
||||
BOOL (*Put)(struct MWRITER*, int);
|
||||
} MWRITER;
|
||||
|
||||
/*
|
||||
|
@ -512,8 +515,10 @@ typedef struct MODULE {
|
|||
UWORD numpat; /* number of patterns in this song */
|
||||
UWORD numins; /* number of instruments */
|
||||
UWORD numsmp; /* number of samples */
|
||||
struct INSTRUMENT* instruments; /* all instruments */
|
||||
struct SAMPLE* samples; /* all samples */
|
||||
|
||||
struct INSTRUMENT* instruments; /* all instruments */
|
||||
struct SAMPLE* samples; /* all samples */
|
||||
|
||||
UBYTE realchn; /* real number of channels used */
|
||||
UBYTE totalchn; /* total number of channels used (incl NNAs) */
|
||||
|
||||
|
@ -552,8 +557,8 @@ struct SAMPLE* samples; /* all samples */
|
|||
UWORD vbtick; /* tick counter (counts from 0 to sngspd) */
|
||||
UWORD sngremainder;/* used for song time computation */
|
||||
|
||||
struct MP_CONTROL* control; /* Effects Channel info (size pf->numchn) */
|
||||
struct MP_VOICE* voice; /* Audio Voice information (size md_numchn) */
|
||||
struct MP_CONTROL* control; /* Effects Channel info (size pf->numchn) */
|
||||
struct MP_VOICE* voice; /* Audio Voice information (size md_numchn) */
|
||||
|
||||
UBYTE globalslide; /* global volume slide rate */
|
||||
UBYTE pat_repcrazy;/* module has just looped to position -1 */
|
||||
|
@ -680,7 +685,9 @@ enum {
|
|||
#define DMODE_SIMDMIXER 0x0800 /* enable SIMD mixing */
|
||||
#define DMODE_NOISEREDUCTION 0x1000 /* Low pass filtering */
|
||||
|
||||
|
||||
struct SAMPLOAD;
|
||||
|
||||
typedef struct MDRIVER {
|
||||
struct MDRIVER* next;
|
||||
const CHAR* Name;
|
||||
|
@ -747,7 +754,7 @@ MIKMODAPI extern struct MDRIVER drv_wav; /* RIFF WAVE file disk writer [music
|
|||
MIKMODAPI extern struct MDRIVER drv_aiff; /* AIFF file disk writer [music.aiff] */
|
||||
|
||||
MIKMODAPI extern struct MDRIVER drv_ultra; /* Linux Ultrasound driver */
|
||||
MIKMODAPI extern struct MDRIVER drv_sam9407; /* Linux sam9407 driver */
|
||||
MIKMODAPI extern struct MDRIVER drv_sam9407;/* Linux sam9407 driver */
|
||||
|
||||
MIKMODAPI extern struct MDRIVER drv_AF; /* Dec Alpha AudioFile */
|
||||
MIKMODAPI extern struct MDRIVER drv_aix; /* AIX audio device */
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
libmikmod-3.3.2 / 2013-09.17. only the "nosound" driver (drv_nos)
|
||||
is included, all of the other libmikmod drivers were made "MISSING"
|
||||
drivers. we only need/register/use drv_nos here, and nothing else.
|
||||
libmikmod-3.3.2
|
||||
only the "nosound" driver (drv_nos) is included, all of
|
||||
the other libmikmod drivers were made "MISSING" drivers.
|
||||
we only need/register/use drv_nos here and nothing else.
|
||||
|
|
Binary file not shown.
|
@ -20,11 +20,9 @@
|
|||
|
||||
/*==============================================================================
|
||||
|
||||
$Id$
|
||||
|
||||
MikMod sound library include file
|
||||
|
||||
==============================================================================*/
|
||||
==============================================================================*/
|
||||
|
||||
#ifndef _MIKMOD_H_
|
||||
#define _MIKMOD_H_
|
||||
|
@ -53,11 +51,15 @@ extern "C" {
|
|||
# else
|
||||
# define MIKMODAPI __declspec(dllimport) /* using libmikmod dll for windows */
|
||||
# endif
|
||||
/* FIXME: USE VISIBILITY ATTRIBUTES HERE */
|
||||
#elif defined(MIKMOD_BUILD)
|
||||
#define MIKMODAPI
|
||||
/* SYM_VISIBILITY should be defined if both the compiler
|
||||
* and the target support the visibility attributes. the
|
||||
* configury does that automatically. for the standalone
|
||||
* makefiles, etc, the developer should add the required
|
||||
* flags, i.e.: -DSYM_VISIBILITY -fvisibility=hidden */
|
||||
#elif defined(MIKMOD_BUILD) && defined(SYM_VISIBILITY)
|
||||
# define MIKMODAPI __attribute__((visibility("default")))
|
||||
#else
|
||||
#define MIKMODAPI
|
||||
# define MIKMODAPI
|
||||
#endif
|
||||
|
||||
/*
|
||||
|
@ -284,8 +286,9 @@ MIKMODAPI extern void MikMod_Lock(void);
|
|||
MIKMODAPI extern void MikMod_Unlock(void);
|
||||
|
||||
MIKMODAPI extern void* MikMod_malloc(size_t);
|
||||
MIKMODAPI extern void* MikMod_realloc(void *, size_t);
|
||||
MIKMODAPI extern void* MikMod_calloc(size_t,size_t);
|
||||
MIKMODAPI extern void* MikMod_realloc(void*,size_t);
|
||||
MIKMODAPI extern CHAR* MikMod_strdup(const CHAR*);
|
||||
MIKMODAPI extern void MikMod_free(void*);
|
||||
|
||||
/*
|
||||
|
@ -303,10 +306,10 @@ typedef struct MREADER {
|
|||
} MREADER;
|
||||
|
||||
typedef struct MWRITER {
|
||||
BOOL (*Seek)(struct MWRITER*,long,int);
|
||||
BOOL (*Seek)(struct MWRITER*, long, int);
|
||||
long (*Tell)(struct MWRITER*);
|
||||
BOOL (*Write)(struct MWRITER*,const void*,size_t);
|
||||
BOOL (*Put)(struct MWRITER*,int);
|
||||
BOOL (*Write)(struct MWRITER*, const void*, size_t);
|
||||
BOOL (*Put)(struct MWRITER*, int);
|
||||
} MWRITER;
|
||||
|
||||
/*
|
||||
|
@ -512,8 +515,10 @@ typedef struct MODULE {
|
|||
UWORD numpat; /* number of patterns in this song */
|
||||
UWORD numins; /* number of instruments */
|
||||
UWORD numsmp; /* number of samples */
|
||||
struct INSTRUMENT* instruments; /* all instruments */
|
||||
struct SAMPLE* samples; /* all samples */
|
||||
|
||||
struct INSTRUMENT* instruments; /* all instruments */
|
||||
struct SAMPLE* samples; /* all samples */
|
||||
|
||||
UBYTE realchn; /* real number of channels used */
|
||||
UBYTE totalchn; /* total number of channels used (incl NNAs) */
|
||||
|
||||
|
@ -552,8 +557,8 @@ struct SAMPLE* samples; /* all samples */
|
|||
UWORD vbtick; /* tick counter (counts from 0 to sngspd) */
|
||||
UWORD sngremainder;/* used for song time computation */
|
||||
|
||||
struct MP_CONTROL* control; /* Effects Channel info (size pf->numchn) */
|
||||
struct MP_VOICE* voice; /* Audio Voice information (size md_numchn) */
|
||||
struct MP_CONTROL* control; /* Effects Channel info (size pf->numchn) */
|
||||
struct MP_VOICE* voice; /* Audio Voice information (size md_numchn) */
|
||||
|
||||
UBYTE globalslide; /* global volume slide rate */
|
||||
UBYTE pat_repcrazy;/* module has just looped to position -1 */
|
||||
|
@ -680,7 +685,9 @@ enum {
|
|||
#define DMODE_SIMDMIXER 0x0800 /* enable SIMD mixing */
|
||||
#define DMODE_NOISEREDUCTION 0x1000 /* Low pass filtering */
|
||||
|
||||
|
||||
struct SAMPLOAD;
|
||||
|
||||
typedef struct MDRIVER {
|
||||
struct MDRIVER* next;
|
||||
const CHAR* Name;
|
||||
|
@ -747,7 +754,7 @@ MIKMODAPI extern struct MDRIVER drv_wav; /* RIFF WAVE file disk writer [music
|
|||
MIKMODAPI extern struct MDRIVER drv_aiff; /* AIFF file disk writer [music.aiff] */
|
||||
|
||||
MIKMODAPI extern struct MDRIVER drv_ultra; /* Linux Ultrasound driver */
|
||||
MIKMODAPI extern struct MDRIVER drv_sam9407; /* Linux sam9407 driver */
|
||||
MIKMODAPI extern struct MDRIVER drv_sam9407;/* Linux sam9407 driver */
|
||||
|
||||
MIKMODAPI extern struct MDRIVER drv_AF; /* Dec Alpha AudioFile */
|
||||
MIKMODAPI extern struct MDRIVER drv_aix; /* AIX audio device */
|
||||
|
|
|
@ -1,3 +1,4 @@
|
|||
libmikmod-3.3.2 / 2013-09.17. only the "nosound" driver (drv_nos)
|
||||
is included, all of the other libmikmod drivers were made "MISSING"
|
||||
drivers. we only need/register/use drv_nos here, and nothing else.
|
||||
libmikmod-3.3.2
|
||||
only the "nosound" driver (drv_nos) is included, all of
|
||||
the other libmikmod drivers were made "MISSING" drivers.
|
||||
we only need/register/use drv_nos here and nothing else.
|
||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in a new issue