fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-09 09:10:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

snd_mikmod.c: fix return type of the Seek function. snd_umx.c: update XM detection. other minor tidy-ups.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@876 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2013-10-15 18:11:31 +00:00
parent 468f84007a
commit 6bdc733591
2 changed files with 40 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Quake/snd_mikmod.c
View file

@ -27,6 +27,9 @@
#include "snd_mikmod.h" #include "snd_mikmod.h"
#include <mikmod.h> #include <mikmod.h>
#ifndef DMODE_NOISEREDUCTION
#define DMODE_NOISEREDUCTION 0x1000 /* Low pass filtering */
#endif
#ifndef DMODE_SIMDMIXER #ifndef DMODE_SIMDMIXER
#define DMODE_SIMDMIXER 0x0800 /* enable SIMD mixing */ #define DMODE_SIMDMIXER 0x0800 /* enable SIMD mixing */
#endif #endif
@ -42,7 +45,7 @@ typedef struct _mik_priv {
MODULE *module; MODULE *module;
} mik_priv_t; } mik_priv_t;
static BOOL MIK_Seek (MREADER *r, long ofs, int whence) static int MIK_Seek (MREADER *r, long ofs, int whence)
{ {
return FS_fseek(((mik_priv_t *)r)->fh, ofs, whence); return FS_fseek(((mik_priv_t *)r)->fh, ofs, whence);
} }
@ -88,8 +91,8 @@ static qboolean S_MIKMOD_CodecInitialize (void)
* only register drv_nos, and it will be the only one found.) * only register drv_nos, and it will be the only one found.)
* md_pansep (stereo channels separation) default 128 is OK. * md_pansep (stereo channels separation) default 128 is OK.
* no reverbation (md_reverb 0 (up to 15)) is OK. * no reverbation (md_reverb 0 (up to 15)) is OK.
* md_musicvolume and md_sndfxvolume defaults are 128: OK. * md_musicvolume and md_sndfxvolume defaults are 128: OK. */
* just tone down overall volume md_volume from 128 to 96? */ /* just tone down overall volume md_volume from 128 to 96? */
md_volume = 96; md_volume = 96;
MikMod_RegisterDriver(&drv_nos); /* only need the "nosound" driver, none else */ MikMod_RegisterDriver(&drv_nos); /* only need the "nosound" driver, none else */
@ -141,8 +144,8 @@ static qboolean S_MIKMOD_CodecOpenStream (snd_stream_t *stream)
* position of the module is being played), extspd (1: do process Protracker * position of the module is being played), extspd (1: do process Protracker
* extended speed effect), panflag (1: do process panning effects), wrap (0: * extended speed effect), panflag (1: do process panning effects), wrap (0:
* don't wrap to restart position when module is finished) are OK with us as * don't wrap to restart position when module is finished) are OK with us as
* set internally by libmikmod::Player_Init(). just change the loop setting * set internally by libmikmod::Player_Init(). */
* to 0, i.e. don't process in-module loops: */ /* just change the loop setting to 0, i.e. don't process in-module loops: */
priv->module->loop = 0; priv->module->loop = 0;
Player_Start(priv->module); Player_Start(priv->module);

53
Quake/snd_umx.c
View file

