compile fix for somebody

Again, if this causes problems I'll see what I can do about the depreciated
warnings I'm seeing when the clients are lding

Tim McGrath
(Misty-chan)

Makefile.am

@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = include source doc RPM
+SUBDIRS = include source RPM
 
 EXTRA_DIST = tools/gas2masm/Makefile tools/gas2masm/gas2masm.c \
 	tools/gas2masm/gas2masm.dsp tools/gas2masm/gas2masm.dsw \

acconfig.h

@@ -13,9 +13,6 @@
 /* Define this to the QSG standard version you support */
 #undef QSG_VERSION
 
-/* Define if you want to use QF-style defaults instead of Id-style */
-#undef NEWSTYLE
-
 /* Define this to the location of the global config file */
 #undef FS_GLOBALCFG
 
@@ -25,9 +22,6 @@
 /* Define this to the unshared game directory root */
 #undef FS_USERPATH
 
-/* Define this to the base game for the engine to load */
-#undef BASEGAME
-
 /* Define this if you want to use Intel assembly optimizations */
 #undef USE_INTEL_ASM
 

configure.in

@@ -607,12 +607,12 @@ QF_maGiC_VALUE
 				[
 #include <sys/asoundlib.h>
 #if defined(SND_LIB_MAJOR) && defined(SND_LIB_MINOR)
-#if SND_LIB_MAJOR>0 || (SND_LIB_MAJOR==0 && SND_LIB_MINOR>=6)
+#if SND_LIB_MAJOR>0 || (SND_LIB_MAJOR==0 && SND_LIB_MINOR>=9)
 QF_maGiC_VALUE
 #endif
 #endif
 				],
-				SNDTYPE="ALSA_0_6"
+				SNDTYPE="ALSA_0_9"
 				SOUND_LIBS="-lasound"
 			)
 		)
@@ -692,12 +692,12 @@ fi
 AC_SUBST(SOUND_LIBS)
 AC_SUBST(SOUND_CFLAGS)
 AM_CONDITIONAL(SNDTYPE_ALSA_0_5, test "$SNDTYPE" = "ALSA_0_5")
-AM_CONDITIONAL(SNDTYPE_ALSA_0_6, test "$SNDTYPE" = "ALSA_0_6")
+AM_CONDITIONAL(SNDTYPE_ALSA_0_9, test "$SNDTYPE" = "ALSA_0_9")
 AM_CONDITIONAL(SNDTYPE_MME, test "$SNDTYPE" = "MME")
 AM_CONDITIONAL(SNDTYPE_OSS, test "$SNDTYPE" = "OSS")
 AM_CONDITIONAL(SNDTYPE_SUN, test "$SNDTYPE" = "SUN")
 AM_CONDITIONAL(SNDTYPE_WIN32, test "$SNDTYPE" = "WIN32")
-AM_CONDITIONAL(SNDTYPE_NULL, test "$SNDTYPE" != "ALSA_0_5" -a "$SNDTYPE" != "ALSA_0_6" -a "$SNDTYPE" != "MME" -a "$SNDTYPE" != "OSS" -a "$SNDTYPE" != "SUN" -a "$SNDTYPE" != "WIN32")
+AM_CONDITIONAL(SNDTYPE_NULL, test "$SNDTYPE" != "ALSA_0_5" -a "$SNDTYPE" != "ALSA_0_9" -a "$SNDTYPE" != "MME" -a "$SNDTYPE" != "OSS" -a "$SNDTYPE" != "SUN" -a "$SNDTYPE" != "WIN32")
 
 dnl Tests for joystick support
 AC_MSG_CHECKING(for joystick support)
@@ -776,12 +776,6 @@ AM_CONDITIONAL(CDTYPE_BSD, test "$CDTYPE" = "BSD")
 AM_CONDITIONAL(CDTYPE_WIN32, test "$CDTYPE" = "WIN32")
 AM_CONDITIONAL(CDTYPE_NULL, test "$CDTYPE" != "LINUX" -a "$CDTYPE" != "BSD" -a "$CDTYPE" != "WIN32")
 
