From 9b81e4ff7fd032fc567a719c10729379a1f6191a Mon Sep 17 00:00:00 2001 From: Jamie Wilkinson Date: Sat, 13 Apr 2002 03:27:39 +0000 Subject: [PATCH] - Updated README - cosmetic changes to comments in snd.c and snd_dma.c --- README | 5 ++--- src/snd.c | 8 -------- src/snd_dma.c | 42 ++++++++++++++++++++++-------------------- 3 files changed, 24 insertions(+), 31 deletions(-) diff --git a/README b/README index 29430e9..04f1396 100644 --- a/README +++ b/README @@ -1,9 +1,8 @@ If you are checking this out from CVS, run the bootstrap command first to set up configure. Then follow the instructions in INSTALL. -*** HARD HAT AREA *** -I am halfway through migrating the codebase to use autotools, so not everything -will build just yet. Please be patient. +Use --disable-asm on the configure line if you want to use the software +refreshers on i386, or better yet, fix the bug in the asm! Note to developers: bsd/, irix/ and solaris/ are NO LONGER PERTINENT! The relevant code was merged into src/ along with the linux/ subtree, so do diff --git a/src/snd.c b/src/snd.c index b2f3e9c..c187099 100644 --- a/src/snd.c +++ b/src/snd.c @@ -501,14 +501,6 @@ int SNDDMA_GetDMAPos(void) { */ void SNDDMA_Shutdown(void) { printf ("SNDDMA_Shutdown\n"); -#if 0 - if (snd_inited) - { - close(audio_fd); - audio_fd = -1; - snd_inited = 0; - } -#endif /* merged in from snd_irix.c -- jaq */ #ifdef __sgi if (sgisnd_aport) { diff --git a/src/snd_dma.c b/src/snd_dma.c index eba0b77..082ae31 100644 --- a/src/snd_dma.c +++ b/src/snd_dma.c @@ -1,23 +1,25 @@ -/* -Copyright (C) 1997-2001 Id Software, Inc. - -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. - -*/ -// snd_dma.c -- main control for any streaming sound output device +/* $Id$ + * + * main control for any streaming sound output device + * + * Copyright (C) 1997-2001 Id Software, Inc. + * Copyright (c) 2002 The Quakeforge Project. + * + * 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. + */ #include "client.h" #include "snd_loc.h"