qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge in the now obsolete snd_common.c

This commit is contained in:
Adam Olsen 2001-06-10 14:25:19 +00:00
parent f094db3977
commit 4486925f11
3 changed files with 10 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/audio/Makefile.am
View File

@ -9,7 +9,7 @@ lib_LTLIBRARIES= @CD_TARGETS@ @SND_TARGETS@
EXTRA_LTLIBRARIES= libQFsound.la libQFcd.la
libQFsound_la_LDFLAGS= -version-info 1:0:0
libQFsound_la_SOURCES= snd_common.c snd.c
libQFsound_la_SOURCES= snd.c
libQFsound.la: $(libQFsound_la_OBJECTS) $(libQFsound_la_DEPENDENCIES)
$(LINK) -rpath $(libdir) $(libQFsound_la_LDFLAGS) $(libQFsound_la_OBJECTS) $(libQFsound_la_LIBADD) $(LIBS)

18
libs/audio/snd.c
View File

@ -38,16 +38,16 @@
// Various variables also defined in snd_dma.c
// FIXME - should be put in one place
// =======================================================================
extern channel_t channels[MAX_CHANNELS];
extern int total_channels;
extern volatile dma_t *shm;
extern cvar_t *loadas8bit;
extern int paintedtime; // sample PAIRS
extern qboolean snd_initialized;
channel_t channels[MAX_CHANNELS];
int total_channels;
volatile dma_t *shm = 0;
cvar_t *loadas8bit;
int paintedtime; // sample PAIRS
qboolean snd_initialized = false;
extern cvar_t *bgmvolume;
extern cvar_t *volume;
extern cvar_t *snd_interp;
cvar_t *bgmvolume;
cvar_t *volume;
cvar_t *snd_interp;
cvar_t *snd_plugin;
plugin_t *sndmodule = NULL;

44
libs/audio/snd_common.c
View File

@ -1,44 +0,0 @@
/*
snd_common.c
common externally visible sound variables
Copyright (C) 1996-1997 Id Software, Inc.
Copyright (C) 1999,2000 contributors of the QuakeForge project
Please see the file "AUTHORS" for a list of contributors
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:
Free Software Foundation, Inc.
59 Temple Place - Suite 330
Boston, MA 02111-1307, USA
$Id$
*/
#include "QF/cvar.h"
#include "QF/sound.h"
channel_t channels[MAX_CHANNELS];
int total_channels;
volatile dma_t *shm = 0;
cvar_t *loadas8bit;
int paintedtime; // sample PAIRS
qboolean snd_initialized = false;
cvar_t *bgmvolume;
cvar_t *volume;
cvar_t *snd_interp;