-if test "$CDTTPE" = BSD; then
-	AC_HAVE_STRUCT_FIELD(struct ioc_read_toc_single_entry, entry,
-		[#include <sys/cdio.h>]
-	)
-fi
-
 dnl ==================================================================
 dnl Checks for networking
 dnl ==================================================================
@@ -848,30 +842,15 @@ dnl Set $prefix and $exec_prefix to $ac_default_prefix if they are not set
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
-AC_ARG_WITH(newstyle,
+if test "x$SYSTYPE" = xWIN32; then
-[  --with-newstyle         compile with defaults a bit different than those
+	default_globalconf="~/${PACKAGE}.conf"
-                          used by Id Software (does not affect gameplay)],
-	newstyle=$withval, newstyle=auto
-)
-AC_MSG_CHECKING([configuration style])
-if test "x$newstyle" = xyes -o "x$newstyle" = "x"; then
-	AC_MSG_RESULT([new style])
-	AC_DEFINE(NEWSTYLE)
-	AC_DEFINE(BASEGAME, "base")
-	default_globalconf="/etc/$PACKAGE.conf"
-	eval foo="$datadir"
-	default_sharepath="$foo/games/quakeforge"
-	default_userpath="~/.quakeforge"
-else
-	AC_MSG_RESULT([old style (id Software defaults)])
-	AC_DEFINE(BASEGAME, "id1")
-	if test "x$SYSTYPE" = xWIN32; then
-		default_globalconf="%WINDIR%/$PACKAGE.conf"
-	else
-		default_globalconf="/etc/$PACKAGE.conf"
-	fi
 	default_sharepath="."
 	default_userpath="."
+else
+	default_globalconf="/etc/${PACKAGE}.conf"
+	eval foo="$datadir"
+	default_sharepath="$foo/games/$PACKAGE"
+	default_userpath="~/.$PACKAGE"
 fi
 
 AC_ARG_WITH(global-cfg,
@@ -1124,6 +1103,7 @@ AC_MSG_RESULT([
 	Build type: $BUILD_TYPE
 	Targets:$CL_TARGETS
 	Server: $ENABLE_DED
+	Compression support: $HAVE_ZLIB
 
 	System game data directory: $sharepath
 	Per-user game data directory: $userpath

include/chase.h

@@ -35,4 +35,5 @@ void Chase_Init (void);
 void Chase_Reset (void);
 void Chase_Update (void);
 
-#endif __chase_h
+#endif //__chase_h
+

include/cmd.h

@@ -143,4 +143,5 @@ char *COM_Parse (char *data);
 
 extern	struct cvar_s	*cl_warncmd;
 
-#endif __cmd_h
+#endif //__cmd_h
+

include/sound.h

@@ -174,6 +174,10 @@ extern	cvar_t	*loadas8bit;
 extern	cvar_t	*bgmvolume;
 extern	cvar_t	*volume;
 
+extern	cvar_t	*snd_device;
+extern	cvar_t	*snd_rate;
+extern	cvar_t	*snd_bits;
+extern	cvar_t	*snd_stereo;
 extern	cvar_t	*snd_interp;
 extern	cvar_t	*snd_stereo_phase_separation;
 

include/win32/bc/config.h

@@ -65,16 +65,6 @@
 /* Version strings */
 #include "version.h"
 
-/* Define if you want to use QF-style defaults instead of Id-style */
-#undef NEWSTYLE
-
-/* Define this to the subdirectory name of the default game */
-#ifdef NEWSTYLE
-#	define BASEGAME "base"
-#else
-#	define BASEGAME "id1"
-#endif
-
 /* Define if you have the XFree86 DGA extension */
 #undef HAVE_DGA
 

include/win32/vc/config.h

@@ -65,16 +65,6 @@
 /* Version string */
 #include "..\version.h"
 
-/* Define if you want to use QF-style defaults instead of Id-style */
-#undef NEWSTYLE
-
-/* Define this to the subdirectory name of the default game */
-#ifdef NEWSTYLE
-#	define BASEGAME "base"
-#else
-#	define BASEGAME "id1"
-#endif
-
 /* Define if you have the XFree86 DGA extension */
 #undef HAVE_DGA
 

include/win32/version.h

@@ -0,0 +1,37 @@
+/*
+	version.h
+
+	Version numbers for Win32 builds not using autoconf
+
+	Copyright (C) 2000 Jeff Teunissen
+
+	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
+*/
+
+#ifndef _VERSION_H
+#define _VERSION_H
+
+/* Version strings */
+#define PACKAGE 		"nuq"
+#define PROGRAM 		"QuakeForge: nuq"
+#define VERSION 		"0.2.99alpha0"
+#define QSG_VERSION		"1.0"
+#define QUAKE_VERSION	"1.09"
+
+#endif	// _VERSION_H

source/.gdbinit

@@ -1 +1,2 @@
 set args -nosound -nodga +set _windowed_mouse 0
+set height 0

source/Makefile.am

@@ -70,8 +70,8 @@ EXTRA_libqfsys_a_SOURCES= dirent.c fnmatch.c sys_unix.c sys_win.c
 if SNDTYPE_ALSA_0_5
 libqfsnd_a_SOURCES=	snd_dma.c snd_mem.c snd_mix.c snd_alsa_0_5.c $(sound_ASM)
 endif
-if SNDTYPE_ALSA_0_6
+if SNDTYPE_ALSA_0_9
-libqfsnd_a_SOURCES=	snd_dma.c snd_mem.c snd_mix.c snd_alsa_0_6.c $(sound_ASM)
+libqfsnd_a_SOURCES=	snd_dma.c snd_mem.c snd_mix.c snd_alsa_0_9.c $(sound_ASM)
 endif
 if SNDTYPE_MME
 libqfsnd_a_SOURCES=	snd_dma.c snd_mem.c snd_mix.c snd_mme.c $(sound_ASM)
@@ -89,7 +89,7 @@ if SNDTYPE_NULL
 libqfsnd_a_SOURCES=	snd_null.c $(sound_ASM)
 endif
 EXTRA_libqfsnd_a_SOURCES= snd_dma.c snd_mem.c snd_mix.c snd_alsa_0_5.c \
-			snd_alsa_0_6.c snd_oss.c snd_sun.c snd_win.c snd_null.c \
+			snd_alsa_0_9.c snd_oss.c snd_sun.c snd_win.c snd_null.c \
 			$(sound_ASM)
 
 #

source/draw.c

@@ -29,6 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 #include "draw.h"
 #include "vid.h"

source/gib_instructions.c

@@ -222,4 +222,4 @@ int GIB_ExpandBackticks (char *source, char *buffer, int buffersize)
 		}
 	}
 	return 0;
-}
+}

