mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2025-02-09 01:01:07 +00:00
minor syncing with uhexen2
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@461 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
parent
701ae6882c
commit
e5a5e89f53
3 changed files with 8 additions and 8 deletions
|
@ -43,7 +43,7 @@ typedef enum _bgm_player
|
||||||
|
|
||||||
typedef struct music_handler_s
|
typedef struct music_handler_s
|
||||||
{
|
{
|
||||||
unsigned int type; /* power of two (snd_codec.h) */
|
unsigned int type; /* 1U << n (see snd_codec.h) */
|
||||||
bgm_player_t player; /* Enumerated bgm player type */
|
bgm_player_t player; /* Enumerated bgm player type */
|
||||||
int is_available; /* -1 means not present */
|
int is_available; /* -1 means not present */
|
||||||
const char *ext; /* Expected file extension */
|
const char *ext; /* Expected file extension */
|
||||||
|
|
|
@ -82,12 +82,12 @@ void S_CodecUtilClose(snd_stream_t **stream);
|
||||||
|
|
||||||
|
|
||||||
#define CODECTYPE_NONE 0
|
#define CODECTYPE_NONE 0
|
||||||
#define CODECTYPE_MID (1 << 0)
|
#define CODECTYPE_MID (1U << 0)
|
||||||
#define CODECTYPE_MOD (1 << 1)
|
#define CODECTYPE_MOD (1U << 1)
|
||||||
#define CODECTYPE_FLAC (1 << 2)
|
#define CODECTYPE_FLAC (1U << 2)
|
||||||
#define CODECTYPE_WAV (1 << 3)
|
#define CODECTYPE_WAV (1U << 3)
|
||||||
#define CODECTYPE_MP3 (1 << 4)
|
#define CODECTYPE_MP3 (1U << 4)
|
||||||
#define CODECTYPE_OGG (1 << 5)
|
#define CODECTYPE_OGG (1U << 5)
|
||||||
|
|
||||||
#define CODECTYPE_VORBIS CODECTYPE_OGG
|
#define CODECTYPE_VORBIS CODECTYPE_OGG
|
||||||
#define CODECTYPE_WAVE CODECTYPE_WAV
|
#define CODECTYPE_WAVE CODECTYPE_WAV
|
||||||
|
|
|
@ -36,7 +36,7 @@ typedef void (*CODEC_CLOSE)(snd_stream_t *stream);
|
||||||
|
|
||||||
struct snd_codec_s
|
struct snd_codec_s
|
||||||
{
|
{
|
||||||
unsigned int type; /* handled data type. */
|
unsigned int type; /* handled data type. (1U << n) */
|
||||||
qboolean initialized; /* init succeedded */
|
qboolean initialized; /* init succeedded */
|
||||||
const char *ext; /* expected extension */
|
const char *ext; /* expected extension */
|
||||||
CODEC_INIT initialize;
|
CODEC_INIT initialize;
|
||||||
|
|
Loading…
Reference in a new issue