2010-02-15 23:26:55 +00:00
|
|
|
/*
|
|
|
|
Copyright (C) 1996-2001 Id Software, Inc.
|
|
|
|
Copyright (C) 2002-2009 John Fitzgibbons and others
|
|
|
|
Copyright (C) 2007-2008 Kristian Duske
|
2011-01-30 21:34:12 +00:00
|
|
|
Copyright (C) 2010-2011 O. Sezer <sezero@users.sourceforge.net>
|
2010-02-15 23:26:55 +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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
|
|
|
|
*/
|
2011-12-28 22:40:15 +00:00
|
|
|
|
2010-02-15 23:26:55 +00:00
|
|
|
// snd_dma.c -- main control for any streaming sound output device
|
|
|
|
|
|
|
|
#include "quakedef.h"
|
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: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@374 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-05 19:50:43 +00:00
|
|
|
#include "snd_codec.h"
|
|
|
|
#include "bgmusic.h"
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static void S_Play (void);
|
|
|
|
static void S_PlayVol (void);
|
|
|
|
static void S_SoundList (void);
|
|
|
|
static void S_Update_ (void);
|
|
|
|
void S_StopAllSounds (qboolean clear);
|
|
|
|
static void S_StopAllSoundsC (void);
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
// =======================================================================
|
|
|
|
// Internal sound data & structures
|
|
|
|
// =======================================================================
|
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
channel_t snd_channels[MAX_CHANNELS];
|
2010-02-15 23:45:06 +00:00
|
|
|
int total_channels;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static int snd_blocked = 0;
|
|
|
|
static qboolean snd_initialized = false;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static dma_t sn;
|
2010-06-03 17:25:24 +00:00
|
|
|
volatile dma_t *shm = NULL;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
vec3_t listener_origin;
|
|
|
|
vec3_t listener_forward;
|
|
|
|
vec3_t listener_right;
|
|
|
|
vec3_t listener_up;
|
2010-06-03 17:25:24 +00:00
|
|
|
|
|
|
|
#define sound_nominal_clip_dist 1000.0
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-02-15 23:45:06 +00:00
|
|
|
int soundtime; // sample PAIRS
|
2010-06-03 17:25:24 +00:00
|
|
|
int paintedtime; // sample PAIRS
|
2010-02-15 23:26:55 +00:00
|
|
|
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
int s_rawend;
|
|
|
|
portable_samplepair_t s_rawsamples[MAX_RAW_SAMPLES];
|
|
|
|
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
#define MAX_SFX 512
|
2010-12-30 21:10:26 +00:00
|
|
|
static sfx_t *known_sfx = NULL; // hunk allocated [MAX_SFX]
|
|
|
|
static int num_sfx;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static sfx_t *ambient_sfx[NUM_AMBIENTS];
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static qboolean sound_started = false;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2011-12-28 22:01:33 +00:00
|
|
|
cvar_t bgmvolume = {"bgmvolume", "1", CVAR_ARCHIVE};
|
|
|
|
cvar_t sfxvolume = {"volume", "0.7", CVAR_ARCHIVE};
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
|
2011-12-28 22:01:33 +00:00
|
|
|
cvar_t precache = {"precache", "1", CVAR_NONE};
|
|
|
|
cvar_t loadas8bit = {"loadas8bit", "0", CVAR_NONE};
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2011-12-28 22:01:33 +00:00
|
|
|
cvar_t sndspeed = {"sndspeed", "11025", CVAR_NONE};
|
2014-08-05 05:40:34 +00:00
|
|
|
cvar_t snd_mixspeed = {"snd_mixspeed", "44100", CVAR_NONE};
|
|
|
|
|
|
|
|
#if defined(_WIN32)
|
|
|
|
#define SND_FILTERQUALITY_DEFAULT "5"
|
|
|
|
#else
|
|
|
|
#define SND_FILTERQUALITY_DEFAULT "1"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
cvar_t snd_filterquality = {"snd_filterquality", SND_FILTERQUALITY_DEFAULT,
|
|
|
|
CVAR_NONE};
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2011-12-28 22:01:33 +00:00
|
|
|
static cvar_t nosound = {"nosound", "0", CVAR_NONE};
|
|
|
|
static cvar_t ambient_level = {"ambient_level", "0.3", CVAR_NONE};
|
|
|
|
static cvar_t ambient_fade = {"ambient_fade", "100", CVAR_NONE};
|
|
|
|
static cvar_t snd_noextraupdate = {"snd_noextraupdate", "0", CVAR_NONE};
|
|
|
|
static cvar_t snd_show = {"snd_show", "0", CVAR_NONE};
|
|
|
|
static cvar_t _snd_mixahead = {"_snd_mixahead", "0.1", CVAR_ARCHIVE};
|
2010-12-30 21:10:26 +00:00
|
|
|
|
|
|
|
|
|
|
|
static void S_SoundInfo_f (void)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
if (!sound_started || !shm)
|
|
|
|
{
|
|
|
|
Con_Printf ("sound system not started\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2010-02-15 23:45:06 +00:00
|
|
|
Con_Printf("%d bit, %s, %d Hz\n", shm->samplebits,
|
|
|
|
(shm->channels == 2) ? "stereo" : "mono", shm->speed);
|
|
|
|
Con_Printf("%5d samples\n", shm->samples);
|
|
|
|
Con_Printf("%5d samplepos\n", shm->samplepos);
|
|
|
|
Con_Printf("%5d submission_chunk\n", shm->submission_chunk);
|
2010-02-15 23:26:55 +00:00
|
|
|
Con_Printf("%5d total_channels\n", total_channels);
|
2010-02-15 23:45:06 +00:00
|
|
|
Con_Printf("%p dma buffer\n", shm->buffer);
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2011-12-28 22:40:15 +00:00
|
|
|
static void SND_Callback_sfxvolume (cvar_t *var)
|
|
|
|
{
|
|
|
|
SND_InitScaletable ();
|
|
|
|
}
|
|
|
|
|
2014-08-05 05:40:34 +00:00
|
|
|
static void SND_Callback_snd_filterquality (cvar_t *var)
|
|
|
|
{
|
|
|
|
if (snd_filterquality.value < 1 || snd_filterquality.value > 5)
|
|
|
|
{
|
|
|
|
Con_Printf ("snd_filterquality must be between 1 and 5\n");
|
|
|
|
Cvar_SetQuick (&snd_filterquality, SND_FILTERQUALITY_DEFAULT);
|
|
|
|
}
|
|
|
|
}
|
2011-12-28 22:40:15 +00:00
|
|
|
|
2010-02-15 23:26:55 +00:00
|
|
|
/*
|
|
|
|
================
|
|
|
|
S_Startup
|
|
|
|
================
|
|
|
|
*/
|
|
|
|
void S_Startup (void)
|
|
|
|
{
|
|
|
|
if (!snd_initialized)
|
|
|
|
return;
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
sound_started = SNDDMA_Init(&sn);
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-02-15 23:45:06 +00:00
|
|
|
if (!sound_started)
|
|
|
|
{
|
|
|
|
Con_Printf("Failed initializing sound\n");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
Con_Printf("Audio: %d bit, %s, %d Hz\n",
|
|
|
|
shm->samplebits,
|
|
|
|
(shm->channels == 2) ? "stereo" : "mono",
|
|
|
|
shm->speed);
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
================
|
|
|
|
S_Init
|
|
|
|
================
|
|
|
|
*/
|
|
|
|
void S_Init (void)
|
|
|
|
{
|
2011-04-19 18:29:41 +00:00
|
|
|
int i;
|
|
|
|
|
2010-02-15 23:45:06 +00:00
|
|
|
if (snd_initialized)
|
|
|
|
{
|
|
|
|
Con_Printf("Sound is already initialized\n");
|
2010-02-15 23:26:55 +00:00
|
|
|
return;
|
2010-02-15 23:45:06 +00:00
|
|
|
}
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2011-12-28 22:01:33 +00:00
|
|
|
Cvar_RegisterVariable(&nosound);
|
|
|
|
Cvar_RegisterVariable(&sfxvolume);
|
|
|
|
Cvar_RegisterVariable(&precache);
|
|
|
|
Cvar_RegisterVariable(&loadas8bit);
|
|
|
|
Cvar_RegisterVariable(&bgmvolume);
|
|
|
|
Cvar_RegisterVariable(&ambient_level);
|
|
|
|
Cvar_RegisterVariable(&ambient_fade);
|
|
|
|
Cvar_RegisterVariable(&snd_noextraupdate);
|
|
|
|
Cvar_RegisterVariable(&snd_show);
|
|
|
|
Cvar_RegisterVariable(&_snd_mixahead);
|
|
|
|
Cvar_RegisterVariable(&sndspeed);
|
2014-08-05 05:40:34 +00:00
|
|
|
Cvar_RegisterVariable(&snd_mixspeed);
|
|
|
|
Cvar_RegisterVariable(&snd_filterquality);
|
|
|
|
|
2010-08-29 12:55:41 +00:00
|
|
|
if (safemode || COM_CheckParm("-nosound"))
|
2010-02-15 23:45:06 +00:00
|
|
|
return;
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
Con_Printf("\nSound Initialization\n");
|
2010-02-15 23:45:06 +00:00
|
|
|
|
|
|
|
Cmd_AddCommand("play", S_Play);
|
|
|
|
Cmd_AddCommand("playvol", S_PlayVol);
|
|
|
|
Cmd_AddCommand("stopsound", S_StopAllSoundsC);
|
|
|
|
Cmd_AddCommand("soundlist", S_SoundList);
|
|
|
|
Cmd_AddCommand("soundinfo", S_SoundInfo_f);
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2011-04-19 18:29:41 +00:00
|
|
|
i = COM_CheckParm("-sndspeed");
|
|
|
|
if (i && i < com_argc-1)
|
2010-06-03 17:25:24 +00:00
|
|
|
{
|
2011-12-29 21:21:11 +00:00
|
|
|
Cvar_SetQuick (&sndspeed, com_argv[i+1]);
|
2010-06-03 17:25:24 +00:00
|
|
|
}
|
2014-08-05 05:40:34 +00:00
|
|
|
|
|
|
|
i = COM_CheckParm("-mixspeed");
|
|
|
|
if (i && i < com_argc-1)
|
|
|
|
{
|
|
|
|
Cvar_SetQuick (&snd_mixspeed, com_argv[i+1]);
|
|
|
|
}
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2011-04-19 16:41:45 +00:00
|
|
|
if (host_parms->memsize < 0x800000)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2011-12-29 21:21:11 +00:00
|
|
|
Cvar_SetQuick (&loadas8bit, "1");
|
2010-02-15 23:26:55 +00:00
|
|
|
Con_Printf ("loading all sounds as 8bit\n");
|
|
|
|
}
|
|
|
|
|
2011-12-28 22:40:15 +00:00
|
|
|
Cvar_SetCallback(&sfxvolume, SND_Callback_sfxvolume);
|
2014-08-05 05:40:34 +00:00
|
|
|
Cvar_SetCallback(&snd_filterquality, &SND_Callback_snd_filterquality);
|
2011-12-28 22:40:15 +00:00
|
|
|
|
2010-02-15 23:26:55 +00:00
|
|
|
SND_InitScaletable ();
|
|
|
|
|
host_cmd.c, console.c, gl_draw.c, image.c, gl_model.c, r_sprite.c, cl_parse.c,
gl_warp.c, host.c, gl_mesh.c, gl_sky.c, gl_texmgr.c, cvar.c, sv_main.c, cvar.h,
gl_screen.c, r_brush.c, gl_vidsdl.c, zone.c, cl_main.c, cmd.c, snd_dma.c,
snd_mem.c, common.c, sv_phys.c: Added explicit casts to eliminate -Wc++-compat
warnings.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@170 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-05-31 07:42:36 +00:00
|
|
|
known_sfx = (sfx_t *) Hunk_AllocName (MAX_SFX*sizeof(sfx_t), "sfx_t");
|
2010-02-15 23:26:55 +00:00
|
|
|
num_sfx = 0;
|
|
|
|
|
2010-02-15 23:45:06 +00:00
|
|
|
snd_initialized = true;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-02-15 23:45:06 +00:00
|
|
|
S_Startup ();
|
|
|
|
if (sound_started == 0)
|
|
|
|
return;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
// provides a tick sound until washed clean
|
2010-02-15 23:26:55 +00:00
|
|
|
// if (shm->buffer)
|
|
|
|
// shm->buffer[4] = shm->buffer[5] = 0x7f; // force a pop for debugging
|
|
|
|
|
|
|
|
ambient_sfx[AMBIENT_WATER] = S_PrecacheSound ("ambience/water1.wav");
|
|
|
|
ambient_sfx[AMBIENT_SKY] = S_PrecacheSound ("ambience/wind2.wav");
|
|
|
|
|
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: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@374 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-05 19:50:43 +00:00
|
|
|
S_CodecInit ();
|
|
|
|
|
2010-02-15 23:26:55 +00:00
|
|
|
S_StopAllSounds (true);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// =======================================================================
|
|
|
|
// Shutdown sound engine
|
|
|
|
// =======================================================================
|
2010-06-03 17:25:24 +00:00
|
|
|
void S_Shutdown (void)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
if (!sound_started)
|
|
|
|
return;
|
|
|
|
|
|
|
|
sound_started = 0;
|
2010-02-15 23:45:06 +00:00
|
|
|
snd_blocked = 0;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
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: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@374 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-05 19:50:43 +00:00
|
|
|
S_CodecShutdown();
|
|
|
|
|
2010-02-15 23:45:06 +00:00
|
|
|
SNDDMA_Shutdown();
|
|
|
|
shm = NULL;
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// =======================================================================
|
|
|
|
// Load a sound
|
|
|
|
// =======================================================================
|
|
|
|
|
|
|
|
/*
|
|
|
|
==================
|
|
|
|
S_FindName
|
|
|
|
|
|
|
|
==================
|
|
|
|
*/
|
2010-12-30 21:10:26 +00:00
|
|
|
static sfx_t *S_FindName (const char *name)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
sfx_t *sfx;
|
|
|
|
|
|
|
|
if (!name)
|
2010-02-15 23:45:06 +00:00
|
|
|
Sys_Error ("S_FindName: NULL");
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
if (Q_strlen(name) >= MAX_QPATH)
|
|
|
|
Sys_Error ("Sound name too long: %s", name);
|
|
|
|
|
|
|
|
// see if already loaded
|
2010-06-03 17:25:24 +00:00
|
|
|
for (i = 0; i < num_sfx; i++)
|
2010-02-15 23:45:06 +00:00
|
|
|
{
|
2010-02-15 23:26:55 +00:00
|
|
|
if (!Q_strcmp(known_sfx[i].name, name))
|
|
|
|
{
|
|
|
|
return &known_sfx[i];
|
|
|
|
}
|
2010-02-15 23:45:06 +00:00
|
|
|
}
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
if (num_sfx == MAX_SFX)
|
|
|
|
Sys_Error ("S_FindName: out of sfx_t");
|
|
|
|
|
|
|
|
sfx = &known_sfx[i];
|
2011-12-27 13:15:31 +00:00
|
|
|
q_strlcpy (sfx->name, name, sizeof(sfx->name));
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
num_sfx++;
|
|
|
|
|
|
|
|
return sfx;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
==================
|
|
|
|
S_TouchSound
|
|
|
|
|
|
|
|
==================
|
|
|
|
*/
|
2010-08-29 02:22:55 +00:00
|
|
|
void S_TouchSound (const char *name)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
sfx_t *sfx;
|
|
|
|
|
|
|
|
if (!sound_started)
|
|
|
|
return;
|
|
|
|
|
|
|
|
sfx = S_FindName (name);
|
|
|
|
Cache_Check (&sfx->cache);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
==================
|
|
|
|
S_PrecacheSound
|
|
|
|
|
|
|
|
==================
|
|
|
|
*/
|
2010-08-29 02:22:55 +00:00
|
|
|
sfx_t *S_PrecacheSound (const char *name)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
sfx_t *sfx;
|
|
|
|
|
|
|
|
if (!sound_started || nosound.value)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
sfx = S_FindName (name);
|
|
|
|
|
|
|
|
// cache it in
|
|
|
|
if (precache.value)
|
|
|
|
S_LoadSound (sfx);
|
|
|
|
|
|
|
|
return sfx;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//=============================================================================
|
|
|
|
|
|
|
|
/*
|
|
|
|
=================
|
|
|
|
SND_PickChannel
|
2010-06-03 17:25:24 +00:00
|
|
|
|
|
|
|
picks a channel based on priorities, empty slots, number of channels
|
2010-02-15 23:26:55 +00:00
|
|
|
=================
|
|
|
|
*/
|
2010-06-03 17:25:24 +00:00
|
|
|
channel_t *SND_PickChannel (int entnum, int entchannel)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
int ch_idx;
|
|
|
|
int first_to_die;
|
|
|
|
int life_left;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
// Check for replacement sound, or find the best one to replace
|
2010-06-03 17:25:24 +00:00
|
|
|
first_to_die = -1;
|
|
|
|
life_left = 0x7fffffff;
|
|
|
|
for (ch_idx = NUM_AMBIENTS; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS; ch_idx++)
|
|
|
|
{
|
2010-02-15 23:26:55 +00:00
|
|
|
if (entchannel != 0 // channel 0 never overrides
|
2010-06-03 17:25:24 +00:00
|
|
|
&& snd_channels[ch_idx].entnum == entnum
|
|
|
|
&& (snd_channels[ch_idx].entchannel == entchannel || entchannel == -1) )
|
|
|
|
{ // always override sound from same entity
|
2010-02-15 23:26:55 +00:00
|
|
|
first_to_die = ch_idx;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
// don't let monster sounds override player sounds
|
2010-06-03 17:25:24 +00:00
|
|
|
if (snd_channels[ch_idx].entnum == cl.viewentity && entnum != cl.viewentity && snd_channels[ch_idx].sfx)
|
2010-02-15 23:26:55 +00:00
|
|
|
continue;
|
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
if (snd_channels[ch_idx].end - paintedtime < life_left)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
life_left = snd_channels[ch_idx].end - paintedtime;
|
2010-02-15 23:26:55 +00:00
|
|
|
first_to_die = ch_idx;
|
|
|
|
}
|
2010-06-03 17:25:24 +00:00
|
|
|
}
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
if (first_to_die == -1)
|
|
|
|
return NULL;
|
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
if (snd_channels[first_to_die].sfx)
|
|
|
|
snd_channels[first_to_die].sfx = NULL;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
return &snd_channels[first_to_die];
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
=================
|
|
|
|
SND_Spatialize
|
2010-06-03 17:25:24 +00:00
|
|
|
|
|
|
|
spatializes a channel
|
2010-02-15 23:26:55 +00:00
|
|
|
=================
|
|
|
|
*/
|
2010-06-03 17:25:24 +00:00
|
|
|
void SND_Spatialize (channel_t *ch)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
vec_t dot;
|
|
|
|
vec_t dist;
|
|
|
|
vec_t lscale, rscale, scale;
|
|
|
|
vec3_t source_vec;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-02-15 23:45:06 +00:00
|
|
|
// anything coming from the view entity will always be full volume
|
2010-02-15 23:26:55 +00:00
|
|
|
if (ch->entnum == cl.viewentity)
|
|
|
|
{
|
|
|
|
ch->leftvol = ch->master_vol;
|
|
|
|
ch->rightvol = ch->master_vol;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// calculate stereo seperation and distance attenuation
|
|
|
|
VectorSubtract(ch->origin, listener_origin, source_vec);
|
|
|
|
dist = VectorNormalize(source_vec) * ch->dist_mult;
|
|
|
|
dot = DotProduct(listener_right, source_vec);
|
|
|
|
|
|
|
|
if (shm->channels == 1)
|
|
|
|
{
|
|
|
|
rscale = 1.0;
|
|
|
|
lscale = 1.0;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
rscale = 1.0 + dot;
|
|
|
|
lscale = 1.0 - dot;
|
|
|
|
}
|
|
|
|
|
|
|
|
// add in distance effect
|
|
|
|
scale = (1.0 - dist) * rscale;
|
|
|
|
ch->rightvol = (int) (ch->master_vol * scale);
|
|
|
|
if (ch->rightvol < 0)
|
|
|
|
ch->rightvol = 0;
|
|
|
|
|
|
|
|
scale = (1.0 - dist) * lscale;
|
|
|
|
ch->leftvol = (int) (ch->master_vol * scale);
|
|
|
|
if (ch->leftvol < 0)
|
|
|
|
ch->leftvol = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// =======================================================================
|
|
|
|
// Start a sound effect
|
|
|
|
// =======================================================================
|
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
void S_StartSound (int entnum, int entchannel, sfx_t *sfx, vec3_t origin, float fvol, float attenuation)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
channel_t *target_chan, *check;
|
2010-02-15 23:26:55 +00:00
|
|
|
sfxcache_t *sc;
|
|
|
|
int ch_idx;
|
|
|
|
int skip;
|
|
|
|
|
|
|
|
if (!sound_started)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!sfx)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (nosound.value)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// pick a channel to play on
|
|
|
|
target_chan = SND_PickChannel(entnum, entchannel);
|
|
|
|
if (!target_chan)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// spatialize
|
|
|
|
memset (target_chan, 0, sizeof(*target_chan));
|
|
|
|
VectorCopy(origin, target_chan->origin);
|
|
|
|
target_chan->dist_mult = attenuation / sound_nominal_clip_dist;
|
2010-02-15 23:45:06 +00:00
|
|
|
target_chan->master_vol = (int) (fvol * 255);
|
2010-02-15 23:26:55 +00:00
|
|
|
target_chan->entnum = entnum;
|
|
|
|
target_chan->entchannel = entchannel;
|
|
|
|
SND_Spatialize(target_chan);
|
|
|
|
|
|
|
|
if (!target_chan->leftvol && !target_chan->rightvol)
|
|
|
|
return; // not audible at all
|
|
|
|
|
|
|
|
// new channel
|
|
|
|
sc = S_LoadSound (sfx);
|
|
|
|
if (!sc)
|
|
|
|
{
|
|
|
|
target_chan->sfx = NULL;
|
|
|
|
return; // couldn't load the sound's data
|
|
|
|
}
|
|
|
|
|
|
|
|
target_chan->sfx = sfx;
|
|
|
|
target_chan->pos = 0.0;
|
2010-06-03 17:25:24 +00:00
|
|
|
target_chan->end = paintedtime + sc->length;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
// if an identical sound has also been started this frame, offset the pos
|
|
|
|
// a bit to keep it from just making the first one louder
|
2010-06-03 17:25:24 +00:00
|
|
|
check = &snd_channels[NUM_AMBIENTS];
|
|
|
|
for (ch_idx = NUM_AMBIENTS; ch_idx < NUM_AMBIENTS + MAX_DYNAMIC_CHANNELS; ch_idx++, check++)
|
|
|
|
{
|
2010-02-15 23:26:55 +00:00
|
|
|
if (check == target_chan)
|
|
|
|
continue;
|
|
|
|
if (check->sfx == sfx && !check->pos)
|
|
|
|
{
|
2010-12-30 21:10:26 +00:00
|
|
|
/*
|
|
|
|
skip = rand () % (int)(0.1 * shm->speed);
|
2010-02-15 23:26:55 +00:00
|
|
|
if (skip >= target_chan->end)
|
|
|
|
skip = target_chan->end - 1;
|
2010-12-30 21:10:26 +00:00
|
|
|
*/
|
|
|
|
/* LordHavoc: fixed skip calculations */
|
|
|
|
skip = 0.1 * shm->speed; /* 0.1 * sc->speed */
|
|
|
|
if (skip > sc->length)
|
|
|
|
skip = sc->length;
|
|
|
|
if (skip > 0)
|
|
|
|
skip = rand() % skip;
|
2010-02-15 23:26:55 +00:00
|
|
|
target_chan->pos += skip;
|
|
|
|
target_chan->end -= skip;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
void S_StopSound (int entnum, int entchannel)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
int i;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
for (i = 0; i < MAX_DYNAMIC_CHANNELS; i++)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
if (snd_channels[i].entnum == entnum
|
|
|
|
&& snd_channels[i].entchannel == entchannel)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
snd_channels[i].end = 0;
|
|
|
|
snd_channels[i].sfx = NULL;
|
2010-02-15 23:26:55 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
void S_StopAllSounds (qboolean clear)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!sound_started)
|
|
|
|
return;
|
|
|
|
|
|
|
|
total_channels = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS; // no statics
|
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
for (i = 0; i < MAX_CHANNELS; i++)
|
2010-02-15 23:45:06 +00:00
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
if (snd_channels[i].sfx)
|
|
|
|
snd_channels[i].sfx = NULL;
|
2010-02-15 23:45:06 +00:00
|
|
|
}
|
2010-02-15 23:26:55 +00:00
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
memset(snd_channels, 0, MAX_CHANNELS * sizeof(channel_t));
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
if (clear)
|
|
|
|
S_ClearBuffer ();
|
|
|
|
}
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static void S_StopAllSoundsC (void)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
S_StopAllSounds (true);
|
|
|
|
}
|
|
|
|
|
|
|
|
void S_ClearBuffer (void)
|
|
|
|
{
|
|
|
|
int clear;
|
|
|
|
|
2010-02-15 23:45:06 +00:00
|
|
|
if (!sound_started || !shm)
|
|
|
|
return;
|
|
|
|
|
|
|
|
SNDDMA_LockBuffer ();
|
|
|
|
if (! shm->buffer)
|
2010-02-15 23:26:55 +00:00
|
|
|
return;
|
|
|
|
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
s_rawend = 0;
|
|
|
|
|
2012-06-25 12:50:09 +00:00
|
|
|
if (shm->samplebits == 8 && !shm->signed8)
|
2010-02-15 23:26:55 +00:00
|
|
|
clear = 0x80;
|
|
|
|
else
|
|
|
|
clear = 0;
|
|
|
|
|
2010-02-15 23:45:06 +00:00
|
|
|
memset(shm->buffer, clear, shm->samples * shm->samplebits / 8);
|
|
|
|
|
|
|
|
SNDDMA_Submit ();
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
=================
|
|
|
|
S_StaticSound
|
|
|
|
=================
|
|
|
|
*/
|
|
|
|
void S_StaticSound (sfx_t *sfx, vec3_t origin, float vol, float attenuation)
|
|
|
|
{
|
|
|
|
channel_t *ss;
|
|
|
|
sfxcache_t *sc;
|
|
|
|
|
|
|
|
if (!sfx)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (total_channels == MAX_CHANNELS)
|
|
|
|
{
|
|
|
|
Con_Printf ("total_channels == MAX_CHANNELS\n");
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
ss = &snd_channels[total_channels];
|
2010-02-15 23:26:55 +00:00
|
|
|
total_channels++;
|
|
|
|
|
|
|
|
sc = S_LoadSound (sfx);
|
|
|
|
if (!sc)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (sc->loopstart == -1)
|
|
|
|
{
|
|
|
|
Con_Printf ("Sound %s not looped\n", sfx->name);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
ss->sfx = sfx;
|
|
|
|
VectorCopy (origin, ss->origin);
|
2010-06-03 17:25:24 +00:00
|
|
|
ss->master_vol = (int)vol;
|
|
|
|
ss->dist_mult = (attenuation / 64) / sound_nominal_clip_dist;
|
|
|
|
ss->end = paintedtime + sc->length;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
SND_Spatialize (ss);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//=============================================================================
|
|
|
|
|
|
|
|
/*
|
|
|
|
===================
|
|
|
|
S_UpdateAmbientSounds
|
|
|
|
===================
|
|
|
|
*/
|
2010-12-30 21:10:26 +00:00
|
|
|
static void S_UpdateAmbientSounds (void)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
mleaf_t *l;
|
2010-06-03 17:25:24 +00:00
|
|
|
int vol, ambient_channel;
|
2010-02-15 23:26:55 +00:00
|
|
|
channel_t *chan;
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
// no ambients when disconnected
|
2010-02-15 23:26:55 +00:00
|
|
|
if (cls.state != ca_connected)
|
|
|
|
return;
|
|
|
|
// calc ambient sound levels
|
|
|
|
if (!cl.worldmodel)
|
|
|
|
return;
|
|
|
|
|
|
|
|
l = Mod_PointInLeaf (listener_origin, cl.worldmodel);
|
|
|
|
if (!l || !ambient_level.value)
|
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
for (ambient_channel = 0; ambient_channel < NUM_AMBIENTS; ambient_channel++)
|
|
|
|
snd_channels[ambient_channel].sfx = NULL;
|
2010-02-15 23:26:55 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
for (ambient_channel = 0; ambient_channel < NUM_AMBIENTS; ambient_channel++)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
chan = &snd_channels[ambient_channel];
|
2010-02-15 23:26:55 +00:00
|
|
|
chan->sfx = ambient_sfx[ambient_channel];
|
|
|
|
|
2010-06-03 17:25:24 +00:00
|
|
|
vol = (int) (ambient_level.value * l->ambient_sound_level[ambient_channel]);
|
2010-02-15 23:26:55 +00:00
|
|
|
if (vol < 8)
|
|
|
|
vol = 0;
|
|
|
|
|
|
|
|
// don't adjust volume too fast
|
|
|
|
if (chan->master_vol < vol)
|
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
chan->master_vol += (int) (host_frametime * ambient_fade.value);
|
2010-02-15 23:26:55 +00:00
|
|
|
if (chan->master_vol > vol)
|
|
|
|
chan->master_vol = vol;
|
|
|
|
}
|
|
|
|
else if (chan->master_vol > vol)
|
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
chan->master_vol -= (int) (host_frametime * ambient_fade.value);
|
2010-02-15 23:26:55 +00:00
|
|
|
if (chan->master_vol < vol)
|
|
|
|
chan->master_vol = vol;
|
|
|
|
}
|
|
|
|
|
|
|
|
chan->leftvol = chan->rightvol = chan->master_vol;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
/*
|
|
|
|
===================
|
|
|
|
S_RawSamples (from QuakeII)
|
|
|
|
|
|
|
|
Streaming music support. Byte swapping
|
|
|
|
of data must be handled by the codec.
|
2012-06-25 12:50:09 +00:00
|
|
|
Expects data in signed 16 bit, or unsigned
|
|
|
|
8 bit format.
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
===================
|
|
|
|
*/
|
|
|
|
void S_RawSamples (int samples, int rate, int width, int channels, byte *data, float volume)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int src, dst;
|
|
|
|
float scale;
|
|
|
|
int intVolume;
|
|
|
|
|
|
|
|
if (s_rawend < paintedtime)
|
|
|
|
s_rawend = paintedtime;
|
|
|
|
|
|
|
|
scale = (float) rate / shm->speed;
|
|
|
|
intVolume = (int) (256 * volume);
|
|
|
|
|
|
|
|
if (channels == 2 && width == 2)
|
|
|
|
{
|
|
|
|
for (i = 0; ; i++)
|
|
|
|
{
|
|
|
|
src = i * scale;
|
|
|
|
if (src >= samples)
|
|
|
|
break;
|
|
|
|
dst = s_rawend & (MAX_RAW_SAMPLES - 1);
|
|
|
|
s_rawend++;
|
|
|
|
s_rawsamples [dst].left = ((short *) data)[src * 2] * intVolume;
|
|
|
|
s_rawsamples [dst].right = ((short *) data)[src * 2 + 1] * intVolume;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (channels == 1 && width == 2)
|
|
|
|
{
|
|
|
|
for (i = 0; ; i++)
|
|
|
|
{
|
|
|
|
src = i * scale;
|
|
|
|
if (src >= samples)
|
|
|
|
break;
|
|
|
|
dst = s_rawend & (MAX_RAW_SAMPLES - 1);
|
|
|
|
s_rawend++;
|
|
|
|
s_rawsamples [dst].left = ((short *) data)[src] * intVolume;
|
|
|
|
s_rawsamples [dst].right = ((short *) data)[src] * intVolume;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (channels == 2 && width == 1)
|
|
|
|
{
|
|
|
|
intVolume *= 256;
|
|
|
|
|
|
|
|
for (i = 0; ; i++)
|
|
|
|
{
|
|
|
|
src = i * scale;
|
|
|
|
if (src >= samples)
|
|
|
|
break;
|
|
|
|
dst = s_rawend & (MAX_RAW_SAMPLES - 1);
|
|
|
|
s_rawend++;
|
2012-06-25 12:50:09 +00:00
|
|
|
// s_rawsamples [dst].left = ((signed char *) data)[src * 2] * intVolume;
|
|
|
|
// s_rawsamples [dst].right = ((signed char *) data)[src * 2 + 1] * intVolume;
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
s_rawsamples [dst].left = (((byte *) data)[src * 2] - 128) * intVolume;
|
|
|
|
s_rawsamples [dst].right = (((byte *) data)[src * 2 + 1] - 128) * intVolume;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (channels == 1 && width == 1)
|
|
|
|
{
|
|
|
|
intVolume *= 256;
|
|
|
|
|
|
|
|
for (i = 0; ; i++)
|
|
|
|
{
|
|
|
|
src = i * scale;
|
|
|
|
if (src >= samples)
|
|
|
|
break;
|
|
|
|
dst = s_rawend & (MAX_RAW_SAMPLES - 1);
|
|
|
|
s_rawend++;
|
2012-06-25 12:50:09 +00:00
|
|
|
// s_rawsamples [dst].left = ((signed char *) data)[src] * intVolume;
|
|
|
|
// s_rawsamples [dst].right = ((signed char *) data)[src] * intVolume;
|
backports from uhexen2 source, preparing for streaming music support:
* snd_mix.c: Increased PAINTBUFFER_SIZE from 512 to 2048.
* snd_mix.c: snd_vol is static now. it is calculated in S_PaintChannels and
only used in SND_PaintChannelFrom16. all its other uses are removed from
Snd_WriteLinearBlastStereo16, S_TransferStereo16, S_TransferPaintBuffer.
The way it was, the sound volume was applied to the whole final contents
of the paint buffer, but with this new quake2+ way we can add raw samples
to the paint buffer with its own volume, such as bgmvolume. However, this
makes the snd_scaletable to be recalculated everytime the sfxvolume is,
changed, therefore it is adjusted that way to incorporate sfxvolume.
* snd_mix.c: In S_PaintChannels, check against s_rawend and copy from the
streaming sound source if necessary.
* snd_dma.c: Added old_volume to detect sfxvolume changes. Made S_Update to
compare it to sfxvolume.value and call SND_InitScaletable() if it changed.
* snd_dma.c: Add new globals s_rawsamples and s_rawend. Reset s_rawend to 0
in S_ClearBuffer. Add new function S_RawSamples, adapted from quake2 with
its 8 bit stereo playback fixed.
* snd_dma.c (S_FileExtension): Add new function which returns the given
sound file's extension including the dot, or NULL.
* q_sound.h: Add new macro MAX_RAW_SAMPLES, defined as 8192. Add externs
for new globals s_rawsamples and s_rawend. Add prototype for the new
S_RawSamples and S_FileExtension functions.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@355 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-12-30 17:11:28 +00:00
|
|
|
s_rawsamples [dst].left = (((byte *) data)[src] - 128) * intVolume;
|
|
|
|
s_rawsamples [dst].right = (((byte *) data)[src] - 128) * intVolume;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-02-15 23:26:55 +00:00
|
|
|
/*
|
|
|
|
============
|
|
|
|
S_Update
|
|
|
|
|
|
|
|
Called once each time through the main loop
|
|
|
|
============
|
|
|
|
*/
|
2010-06-03 17:25:24 +00:00
|
|
|
void S_Update (vec3_t origin, vec3_t forward, vec3_t right, vec3_t up)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
int total;
|
|
|
|
channel_t *ch;
|
|
|
|
channel_t *combine;
|
|
|
|
|
|
|
|
if (!sound_started || (snd_blocked > 0))
|
|
|
|
return;
|
|
|
|
|
|
|
|
VectorCopy(origin, listener_origin);
|
|
|
|
VectorCopy(forward, listener_forward);
|
|
|
|
VectorCopy(right, listener_right);
|
|
|
|
VectorCopy(up, listener_up);
|
|
|
|
|
|
|
|
// update general area ambient sound sources
|
|
|
|
S_UpdateAmbientSounds ();
|
|
|
|
|
|
|
|
combine = NULL;
|
|
|
|
|
|
|
|
// update spatialization for static and dynamic sounds
|
2010-06-03 17:25:24 +00:00
|
|
|
ch = snd_channels + NUM_AMBIENTS;
|
|
|
|
for (i = NUM_AMBIENTS; i < total_channels; i++, ch++)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
if (!ch->sfx)
|
|
|
|
continue;
|
2010-06-03 17:25:24 +00:00
|
|
|
SND_Spatialize(ch); // respatialize channel
|
2010-02-15 23:26:55 +00:00
|
|
|
if (!ch->leftvol && !ch->rightvol)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
// try to combine static sounds with a previous channel of the same
|
|
|
|
// sound effect so we don't mix five torches every frame
|
|
|
|
|
|
|
|
if (i >= MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS)
|
|
|
|
{
|
|
|
|
// see if it can just use the last one
|
|
|
|
if (combine && combine->sfx == ch->sfx)
|
|
|
|
{
|
|
|
|
combine->leftvol += ch->leftvol;
|
|
|
|
combine->rightvol += ch->rightvol;
|
|
|
|
ch->leftvol = ch->rightvol = 0;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
// search for one
|
2010-06-03 17:25:24 +00:00
|
|
|
combine = snd_channels + MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS;
|
|
|
|
for (j = MAX_DYNAMIC_CHANNELS + NUM_AMBIENTS; j < i; j++, combine++)
|
2010-02-15 23:45:06 +00:00
|
|
|
{
|
2010-02-15 23:26:55 +00:00
|
|
|
if (combine->sfx == ch->sfx)
|
|
|
|
break;
|
2010-02-15 23:45:06 +00:00
|
|
|
}
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
if (j == total_channels)
|
|
|
|
{
|
|
|
|
combine = NULL;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (combine != ch)
|
|
|
|
{
|
|
|
|
combine->leftvol += ch->leftvol;
|
|
|
|
combine->rightvol += ch->rightvol;
|
|
|
|
ch->leftvol = ch->rightvol = 0;
|
|
|
|
}
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
//
|
|
|
|
// debugging output
|
|
|
|
//
|
|
|
|
if (snd_show.value)
|
|
|
|
{
|
|
|
|
total = 0;
|
2010-06-03 17:25:24 +00:00
|
|
|
ch = snd_channels;
|
|
|
|
for (i = 0; i < total_channels; i++, ch++)
|
2010-02-15 23:45:06 +00:00
|
|
|
{
|
2010-02-15 23:26:55 +00:00
|
|
|
if (ch->sfx && (ch->leftvol || ch->rightvol) )
|
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
// Con_Printf ("%3i %3i %s\n", ch->leftvol, ch->rightvol, ch->sfx->name);
|
2010-02-15 23:26:55 +00:00
|
|
|
total++;
|
|
|
|
}
|
2010-02-15 23:45:06 +00:00
|
|
|
}
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
Con_Printf ("----(%i)----\n", total);
|
|
|
|
}
|
|
|
|
|
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: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@374 af15c1b1-3010-417e-b628-4374ebc0bcbd
2011-01-05 19:50:43 +00:00
|
|
|
// add raw data from streamed samples
|
|
|
|
// BGM_Update(); // moved to the main loop just before S_Update ()
|
|
|
|
|
2010-02-15 23:26:55 +00:00
|
|
|
// mix some sound
|
|
|
|
S_Update_();
|
|
|
|
}
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static void GetSoundtime (void)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
int samplepos;
|
|
|
|
static int buffers;
|
|
|
|
static int oldsamplepos;
|
|
|
|
int fullsamples;
|
|
|
|
|
|
|
|
fullsamples = shm->samples / shm->channels;
|
|
|
|
|
|
|
|
// it is possible to miscount buffers if it has wrapped twice between
|
|
|
|
// calls to S_Update. Oh well.
|
|
|
|
samplepos = SNDDMA_GetDMAPos();
|
|
|
|
|
|
|
|
if (samplepos < oldsamplepos)
|
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
buffers++; // buffer wrapped
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
if (paintedtime > 0x40000000)
|
|
|
|
{ // time to chop things off to avoid 32 bit limits
|
|
|
|
buffers = 0;
|
|
|
|
paintedtime = fullsamples;
|
|
|
|
S_StopAllSounds (true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
oldsamplepos = samplepos;
|
|
|
|
|
|
|
|
soundtime = buffers*fullsamples + samplepos/shm->channels;
|
|
|
|
}
|
|
|
|
|
|
|
|
void S_ExtraUpdate (void)
|
|
|
|
{
|
|
|
|
if (snd_noextraupdate.value)
|
|
|
|
return; // don't pollute timings
|
|
|
|
S_Update_();
|
|
|
|
}
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static void S_Update_ (void)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-02-15 23:45:06 +00:00
|
|
|
unsigned int endtime;
|
|
|
|
int samps;
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
if (!sound_started || (snd_blocked > 0))
|
|
|
|
return;
|
|
|
|
|
2010-02-15 23:45:06 +00:00
|
|
|
SNDDMA_LockBuffer ();
|
|
|
|
if (! shm->buffer)
|
|
|
|
return;
|
|
|
|
|
2010-02-15 23:26:55 +00:00
|
|
|
// Updates DMA time
|
|
|
|
GetSoundtime();
|
|
|
|
|
|
|
|
// check to make sure that we haven't overshot
|
|
|
|
if (paintedtime < soundtime)
|
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
// Con_Printf ("S_Update_ : overflow\n");
|
2010-02-15 23:26:55 +00:00
|
|
|
paintedtime = soundtime;
|
|
|
|
}
|
|
|
|
|
|
|
|
// mix ahead of current position
|
2010-06-03 17:25:24 +00:00
|
|
|
endtime = soundtime + (unsigned int)(_snd_mixahead.value * shm->speed);
|
|
|
|
samps = shm->samples >> (shm->channels - 1);
|
2011-01-10 10:35:40 +00:00
|
|
|
endtime = q_min(endtime, (unsigned int)(soundtime + samps));
|
2010-02-15 23:26:55 +00:00
|
|
|
|
|
|
|
S_PaintChannels (endtime);
|
|
|
|
|
2010-02-15 23:45:06 +00:00
|
|
|
SNDDMA_Submit ();
|
|
|
|
}
|
|
|
|
|
|
|
|
void S_BlockSound (void)
|
|
|
|
{
|
|
|
|
/* FIXME: do we really need the blocking at the
|
|
|
|
* driver level?
|
|
|
|
*/
|
Under windows, run the game (windowed), go into a saved game,
press Esc to get the menu, minimize using the mouse on the
window's minimize icon and then restore and you'll have sound
all the same. HOWEVER: If you minimize by pressing the icon
on the start bar, sound will be lost upon restoring. Or, if
you use alt-tab to get away from the game window the same will
happen. Or, if you run the game fullscreen and use alt-tab to
go to the desktop (alt-tab is the only way I know) you will
lose the sound again. Here, we are probably are hitting an
SDL_APPACTIVE or SDL_APPINPUTFOCUS event more than once and
since the block counter goes > 1 we are not restoring properly.
For now, making snd_blocked to act as a boolean and not as a
counter fixes the issue. Hmmm...
* main_sdl.c: Revert revision 238 change, no longer necessary.
* snd_dma.c: Make snd_blocked act as a boolean and not as a
counter.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@241 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-25 12:20:17 +00:00
|
|
|
if (sound_started && snd_blocked == 0) /* ++snd_blocked == 1 */
|
2010-02-15 23:45:06 +00:00
|
|
|
{
|
Under windows, run the game (windowed), go into a saved game,
press Esc to get the menu, minimize using the mouse on the
window's minimize icon and then restore and you'll have sound
all the same. HOWEVER: If you minimize by pressing the icon
on the start bar, sound will be lost upon restoring. Or, if
you use alt-tab to get away from the game window the same will
happen. Or, if you run the game fullscreen and use alt-tab to
go to the desktop (alt-tab is the only way I know) you will
lose the sound again. Here, we are probably are hitting an
SDL_APPACTIVE or SDL_APPINPUTFOCUS event more than once and
since the block counter goes > 1 we are not restoring properly.
For now, making snd_blocked to act as a boolean and not as a
counter fixes the issue. Hmmm...
* main_sdl.c: Revert revision 238 change, no longer necessary.
* snd_dma.c: Make snd_blocked act as a boolean and not as a
counter.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@241 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-25 12:20:17 +00:00
|
|
|
snd_blocked = 1;
|
2010-02-15 23:45:06 +00:00
|
|
|
S_ClearBuffer ();
|
|
|
|
if (shm)
|
|
|
|
SNDDMA_BlockSound();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void S_UnblockSound (void)
|
|
|
|
{
|
|
|
|
if (!sound_started || !snd_blocked)
|
|
|
|
return;
|
Under windows, run the game (windowed), go into a saved game,
press Esc to get the menu, minimize using the mouse on the
window's minimize icon and then restore and you'll have sound
all the same. HOWEVER: If you minimize by pressing the icon
on the start bar, sound will be lost upon restoring. Or, if
you use alt-tab to get away from the game window the same will
happen. Or, if you run the game fullscreen and use alt-tab to
go to the desktop (alt-tab is the only way I know) you will
lose the sound again. Here, we are probably are hitting an
SDL_APPACTIVE or SDL_APPINPUTFOCUS event more than once and
since the block counter goes > 1 we are not restoring properly.
For now, making snd_blocked to act as a boolean and not as a
counter fixes the issue. Hmmm...
* main_sdl.c: Revert revision 238 change, no longer necessary.
* snd_dma.c: Make snd_blocked act as a boolean and not as a
counter.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@241 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-25 12:20:17 +00:00
|
|
|
if (snd_blocked == 1) /* --snd_blocked == 0 */
|
2010-02-15 23:45:06 +00:00
|
|
|
{
|
Under windows, run the game (windowed), go into a saved game,
press Esc to get the menu, minimize using the mouse on the
window's minimize icon and then restore and you'll have sound
all the same. HOWEVER: If you minimize by pressing the icon
on the start bar, sound will be lost upon restoring. Or, if
you use alt-tab to get away from the game window the same will
happen. Or, if you run the game fullscreen and use alt-tab to
go to the desktop (alt-tab is the only way I know) you will
lose the sound again. Here, we are probably are hitting an
SDL_APPACTIVE or SDL_APPINPUTFOCUS event more than once and
since the block counter goes > 1 we are not restoring properly.
For now, making snd_blocked to act as a boolean and not as a
counter fixes the issue. Hmmm...
* main_sdl.c: Revert revision 238 change, no longer necessary.
* snd_dma.c: Make snd_blocked act as a boolean and not as a
counter.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@241 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-07-25 12:20:17 +00:00
|
|
|
snd_blocked = 0;
|
2010-02-15 23:45:06 +00:00
|
|
|
SNDDMA_UnblockSound();
|
|
|
|
S_ClearBuffer ();
|
|
|
|
}
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
===============================================================================
|
|
|
|
|
|
|
|
console functions
|
|
|
|
|
|
|
|
===============================================================================
|
|
|
|
*/
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static void S_Play (void)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
static int hash = 345;
|
|
|
|
int i;
|
|
|
|
char name[256];
|
2010-02-15 23:26:55 +00:00
|
|
|
sfx_t *sfx;
|
|
|
|
|
|
|
|
i = 1;
|
2010-06-03 17:25:24 +00:00
|
|
|
while (i < Cmd_Argc())
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2011-12-27 13:15:31 +00:00
|
|
|
q_strlcpy(name, Cmd_Argv(i), sizeof(name));
|
2010-02-15 23:26:55 +00:00
|
|
|
if (!Q_strrchr(Cmd_Argv(i), '.'))
|
|
|
|
{
|
2011-12-27 13:15:31 +00:00
|
|
|
q_strlcat(name, ".wav", sizeof(name));
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
sfx = S_PrecacheSound(name);
|
|
|
|
S_StartSound(hash++, 0, sfx, listener_origin, 1.0, 1.0);
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static void S_PlayVol (void)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2010-06-03 17:25:24 +00:00
|
|
|
static int hash = 543;
|
|
|
|
int i;
|
|
|
|
float vol;
|
|
|
|
char name[256];
|
2010-02-15 23:26:55 +00:00
|
|
|
sfx_t *sfx;
|
|
|
|
|
|
|
|
i = 1;
|
2010-06-03 17:25:24 +00:00
|
|
|
while (i < Cmd_Argc())
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
2011-12-27 13:15:31 +00:00
|
|
|
q_strlcpy(name, Cmd_Argv(i), sizeof(name));
|
2010-02-15 23:26:55 +00:00
|
|
|
if (!Q_strrchr(Cmd_Argv(i), '.'))
|
|
|
|
{
|
2011-12-27 13:15:31 +00:00
|
|
|
q_strlcat(name, ".wav", sizeof(name));
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
sfx = S_PrecacheSound(name);
|
2010-06-03 17:25:24 +00:00
|
|
|
vol = Q_atof(Cmd_Argv(i + 1));
|
2010-02-15 23:26:55 +00:00
|
|
|
S_StartSound(hash++, 0, sfx, listener_origin, vol, 1.0);
|
2010-12-30 21:10:26 +00:00
|
|
|
i += 2;
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-12-30 21:10:26 +00:00
|
|
|
static void S_SoundList (void)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
sfx_t *sfx;
|
|
|
|
sfxcache_t *sc;
|
|
|
|
int size, total;
|
|
|
|
|
|
|
|
total = 0;
|
2010-06-03 17:25:24 +00:00
|
|
|
for (sfx = known_sfx, i = 0; i < num_sfx; i++, sfx++)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
host_cmd.c, console.c, gl_draw.c, image.c, gl_model.c, r_sprite.c, cl_parse.c,
gl_warp.c, host.c, gl_mesh.c, gl_sky.c, gl_texmgr.c, cvar.c, sv_main.c, cvar.h,
gl_screen.c, r_brush.c, gl_vidsdl.c, zone.c, cl_main.c, cmd.c, snd_dma.c,
snd_mem.c, common.c, sv_phys.c: Added explicit casts to eliminate -Wc++-compat
warnings.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@170 af15c1b1-3010-417e-b628-4374ebc0bcbd
2010-05-31 07:42:36 +00:00
|
|
|
sc = (sfxcache_t *) Cache_Check (&sfx->cache);
|
2010-02-15 23:26:55 +00:00
|
|
|
if (!sc)
|
|
|
|
continue;
|
2010-06-03 17:25:24 +00:00
|
|
|
size = sc->length*sc->width*(sc->stereo + 1);
|
2010-02-15 23:26:55 +00:00
|
|
|
total += size;
|
|
|
|
if (sc->loopstart >= 0)
|
|
|
|
Con_SafePrintf ("L"); //johnfitz -- was Con_Printf
|
|
|
|
else
|
|
|
|
Con_SafePrintf (" "); //johnfitz -- was Con_Printf
|
2010-12-30 21:10:26 +00:00
|
|
|
Con_SafePrintf("(%2db) %6i : %s\n", sc->width*8, size, sfx->name); //johnfitz -- was Con_Printf
|
2010-02-15 23:26:55 +00:00
|
|
|
}
|
|
|
|
Con_Printf ("%i sounds, %i bytes\n", num_sfx, total); //johnfitz -- added count
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2010-08-29 02:22:55 +00:00
|
|
|
void S_LocalSound (const char *name)
|
2010-02-15 23:26:55 +00:00
|
|
|
{
|
|
|
|
sfx_t *sfx;
|
|
|
|
|
|
|
|
if (nosound.value)
|
|
|
|
return;
|
|
|
|
if (!sound_started)
|
|
|
|
return;
|
|
|
|
|
2010-02-15 23:45:06 +00:00
|
|
|
sfx = S_PrecacheSound (name);
|
2010-02-15 23:26:55 +00:00
|
|
|
if (!sfx)
|
|
|
|
{
|
2010-02-15 23:45:06 +00:00
|
|
|
Con_Printf ("S_LocalSound: can't cache %s\n", name);
|
2010-02-15 23:26:55 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
S_StartSound (cl.viewentity, -1, sfx, vec3_origin, 1, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void S_ClearPrecache (void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void S_BeginPrecaching (void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void S_EndPrecaching (void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|