source/gib_parse.c

@@ -226,4 +226,4 @@ int GIB_ExpandEscapes (char *source)
 		m++;
 	}
 	return 0;
-}
+}

source/gib_stack.c

@@ -70,4 +70,4 @@ void GIB_SubStack_Push (gib_module_t *mod, gib_sub_t *sub, gib_var_t *local)
 void GIB_SubStack_Pop (void)
 {
 	gib_instack = realloc(gib_instack, sizeof(gib_instack_t) * (--gib_subsp));
-}
+}

source/gl_draw.c

@@ -368,7 +368,7 @@ static void Draw_TextureMode_f (void)
 				Con_Printf ("%s\n", modes[i].name);
 				return;
 			}
-		Con_Printf ("current filter is unknown???\n");
+		Con_Printf ("current filter is unknown\?\?\?\n");
 		return;
 	}
 
@@ -1096,9 +1096,12 @@ GL_Upload32
 static void GL_Upload32 (unsigned *data, int width, int height,  qboolean mipmap, qboolean alpha)
 {
 	int			samples;
-static	unsigned	scaled[1024*512];	// [512*256];
+	unsigned int *scaled;
 	int			scaled_width, scaled_height;
 
+	if (!width || !height)
+		return; // Null texture
+
 	for (scaled_width = 1 ; scaled_width < width ; scaled_width<<=1)
 		;
 	for (scaled_height = 1 ; scaled_height < height ; scaled_height<<=1)
@@ -1110,7 +1113,7 @@ static	unsigned	scaled[1024*512];	// [512*256];
 	scaled_width = min(scaled_width, gl_max_size->int_val);
 	scaled_height = min(scaled_height, gl_max_size->int_val);
 
-	if (scaled_width * scaled_height > sizeof(scaled)/4)
+	if (!(scaled = malloc (scaled_width * scaled_height * sizeof (GLuint))))
 		Sys_Error ("GL_LoadTexture: too big");
 
 	samples = alpha ? gl_alpha_format : gl_solid_format;
@@ -1173,6 +1176,8 @@ done: ;
 		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_max);
 		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
 	}
+
+	free (scaled);
 }
 
 void GL_Upload8_EXT (byte *data, int width, int height,  qboolean mipmap, qboolean alpha) 
@@ -1180,7 +1185,7 @@ void GL_Upload8_EXT (byte *data, int width, int height,  qboolean mipmap, qboole
 	int			i, s;
 	qboolean	noalpha;
 	int			samples;
-    static	unsigned char scaled[1024*512];	// [512*256];
+    unsigned char *scaled;
 	int			scaled_width, scaled_height;
 
 	s = width*height;
@@ -1209,7 +1214,7 @@ void GL_Upload8_EXT (byte *data, int width, int height,  qboolean mipmap, qboole
 	scaled_width = min(scaled_width, gl_max_size->int_val);
 	scaled_height = min(scaled_height, gl_max_size->int_val);
 
-	if (scaled_width * scaled_height > sizeof(scaled))
+	if (!(scaled = malloc (scaled_width * scaled_height)))
 		Sys_Error ("GL_LoadTexture: too big");
 
 	samples = 1; // alpha ? gl_alpha_format : gl_solid_format;
@@ -1272,6 +1277,7 @@ done: ;
 		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, gl_filter_max);
 		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, gl_filter_max);
 	}
+	free (scaled);
 }
 
 extern qboolean VID_Is8bit();

source/mathlib.c

@@ -29,6 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 #include <math.h>
 

source/menu.c