@ -1,9 +1,15 @@
/* /*
* Unreal UMX container support. UMX parsing is based on Unreal Media * Unreal UMX container support.
* Ripper (UMR) v0.3 by Andy Ward <wardwh@swbell.net>, with additional * UPKG parsing partially based on Unreal Media Ripper (UMR) v0.3
* updates by O. Sezer - see git repo at https://github.com/sezero/umr/ * by Andy Ward <wardwh@swbell.net>, with additional updates
* by O. Sezer - see git repo at https://github.com/sezero/umr/
* *
* Copyright (C) 2013 O.Sezer <sezero@users.sourceforge.net> * The cheaper way, i.e. linear search of music object like libxmp
* and libmodplug does, is possible. With this however we're using
* the embedded offset, size and object type directly from the umx
* file, and I feel safer with it.
*
* Copyright (C) 2013 O. Sezer <sezero@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -33,34 +39,32 @@
#pragma pack(1) #pragma pack(1)
struct upkg_hdr { struct upkg_hdr {
uint32_t tag; /* UPKG_HDR_TAG */ uint32_t tag; /* UPKG_HDR_TAG */
int32_t file_version, /* 61 for original unreal */ int32_t file_version; /* 61 for original unreal */
pkg_flags, /* bitflags - none needed */ int32_t pkg_flags; /* bitflags - none needed */
name_count, /* number of names in name table (>= 0) */ int32_t name_count; /* number of names in name table (>= 0) */
name_offset, /* offset to name table (>= 0) */ int32_t name_offset; /* offset to name table (>= 0) */
export_count, /* num. exports in export table (>= 0) */ int32_t export_count; /* num. exports in export table (>= 0) */
export_offset, /* offset to export table (>= 0) */ int32_t export_offset; /* offset to export table (>= 0) */
import_count, /* num. imports in export table (>= 0) */ int32_t import_count; /* num. imports in export table (>= 0) */
import_offset; /* offset to import table (>= 0) */ int32_t import_offset; /* offset to import table (>= 0) */
/* number of GUIDs in heritage table (>= 1) and table's offset: /* number of GUIDs in heritage table (>= 1) and table's offset:
* only with versions < 68. */ * only with versions < 68. */
int32_t heritage_count, heritage_offset; int32_t heritage_count;
int32_t heritage_offset;
#if 0 #if 0
/* with versions >= 68: a GUID, a dword for generation count /* with versions >= 68: a GUID, a dword for generation count
* and export_count and name_count dwords for each generation: */ * and export_count and name_count dwords for each generation: */
uint32_t guid[4]; uint32_t guid[4];
int32_t generation_count; int32_t generation_count;
struct _genhist { struct _genhist {
int32_t export_count, int32_t export_count;
name_count; int32_t name_count;
} genhist[0/* generation_count */]; } genhist[0/* generation_count */];
#endif #endif
}; };
#pragma pack() #pragma pack()
/* read Little Endian data in an endian-neutral way */
#define READ_INT32(b) ((b)[0] | ((b)[1] << 8) | ((b)[2] << 16) | ((b)[3] << 24))
#define UMUSIC_IT 0 #define UMUSIC_IT 0
#define UMUSIC_S3M 1 #define UMUSIC_S3M 1
#define UMUSIC_XM 2 #define UMUSIC_XM 2
@ -124,9 +128,13 @@ _retry:
return -1; return -1;
} }
if (type == UMUSIC_XM) { if (type == UMUSIC_XM) {
if (memcmp(sig, "Extended Module:", 16) == 0) if (memcmp(sig, "Extended Module:", 16) != 0)
return UMUSIC_XM;
return -1; return -1;
FS_fread(sig, 16, 1, f);
if (sig[0] != ' ') return -1;
FS_fread(sig, 16, 1, f);
if (sig[5] != 0x1a) return -1;
return UMUSIC_XM;
} }
if (type == UMUSIC_MP2) { if (type == UMUSIC_MP2) {
unsigned char *p = (unsigned char *)sig; unsigned char *p = (unsigned char *)sig;
@ -269,7 +277,7 @@ static int32_t probe_header (void *header)
p = (unsigned char *) header; p = (unsigned char *) header;
swp = (uint32_t *) header; swp = (uint32_t *) header;
for (i = 0; i < (int)sizeof(struct upkg_hdr)/4; i++, p += 4) { for (i = 0; i < (int)sizeof(struct upkg_hdr)/4; i++, p += 4) {
swp[i] = READ_INT32(p); swp[i] = p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24);
} }
hdr = (struct upkg_hdr *) header; hdr = (struct upkg_hdr *) header;
@ -286,6 +294,7 @@ static int32_t probe_header (void *header)
Con_DPrintf("Negative values in header\n"); Con_DPrintf("Negative values in header\n");
return -1; return -1;
} }
switch (hdr->file_version) { switch (hdr->file_version) {
case 61:/* Unreal */ case 61:/* Unreal */
case 62:/* Unreal Tournament */ case 62:/* Unreal Tournament */
@ -327,8 +336,8 @@ static void S_UMX_CodecShutdown (void)
static qboolean S_UMX_CodecOpenStream (snd_stream_t *stream) static qboolean S_UMX_CodecOpenStream (snd_stream_t *stream)
{ {
int32_t ofs, size;
int type; int type;
int32_t ofs = 0, size = 0;
type = process_upkg(&stream->fh, &ofs, &size); type = process_upkg(&stream->fh, &ofs, &size);
if (type < 0) { if (type < 0) {