Backported external music files support using decoder libraries and the
new raw samples interface from Hammer of Thyrion (uhexen2) :
- bgmusic.c, bgmusic.h: New BGM interface for background music handling.
Handles streaming music as raw sound samples.
- bgmnull.c: BGM source for cases where the engine is configured for no
sound.
- cl_main.c: Include bgmusic.h. Call BGM_Stop() and CDAudio_Stop() in
CL_Disconnect().
- cd_sdl.c: Moved bgmvolume boundary checking to bgmusic.c upon value
changes.
- gl_vidnt.c, gl_vidsdl.c, cl_parse.c: Include bgmusic.h. Add BGM_Pause()
and BGM_Resume() calls along with CDAudio_ counterparts.
- cl_parse.c: Replace CDAudio_Play() call by the new BGM_PlayCDtrack()
which first tries CDAudio_Play() and then streaming music if it fails.
- host.c: Include bgmusic.h. Call BGM_Update() just before S_Update()
in Host_Frame(). In Host_Init(), call BGM_Init() after other audio init
calls. In Host_Shutdown(), call BGM_Shutdown() before all other audio
shutdown calls.
- snd_dma.c: Include snd_codec.h and bgmusic.h. Call S_CodecInit() from
S_Init(). Call S_CodecShutdown() from S_Shutdown().
- snd_codec.c, snd_codec.h: New public codec interface for streaming
music as raw samples. Adapted from quake2 and ioquake3 with changes.
Individual codecs are responsible for handling any necessary byte swap
operations.
- snd_codeci.h: New header for snd_codec internals.
- snd_wave.c, snd_wave.h: Codec for WAV format streaming music. Adapted
from ioquake3 with changes.
- snd_vorbis.c, snd_vorbis.h: Codec for Ogg/Vorbis format streaming music.
- snd_mp3.c, snd_mp3.h: Codec for MP3 format streaming music using libmad.
Adapted from the SoX project with changes.
- Makefile: Adjusted for the new sources. Added switches USE_CODEC_WAVE,
USE_CODEC_MP3, USE_CODEC_VORBIS for enabling and disabling individual
codecs.
- Windows makefiles and project files as well as other CodeBlocks project
files will be updated shortly.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@374 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-05 19:50:43 +00:00
|
|
|
/*
|
|
|
|
* Audio Codecs: Adapted from ioquake3 with changes.
|
|
|
|
* For now, only handles streaming music, not sound effects.
|
|
|
|
*
|
|
|
|
* Copyright (C) 1999-2005 Id Software, Inc.
|
|
|
|
* Copyright (C) 2005 Stuart Dalton <badcdev@gmail.com>
|
2011-01-30 21:34:12 +00:00
|
|
|
* Copyright (C) 2010-2011 O.Sezer <sezero@users.sourceforge.net>
|
Backported external music files support using decoder libraries and the
new raw samples interface from Hammer of Thyrion (uhexen2) :
- bgmusic.c, bgmusic.h: New BGM interface for background music handling.
Handles streaming music as raw sound samples.
- bgmnull.c: BGM source for cases where the engine is configured for no
sound.
- cl_main.c: Include bgmusic.h. Call BGM_Stop() and CDAudio_Stop() in
CL_Disconnect().
- cd_sdl.c: Moved bgmvolume boundary checking to bgmusic.c upon value
changes.
- gl_vidnt.c, gl_vidsdl.c, cl_parse.c: Include bgmusic.h. Add BGM_Pause()
and BGM_Resume() calls along with CDAudio_ counterparts.
- cl_parse.c: Replace CDAudio_Play() call by the new BGM_PlayCDtrack()
which first tries CDAudio_Play() and then streaming music if it fails.
- host.c: Include bgmusic.h. Call BGM_Update() just before S_Update()
in Host_Frame(). In Host_Init(), call BGM_Init() after other audio init
calls. In Host_Shutdown(), call BGM_Shutdown() before all other audio
shutdown calls.
- snd_dma.c: Include snd_codec.h and bgmusic.h. Call S_CodecInit() from
S_Init(). Call S_CodecShutdown() from S_Shutdown().
- snd_codec.c, snd_codec.h: New public codec interface for streaming
music as raw samples. Adapted from quake2 and ioquake3 with changes.
Individual codecs are responsible for handling any necessary byte swap
operations.
- snd_codeci.h: New header for snd_codec internals.
- snd_wave.c, snd_wave.h: Codec for WAV format streaming music. Adapted
from ioquake3 with changes.
- snd_vorbis.c, snd_vorbis.h: Codec for Ogg/Vorbis format streaming music.
- snd_mp3.c, snd_mp3.h: Codec for MP3 format streaming music using libmad.
Adapted from the SoX project with changes.
- Makefile: Adjusted for the new sources. Added switches USE_CODEC_WAVE,
USE_CODEC_MP3, USE_CODEC_VORBIS for enabling and disabling individual
codecs.
- Windows makefiles and project files as well as other CodeBlocks project
files will be updated shortly.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@374 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-05 19:50:43 +00:00
|
|
|
*
|
|
|
|
* 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
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or (at
|
|
|
|
* your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful, but
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
*
|
|
|
|
* See the GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _SND_CODEC_H_
|
|
|
|
#define _SND_CODEC_H_
|
|
|
|
|
|
|
|
typedef struct snd_info_s
|
|
|
|
{
|
|
|
|
int rate;
|
|
|
|
int width;
|
|
|
|
int channels;
|
|
|
|
int samples;
|
|
|
|
int size;
|
|
|
|
int dataofs;
|
|
|
|
} snd_info_t;
|
|
|
|
|
|
|
|
typedef enum {
|
|
|
|
STREAM_NONE = -1,
|
|
|
|
STREAM_INIT,
|
|
|
|
STREAM_PAUSE,
|
|
|
|
STREAM_PLAY
|
|
|
|
} stream_status_t;
|
|
|
|
|
|
|
|
typedef struct snd_codec_s snd_codec_t;
|
|
|
|
|
|
|
|
typedef struct snd_stream_s
|
|
|
|
{
|
|
|
|
fshandle_t fh;
|
|
|
|
qboolean pak;
|
|
|
|
snd_info_t info;
|
|
|
|
stream_status_t status;
|
|
|
|
snd_codec_t *codec; /* codec handling this stream */
|
|
|
|
void *priv; /* data private to the codec. */
|
|
|
|
} snd_stream_t;
|
|
|
|
|
|
|
|
|
|
|
|
void S_CodecInit (void);
|
|
|
|
void S_CodecShutdown (void);
|
|
|
|
|
|
|
|
/* Callers of the following S_CodecOpenStream* functions
|
|
|
|
* are reponsible for attaching any path to the filename */
|
|
|
|
|
|
|
|
snd_stream_t *S_CodecOpenStreamType (const char *filename, unsigned int type);
|
|
|
|
/* Decides according to the required type. */
|
|
|
|
|
|
|
|
snd_stream_t *S_CodecOpenStreamAny (const char *filename);
|
|
|
|
/* Decides according to file extension. if the
|
|
|
|
* name has no extension, try all available. */
|
|
|
|
|
|
|
|
snd_stream_t *S_CodecOpenStreamExt (const char *filename);
|
|
|
|
/* Decides according to file extension. the name
|
|
|
|
* MUST have an extension. */
|
|
|
|
|
|
|
|
void S_CodecCloseStream (snd_stream_t *stream);
|
|
|
|
int S_CodecReadStream (snd_stream_t *stream, int bytes, void *buffer);
|
|
|
|
int S_CodecRewindStream (snd_stream_t *stream);
|
|
|
|
|
|
|
|
snd_stream_t *S_CodecUtilOpen(const char *filename, snd_codec_t *codec);
|
|
|
|
void S_CodecUtilClose(snd_stream_t **stream);
|
|
|
|
|
|
|
|
|
|
|
|
#define CODECTYPE_NONE 0
|
2011-06-13 12:41:00 +00:00
|
|
|
#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)
|
Backported external music files support using decoder libraries and the
new raw samples interface from Hammer of Thyrion (uhexen2) :
- bgmusic.c, bgmusic.h: New BGM interface for background music handling.
Handles streaming music as raw sound samples.
- bgmnull.c: BGM source for cases where the engine is configured for no
sound.
- cl_main.c: Include bgmusic.h. Call BGM_Stop() and CDAudio_Stop() in
CL_Disconnect().
- cd_sdl.c: Moved bgmvolume boundary checking to bgmusic.c upon value
changes.
- gl_vidnt.c, gl_vidsdl.c, cl_parse.c: Include bgmusic.h. Add BGM_Pause()
and BGM_Resume() calls along with CDAudio_ counterparts.
- cl_parse.c: Replace CDAudio_Play() call by the new BGM_PlayCDtrack()
which first tries CDAudio_Play() and then streaming music if it fails.
- host.c: Include bgmusic.h. Call BGM_Update() just before S_Update()
in Host_Frame(). In Host_Init(), call BGM_Init() after other audio init
calls. In Host_Shutdown(), call BGM_Shutdown() before all other audio
shutdown calls.
- snd_dma.c: Include snd_codec.h and bgmusic.h. Call S_CodecInit() from
S_Init(). Call S_CodecShutdown() from S_Shutdown().
- snd_codec.c, snd_codec.h: New public codec interface for streaming
music as raw samples. Adapted from quake2 and ioquake3 with changes.
Individual codecs are responsible for handling any necessary byte swap
operations.
- snd_codeci.h: New header for snd_codec internals.
- snd_wave.c, snd_wave.h: Codec for WAV format streaming music. Adapted
from ioquake3 with changes.
- snd_vorbis.c, snd_vorbis.h: Codec for Ogg/Vorbis format streaming music.
- snd_mp3.c, snd_mp3.h: Codec for MP3 format streaming music using libmad.
Adapted from the SoX project with changes.
- Makefile: Adjusted for the new sources. Added switches USE_CODEC_WAVE,
USE_CODEC_MP3, USE_CODEC_VORBIS for enabling and disabling individual
codecs.
- Windows makefiles and project files as well as other CodeBlocks project
files will be updated shortly.
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@374 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-05 19:50:43 +00:00
|
|
|
|
|
|
|
#define CODECTYPE_VORBIS CODECTYPE_OGG
|
|
|
|
#define CODECTYPE_WAVE CODECTYPE_WAV
|
|
|
|
#define CODECTYPE_MIDI CODECTYPE_MID
|
|
|
|
|
|
|
|
int S_CodecIsAvailable (unsigned int type);
|
|
|
|
/* return 1 if available, 0 if codec failed init
|
|
|
|
* or -1 if no such codec is present. */
|
|
|
|
|
|
|
|
#endif /* _SND_CODEC_H_ */
|
|
|
|
|