@@ -1429,7 +1429,7 @@ void M_Keys_Draw (void)
 
 		if (keys[0] == -1)
 		{
-			M_Print (140, y, "???");
+			M_Print (140, y, "\?\?\?");
 		}
 		else
 		{
@@ -2512,7 +2512,7 @@ level_t	abysslevels[] = {
 	{"aopdm3",	"Mental Overlord"},
 	{"aopdm4",	"Mental Overlord II"},
 	{"aopdm5",	"Midnight Darkness"},
-	{"aopdm6",	"???"}
+	{"aopdm6",	"\?\?\?"}
 };
 
 typedef struct

source/msg.c

@@ -29,6 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 #include "msg.h"
 #include "qendian.h"

source/pr_edict.c

@@ -408,7 +408,7 @@ char *PR_GlobalString (int ofs)
 	val = (void *)&pr_globals[ofs];
 	def = ED_GlobalAtOfs(ofs);
 	if (!def)
-		snprintf (line, sizeof(line), "%i(???)", ofs);
+		snprintf (line, sizeof(line), "%i(\?\?\?)", ofs);
 	else
 	{
 		s = PR_ValueString (def->type, val);
@@ -431,7 +431,7 @@ char *PR_GlobalStringNoContents (int ofs)
 	
 	def = ED_GlobalAtOfs(ofs);
 	if (!def)
-		snprintf (line, sizeof(line), "%i(???)", ofs);
+		snprintf (line, sizeof(line), "%i(\?\?\?)", ofs);
 	else
 		snprintf (line, sizeof(line), "%i(%s)", ofs, pr_strings + def->s_name);
 	

source/quakefs.c

@@ -930,7 +930,7 @@ COM_InitFilesystem ( void )
 			"location of shared (read only) game directories");
 	fs_userpath = Cvar_Get ("fs_userpath", FS_USERPATH, CVAR_ROM,
 			"location of your game directories");
-	fs_basegame = Cvar_Get ("fs_basegame", BASEGAME, CVAR_ROM,
+	fs_basegame = Cvar_Get ("fs_basegame", "id1", CVAR_ROM,
 			"game to use by default");
 
 /*

source/sizebuf.c

@@ -29,6 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 #include "sizebuf.h"
 #include "sys.h"

source/snd_alsa_0_6.c

@@ -1,356 +0,0 @@
-/*
-	snd_alsa_0_6.c
-
-	(description)
-
-	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$
-*/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <stdio.h>
-
-#include <sys/asoundlib.h>
-
-#include "console.h"
-#include "qargs.h"
-#include "sound.h"
-#include "va.h"
-
-static int  snd_inited;
-
-static snd_pcm_t *pcm_handle;
-static snd_pcm_hw_info_t hwinfo;
-static snd_pcm_hw_params_t hwparams;
-static snd_pcm_sw_params_t swparams;
-static const snd_pcm_channel_area_t *mmap_running_areas;
-static int  card = -1, dev = -1;
-
-int
-check_card (int card)
-{
-	snd_ctl_t  *handle;
-	int         rc;
-
-	if ((rc = snd_ctl_open (&handle, va ("hw:%d", card))) < 0) {
-		Con_Printf ("Error: control open (%i): %s\n", card, snd_strerror (rc));
-		return rc;
-	}
-	if (dev == -1) {
-		while (1) {
-			 if ((rc = snd_ctl_pcm_next_device (handle, &dev)) < 0) {
-			 	Con_Printf ("Error: next device: %s\n", snd_strerror (rc));
-				return rc;
-			}
-			if (dev < 0)
-				break;
-			if ((rc = snd_pcm_open (&pcm_handle, va ("hw:%d,%d", card, dev),
-									SND_PCM_STREAM_PLAYBACK,
-									SND_PCM_NONBLOCK)) == 0) {
-				goto exit;
-			}
-		}
-	} else {
-		if ((rc = snd_pcm_open (&pcm_handle, va ("hw:%d,%d", card, dev),
-								SND_PCM_STREAM_PLAYBACK,
-								SND_PCM_NONBLOCK)) == 0) {
-			goto exit;
-		}
-		Con_Printf ("Error: snd_pcm_open %d: %s\n", dev, snd_strerror (rc));
-		goto exit;
-	}
-	rc = 1;
-exit:
-	snd_ctl_close(handle);
-	return rc;
-}
-
-qboolean
-SNDDMA_Init (void)
-{
-	int         rc = 0, i;
-	char       *err_msg = "";
-	int         rate = -1, format = -1, stereo = -1, frag_size;
-
-	if ((i = COM_CheckParm ("-sndcard")) != 0) {
-		card = atoi (com_argv[i + 1]);
-	}
-	if ((i = COM_CheckParm ("-snddev")) != 0) {
-		dev = atoi (com_argv[i + 1]);
-	}
-	if ((i = COM_CheckParm ("-sndbits")) != 0) {
-		i = atoi (com_argv[i + 1]);
-		if (i == 16) {
-			format = SND_PCM_FMTBIT_S16_LE;
-		} else if (i == 8) {
-			format = SND_PCM_FMTBIT_U8;
-		} else {
-			Con_Printf ("Error: invalid sample bits: %d\n", i);
-			return 0;
-		}
-	}
-	if ((i = COM_CheckParm ("-sndspeed")) != 0) {
-		rate = atoi (com_argv[i + 1]);
-		if (rate != 44100 && rate != 22050 && rate != 11025) {
-			Con_Printf ("Error: invalid sample rate: %d\n", rate);
-			return 0;
-		}
-	}
-	if ((i = COM_CheckParm ("-sndmono")) != 0) {
-		stereo = 0;
-	}
-	if (card == -1) {
-		if (snd_card_next(&card) < 0 || card < 0) {
-			Con_Printf ("No sound cards detected\n");
-			return 0;
-		}
-		while (card >= 0) {
-			rc = check_card (card);
-			if (rc < 0)
-				return 0;
-			if (!rc)
-				goto dev_openned;
-		}
-	} else {
-		if (dev == -1) {
-			rc = check_card (card);
-			if (rc < 0)
-				return 0;
-			if (!rc)
-				goto dev_openned;
-		} else {
-			if ((rc = snd_pcm_open (&pcm_handle, va ("hw:%d,%d", card, dev),
-									SND_PCM_STREAM_PLAYBACK,
-									SND_PCM_NONBLOCK)) == 0) {
-				Con_Printf ("Error: audio open error: %s\n", snd_strerror (rc));
-				return 0;
-			}
-			goto dev_openned;
-		}
-	}
-	Con_Printf ("Error: audio open error: %s\n", snd_strerror (rc));
-	return 0;
-
-  dev_openned:
-	Con_Printf ("Using card %d, device %d.\n", card, dev);
-	memset (&hwinfo, 0, sizeof (hwinfo));
-	snd_pcm_hw_info_any (&hwinfo);
-	hwinfo.access_mask = SND_PCM_ACCBIT_MMAP_INTERLEAVED;
-	err_msg = "snd_pcm_hw_info";
-	if ((rc = snd_pcm_hw_info (pcm_handle, &hwinfo)) < 0)
-		goto error;
-	Con_Printf ("%08x %08x\n", hwinfo.access_mask, hwinfo.format_mask);
-	rate = 44100;
-	frag_size = 4;
-#if 0									// XXX
-	if ((rate == -1 || rate == 44100) && hwinfo.rates & SND_PCM_RATE_44100) {
-		rate = 44100;
-		frag_size = 256;				/* assuming stereo 8 bit */
-	} else if ((rate == -1 || rate == 22050)
-			   && hwinfo.rates & SND_PCM_RATE_22050) {
-		rate = 22050;
-		frag_size = 128;				/* assuming stereo 8 bit */
-	} else if ((rate == -1 || rate == 11025)
-			   && hwinfo.rates & SND_PCM_RATE_11025) {
-		rate = 11025;
-		frag_size = 64;					/* assuming stereo 8 bit */
-	} else {
-		Con_Printf ("ALSA: desired rates not supported\n");
-		goto error_2;
-	}
-#endif
-	if ((format == -1 || format == SND_PCM_FMTBIT_S16_LE)
-		&& hwinfo.format_mask & SND_PCM_FORMAT_S16_LE) {
-		format = SND_PCM_FORMAT_S16_LE;
-	} else if ((format == -1 || format == SND_PCM_FORMAT_U8)
-			   && hwinfo.format_mask & SND_PCM_FORMAT_U8) {
-		format = SND_PCM_FORMAT_U8;
-	} else {
-		Con_Printf ("ALSA: desired formats not supported\n");
-		goto error_2;
-	}
-	// XXX can't support non-interleaved stereo
-	if (stereo && (hwinfo.access_mask & SND_PCM_ACCBIT_MMAP_INTERLEAVED)
-		&& hwinfo.channels_max >= 2) {
-		stereo = 1;
-	} else {
-		stereo = 0;
-	}
-
-	memset (&hwparams, 0, sizeof (hwparams));
-	// XXX can't support non-interleaved stereo
-	hwparams.access = stereo ? SND_PCM_ACCESS_MMAP_INTERLEAVED
-		: SND_PCM_ACCESS_MMAP_NONINTERLEAVED;
-	hwparams.format = format;
-	hwparams.rate = rate;
-	hwparams.channels = stereo + 1;
-
-	hwparams.fragment_size = 32;
-	hwparams.fragments = 512;
-
-	err_msg = "snd_pcm_hw_params";
-	if ((rc = snd_pcm_hw_params (pcm_handle, &hwparams)) < 0) {
-		Con_Printf("failed: %08x\n", hwparams.fail_mask);
-		goto error;
-	}
-
-	memset (&swparams, 0, sizeof (swparams));
-	swparams.start_mode = SND_PCM_START_EXPLICIT;
-	swparams.xrun_mode = SND_PCM_XRUN_FRAGMENT;
-	swparams.xfer_min = 1;
-	swparams.xfer_align = 1;
-	err_msg = "snd_pcm_sw_params";
-	if ((rc = snd_pcm_sw_params (pcm_handle, &swparams)) < 0) {
-		Con_Printf("failed: %08x\n", swparams.fail_mask);
-		goto error;
-	}
-
-	err_msg = "audio prepare";
-	if ((rc = snd_pcm_prepare (pcm_handle)) < 0)
-		goto error;
-
-	mmap_running_areas = snd_pcm_mmap_areas (pcm_handle);
-
-	shm = &sn;
-	memset ((dma_t *) shm, 0, sizeof (*shm));
-	shm->splitbuffer = 0;
-	shm->channels = hwparams.channels;
-	shm->submission_chunk = frag_size;	// don't mix less than this #
-	shm->samplepos = 0;					// in mono samples
-	shm->samplebits = hwparams.format == SND_PCM_FORMAT_S16_LE ? 16 : 8;
-	shm->samples = hwparams.fragment_size * hwparams.fragments
-	               * shm->channels;		// mono samples in buffer
-	shm->speed = hwparams.rate;
-	shm->buffer = (unsigned char *) mmap_running_areas->addr;
-	Con_Printf ("%5d stereo\n", shm->channels - 1);
-	Con_Printf ("%5d samples\n", shm->samples);
-	Con_Printf ("%5d samplepos\n", shm->samplepos);
-	Con_Printf ("%5d samplebits\n", shm->samplebits);
-	Con_Printf ("%5d submission_chunk\n", shm->submission_chunk);
-	Con_Printf ("%5d speed\n", shm->speed);
-	Con_Printf ("0x%x dma buffer\n", (int) shm->buffer);
-	Con_Printf ("%5d total_channels\n", total_channels);
-
-	snd_inited = 1;
-	return 1;
-  error:
-	Con_Printf ("Error: %s: %s\n", err_msg, snd_strerror (rc));
-  error_2:
-	snd_pcm_close (pcm_handle);
-	return 0;
-}
-
-static inline int
-get_hw_ptr ()
-{
-	size_t      app_ptr;
-	ssize_t     delay;
-	int         hw_ptr;
-
-	if (snd_pcm_state (pcm_handle) != SND_PCM_STATE_RUNNING)
-		return 0;
-	app_ptr = snd_pcm_mmap_offset (pcm_handle);
-	snd_pcm_delay (pcm_handle, &delay);
-	hw_ptr = app_ptr - delay;
-	return hw_ptr;
-}
-
-int
-SNDDMA_GetDMAPos (void)
-{
-	int         hw_ptr;
-
-	if (!snd_inited)
-		return 0;
-
-	hw_ptr = get_hw_ptr ();
-	hw_ptr *= shm->channels;
-	shm->samplepos = hw_ptr;
-	return shm->samplepos;
-}
-
-void
-SNDDMA_Shutdown (void)
-{
-	if (snd_inited) {
-		snd_pcm_close (pcm_handle);
-		snd_inited = 0;
-	}
-}
-
-/*
-==============
-SNDDMA_Submit
-
-Send sound to device if buffer isn't really the dma buffer
-===============
-*/
-void
-SNDDMA_Submit (void)
-{
-	int         count = paintedtime - soundtime;
-	int         avail;
-	int         missed;
-	int         state;
-	int         hw_ptr;
-	int         offset;
-
-	state = snd_pcm_state (pcm_handle);
-
-	switch (state) {
-		case SND_PCM_STATE_XRUN:
-			//snd_pcm_reset (pcm_handle);
-			snd_pcm_prepare (pcm_handle);
-			//break;
-		case SND_PCM_STATE_PREPARED:
-			snd_pcm_mmap_forward (pcm_handle, count);
-			snd_pcm_start (pcm_handle);
-			//break;
-		case SND_PCM_STATE_RUNNING:
-			hw_ptr = get_hw_ptr ();
-			missed = hw_ptr - shm->samplepos / shm->channels;
-			count -= missed;
-			offset = snd_pcm_mmap_offset (pcm_handle);
-			if (offset > hw_ptr)
-				count -= (offset - hw_ptr);
-			else
-				count -= (hwparams.fragments - hw_ptr + offset);
-			if (count < 0) {
-				snd_pcm_rewind (pcm_handle, -count);
-			} else if (count > 0) {
-				avail = snd_pcm_avail_update (pcm_handle);
-				if (avail > 0 && count > avail) {
-					snd_pcm_mmap_forward (pcm_handle, avail);
-					count -= avail;
-				}
-				snd_pcm_mmap_forward (pcm_handle, count);
-			}
-			break;
-		default:
-			printf("snd_alsa: nexpected state: %d\n", state);
-			break;
-	}
-}

source/snd_alsa_0_9.c

@@ -0,0 +1,279 @@
+/*
+	snd_alsa_0_9.c
+
+	Support for ALSA 0.9 sound driver (cvs development version)
+
+	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$
+*/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <stdio.h>
+
+#include <alsa/asoundlib.h>
+
+#include "qtypes.h"
+#include "sound.h"
+#include "qargs.h"
+#include "console.h"
+
+static int snd_inited;
+
+static snd_pcm_t *pcm;
+static char *pcmname = NULL;
+size_t buffer_size;
+
+qboolean
+SNDDMA_Init(void)
+{
+	int err,i;
+	int rate=-1,bps=-1,stereo=-1,frag_size;
+	snd_pcm_hw_params_t *hw;
+	snd_pcm_sw_params_t *sw;
+	snd_pcm_hw_params_alloca(&hw);
+	snd_pcm_sw_params_alloca(&sw);
+
+	if ((i=COM_CheckParm("-sndpcm"))!=0) {
+		pcmname=com_argv[i+1];
+	}
+	if ((i=COM_CheckParm("-sndbits")) != 0) {
+		bps = atoi(com_argv[i+1]);
+		if (bps != 16 && bps != 8) {
+			Con_Printf("Error: invalid sample bits: %d\n", i);
+			return 0;
+		}
+	}
+	if ((i=COM_CheckParm("-sndspeed")) != 0) {
+		rate = atoi(com_argv[i+1]);
+		if (rate!=44100 && rate!=22050 && rate!=11025) {
+			Con_Printf("Error: invalid sample rate: %d\n", rate);
+			return 0;
+		}
+	}
+	if ((i=COM_CheckParm("-sndmono")) != 0) {
+		stereo=0;
+	}
+	if ((i=COM_CheckParm("-sndstereo")) != 0) {
+		stereo=1;
+	}
+	if (!pcmname)
+		pcmname = "plug:0,0";
+	if ((err=snd_pcm_open(&pcm, pcmname,
+			     SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK))<0) {
+		Con_Printf("Error: audio open error: %s\n", snd_strerror(err));
+		return 0;
+	}
+
+	Con_Printf("Using PCM %s.\n", pcmname);
+	snd_pcm_hw_params_any(pcm, hw);
+
+
+	switch (rate) {
+	case -1:
+		if (snd_pcm_hw_params_set_rate_near(pcm, hw, 44100, 0) >= 0) {
+			frag_size = 256; /* assuming stereo 8 bit */
+			rate = 44100;
+		} else if (snd_pcm_hw_params_set_rate_near(pcm, hw, 22050, 0) >= 0) {
+			frag_size = 128; /* assuming stereo 8 bit */
+			rate = 22050;
+		} else if (snd_pcm_hw_params_set_rate_near(pcm, hw, 11025, 0) >= 0) {
+			frag_size = 64;	/* assuming stereo 8 bit */
+			rate = 11025;
+		} else {
+			Con_Printf("ALSA: no useable rates\n");
+			goto error;
+		}
+		break;
+	case 11025:
+	case 22050:
+	case 44100:
+		if (snd_pcm_hw_params_set_rate_near(pcm, hw, rate, 0) >= 0) {
+			frag_size = 64 * rate / 11025; /* assuming stereo 8 bit */
+			break;
+		}
+		/* Fall through */
+	default:
+		Con_Printf("ALSA: desired rate not supported\n");
+		goto error;
+	}
+
+	switch (bps) {
+	case -1:
+		if (snd_pcm_hw_params_set_format(pcm, hw, SND_PCM_FORMAT_S16_LE) >= 0) {
+			bps = 16;
+		} else if (snd_pcm_hw_params_set_format(pcm, hw, SND_PCM_FORMAT_U8) >= 0) {
+			bps = 8;
+		} else {
+			Con_Printf("ALSA: no useable formats\n");
+			goto error;
+		}
+		break;
+	case 8:
+	case 16:
+		 if (snd_pcm_hw_params_set_format(pcm, hw, 
+						  bps == 8 ? SND_PCM_FORMAT_U8 :
+						  SND_PCM_FORMAT_S16) >= 0) {
+			 break;
+		 }
+		/* Fall through */
+	default:
+		Con_Printf("ALSA: desired format not supported\n");
+		goto error;
+	}
+
+	if (snd_pcm_hw_params_set_access(pcm, hw, 
+					 SND_PCM_ACCESS_MMAP_INTERLEAVED) < 0) {
+		Con_Printf("ALSA: interleaved is not supported\n");
+		goto error;
+	}
+
+	switch (stereo) {
+	case -1:
+		if (snd_pcm_hw_params_set_channels(pcm, hw, 2) >= 0) {
+			stereo = 1;
+		} else if (snd_pcm_hw_params_set_channels(pcm, hw, 1) >= 0) {
+			stereo = 0;
+		} else {
+			Con_Printf("ALSA: no useable channels\n");
+			goto error;
+		}
+		break;
+	case 0:
+	case 1:
+		 if (snd_pcm_hw_params_set_channels(pcm, hw, stereo ? 2 : 1) >= 0)
+			 break;
+		 /* Fall through */
+	default:
+		Con_Printf("ALSA: desired channels not supported\n");
+		goto error;
+	}
+
+	snd_pcm_hw_params_set_period_size_near(pcm, hw, frag_size, 0);
+	
+	err = snd_pcm_hw_params(pcm, hw);
+	if (err < 0) {
+		Con_Printf("ALSA: unable to install hw params\n");
+		goto error;
+	}
+
+	snd_pcm_sw_params_current(pcm, sw);
+	snd_pcm_sw_params_set_start_mode(pcm, sw, SND_PCM_START_EXPLICIT);
+	snd_pcm_sw_params_set_xrun_mode(pcm, sw, SND_PCM_XRUN_NONE);
+
+	err = snd_pcm_sw_params(pcm, sw);
+	if (err < 0) {
+		Con_Printf("ALSA: unable to install sw params\n");
+		goto error;
+	}
+
+	shm=&sn;
+	memset((dma_t*)shm,0,sizeof(*shm));
+	shm->splitbuffer = 0;
+	shm->channels=stereo+1;
+	shm->submission_chunk = snd_pcm_hw_params_get_period_size (hw, 0); // don't mix less than this #
+	shm->samplepos=0;			// in mono samples
+	shm->samplebits=bps;
+	buffer_size = snd_pcm_hw_params_get_buffer_size(hw); 
+	shm->samples=buffer_size*shm->channels;	// mono samples in buffer
+	shm->speed=rate;
+	SNDDMA_GetDMAPos ();//XXX sets shm->buffer
+	Con_Printf("%5d stereo\n", shm->channels - 1);
+	Con_Printf("%5d samples\n", shm->samples);
+	Con_Printf("%5d samplepos\n", shm->samplepos);
+	Con_Printf("%5d samplebits\n", shm->samplebits);
+	Con_Printf("%5d submission_chunk\n", shm->submission_chunk);
+	Con_Printf("%5d speed\n", shm->speed);
+	Con_Printf("0x%x dma buffer\n", (int)shm->buffer);
+	Con_Printf("%5d total_channels\n", total_channels);
+
+	snd_inited=1;
+	return 1;
+ error:
+	snd_pcm_close(pcm);
+	return 0;
+}
+
+int
+SNDDMA_GetDMAPos(void)
+{
+	snd_pcm_uframes_t offset;
+	snd_pcm_uframes_t nframes = shm->samples/shm->channels;
+	const snd_pcm_channel_area_t *areas;
+
+	if (!snd_inited)
+		return 0;
+
+	snd_pcm_mmap_begin (pcm, &areas, &offset, &nframes);
+	offset *= shm->channels;
+	nframes *= shm->channels;
+	shm->samplepos = offset;
+	shm->buffer = areas->addr;//XXX FIXME there's an area per channel
+
+	return shm->samplepos;
+}
+
+void
+SNDDMA_Shutdown(void)
+{
+	if (snd_inited) {
+		snd_pcm_close(pcm);
+		snd_inited = 0;
+	}
+}
+
+/*
+	SNDDMA_Submit
+
+	Send sound to device if buffer isn't really the dma buffer
+*/
+void
+SNDDMA_Submit(void)
+{
+	snd_pcm_uframes_t offset;
+	snd_pcm_uframes_t nframes;
+	const snd_pcm_channel_area_t *areas;
+	int         state;
+	int         count = paintedtime - soundtime;
+
+	nframes = count / shm->channels;
+
+	snd_pcm_mmap_begin (pcm, &areas, &offset, &nframes);
+
+	state = snd_pcm_state (pcm);
+
+	switch (state) {
+		case SND_PCM_STATE_PREPARED:
+			snd_pcm_mmap_commit (pcm, offset, nframes);
+			snd_pcm_start (pcm);
+			break;
+		case SND_PCM_STATE_RUNNING:
+			snd_pcm_mmap_commit (pcm, offset, nframes);
+			break;
+		default:
+			break;
+	}
+}
+

source/snd_mix.c

@@ -29,6 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 #include "sound.h"
 #include "compat.h"

source/vid_common_gl.c

@@ -352,7 +352,7 @@ Shared_Init8bitPalette()
 	}
 	is8bit = true;
 
-	if strstr(gl_renderer, "Mesa Glide") {
+	if (strstr(gl_renderer, "Mesa Glide")) {
 #ifdef HAVE_TDFXGL
 		load_texture(GL_SHARED_TEXTURE_PALETTE_EXT, GL_RGB, 256, GL_RGB, GL_UNSIGNED_BYTE, (void *) thePalette);
 #endif

source/vid_svgalib.c

@@ -35,6 +35,12 @@
 # include <config.h>
 #endif
 
+#ifdef HAVE_STRING_H
+# include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
 #include <stdlib.h>
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>

source/wad.c

@@ -29,6 +29,12 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#ifdef HAVE_STRING_H
+#include <string.h>
+#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h>
+#endif
 
 #include "qendian.h"
 #include "wad.h"