From e5a5e89f53d65983f1035071750f1cb0c9d69747 Mon Sep 17 00:00:00 2001 From: Ozkan Sezer Date: Mon, 13 Jun 2011 12:41:00 +0000 Subject: [PATCH] minor syncing with uhexen2 git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@461 af15c1b1-3010-417e-b628-4374ebc0bcbd --- Quake/bgmusic.c | 2 +- Quake/snd_codec.h | 12 ++++++------ Quake/snd_codeci.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Quake/bgmusic.c b/Quake/bgmusic.c index cd0ab55f..6d535a33 100644 --- a/Quake/bgmusic.c +++ b/Quake/bgmusic.c @@ -43,7 +43,7 @@ typedef enum _bgm_player 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 */ int is_available; /* -1 means not present */ const char *ext; /* Expected file extension */ diff --git a/Quake/snd_codec.h b/Quake/snd_codec.h index f4c11180..0157ef1c 100644 --- a/Quake/snd_codec.h +++ b/Quake/snd_codec.h @@ -82,12 +82,12 @@ void S_CodecUtilClose(snd_stream_t **stream); #define CODECTYPE_NONE 0 -#define CODECTYPE_MID (1 << 0) -#define CODECTYPE_MOD (1 << 1) -#define CODECTYPE_FLAC (1 << 2) -#define CODECTYPE_WAV (1 << 3) -#define CODECTYPE_MP3 (1 << 4) -#define CODECTYPE_OGG (1 << 5) +#define CODECTYPE_MID (1U << 0) +#define CODECTYPE_MOD (1U << 1) +#define CODECTYPE_FLAC (1U << 2) +#define CODECTYPE_WAV (1U << 3) +#define CODECTYPE_MP3 (1U << 4) +#define CODECTYPE_OGG (1U << 5) #define CODECTYPE_VORBIS CODECTYPE_OGG #define CODECTYPE_WAVE CODECTYPE_WAV diff --git a/Quake/snd_codeci.h b/Quake/snd_codeci.h index 0d13d378..306c49d6 100644 --- a/Quake/snd_codeci.h +++ b/Quake/snd_codeci.h @@ -36,7 +36,7 @@ typedef void (*CODEC_CLOSE)(snd_stream_t *stream); struct snd_codec_s { - unsigned int type; /* handled data type. */ + unsigned int type; /* handled data type. (1U << n) */ qboolean initialized; /* init succeedded */ const char *ext; /* expected extension */ CODEC_INIT initialize;