head	1.3;
access;
symbols
	pkgsrc-2026Q1:1.3.0.130
	pkgsrc-2026Q1-base:1.3
	pkgsrc-2025Q4:1.3.0.128
	pkgsrc-2025Q4-base:1.3
	pkgsrc-2025Q3:1.3.0.126
	pkgsrc-2025Q3-base:1.3
	pkgsrc-2025Q2:1.3.0.124
	pkgsrc-2025Q2-base:1.3
	pkgsrc-2025Q1:1.3.0.122
	pkgsrc-2025Q1-base:1.3
	pkgsrc-2024Q4:1.3.0.120
	pkgsrc-2024Q4-base:1.3
	pkgsrc-2024Q3:1.3.0.118
	pkgsrc-2024Q3-base:1.3
	pkgsrc-2024Q2:1.3.0.116
	pkgsrc-2024Q2-base:1.3
	pkgsrc-2024Q1:1.3.0.114
	pkgsrc-2024Q1-base:1.3
	pkgsrc-2023Q4:1.3.0.112
	pkgsrc-2023Q4-base:1.3
	pkgsrc-2023Q3:1.3.0.110
	pkgsrc-2023Q3-base:1.3
	pkgsrc-2023Q2:1.3.0.108
	pkgsrc-2023Q2-base:1.3
	pkgsrc-2023Q1:1.3.0.106
	pkgsrc-2023Q1-base:1.3
	pkgsrc-2022Q4:1.3.0.104
	pkgsrc-2022Q4-base:1.3
	pkgsrc-2022Q3:1.3.0.102
	pkgsrc-2022Q3-base:1.3
	pkgsrc-2022Q2:1.3.0.100
	pkgsrc-2022Q2-base:1.3
	pkgsrc-2022Q1:1.3.0.98
	pkgsrc-2022Q1-base:1.3
	pkgsrc-2021Q4:1.3.0.96
	pkgsrc-2021Q4-base:1.3
	pkgsrc-2021Q3:1.3.0.94
	pkgsrc-2021Q3-base:1.3
	pkgsrc-2021Q2:1.3.0.92
	pkgsrc-2021Q2-base:1.3
	pkgsrc-2021Q1:1.3.0.90
	pkgsrc-2021Q1-base:1.3
	pkgsrc-2020Q4:1.3.0.88
	pkgsrc-2020Q4-base:1.3
	pkgsrc-2020Q3:1.3.0.86
	pkgsrc-2020Q3-base:1.3
	pkgsrc-2020Q2:1.3.0.82
	pkgsrc-2020Q2-base:1.3
	pkgsrc-2020Q1:1.3.0.62
	pkgsrc-2020Q1-base:1.3
	pkgsrc-2019Q4:1.3.0.84
	pkgsrc-2019Q4-base:1.3
	pkgsrc-2019Q3:1.3.0.80
	pkgsrc-2019Q3-base:1.3
	pkgsrc-2019Q2:1.3.0.78
	pkgsrc-2019Q2-base:1.3
	pkgsrc-2019Q1:1.3.0.76
	pkgsrc-2019Q1-base:1.3
	pkgsrc-2018Q4:1.3.0.74
	pkgsrc-2018Q4-base:1.3
	pkgsrc-2018Q3:1.3.0.72
	pkgsrc-2018Q3-base:1.3
	pkgsrc-2018Q2:1.3.0.70
	pkgsrc-2018Q2-base:1.3
	pkgsrc-2018Q1:1.3.0.68
	pkgsrc-2018Q1-base:1.3
	pkgsrc-2017Q4:1.3.0.66
	pkgsrc-2017Q4-base:1.3
	pkgsrc-2017Q3:1.3.0.64
	pkgsrc-2017Q3-base:1.3
	pkgsrc-2017Q2:1.3.0.60
	pkgsrc-2017Q2-base:1.3
	pkgsrc-2017Q1:1.3.0.58
	pkgsrc-2017Q1-base:1.3
	pkgsrc-2016Q4:1.3.0.56
	pkgsrc-2016Q4-base:1.3
	pkgsrc-2016Q3:1.3.0.54
	pkgsrc-2016Q3-base:1.3
	pkgsrc-2016Q2:1.3.0.52
	pkgsrc-2016Q2-base:1.3
	pkgsrc-2016Q1:1.3.0.50
	pkgsrc-2016Q1-base:1.3
	pkgsrc-2015Q4:1.3.0.48
	pkgsrc-2015Q4-base:1.3
	pkgsrc-2015Q3:1.3.0.46
	pkgsrc-2015Q3-base:1.3
	pkgsrc-2015Q2:1.3.0.44
	pkgsrc-2015Q2-base:1.3
	pkgsrc-2015Q1:1.3.0.42
	pkgsrc-2015Q1-base:1.3
	pkgsrc-2014Q4:1.3.0.40
	pkgsrc-2014Q4-base:1.3
	pkgsrc-2014Q3:1.3.0.38
	pkgsrc-2014Q3-base:1.3
	pkgsrc-2014Q2:1.3.0.36
	pkgsrc-2014Q2-base:1.3
	pkgsrc-2014Q1:1.3.0.34
	pkgsrc-2014Q1-base:1.3
	pkgsrc-2013Q4:1.3.0.32
	pkgsrc-2013Q4-base:1.3
	pkgsrc-2013Q3:1.3.0.30
	pkgsrc-2013Q3-base:1.3
	pkgsrc-2013Q2:1.3.0.28
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2013Q1:1.3.0.26
	pkgsrc-2013Q1-base:1.3
	pkgsrc-2012Q4:1.3.0.24
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2012Q3:1.3.0.22
	pkgsrc-2012Q3-base:1.3
	pkgsrc-2012Q2:1.3.0.20
	pkgsrc-2012Q2-base:1.3
	pkgsrc-2012Q1:1.3.0.18
	pkgsrc-2012Q1-base:1.3
	pkgsrc-2011Q4:1.3.0.16
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q3:1.3.0.14
	pkgsrc-2011Q3-base:1.3
	pkgsrc-2011Q2:1.3.0.12
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2011Q1:1.3.0.10
	pkgsrc-2011Q1-base:1.3
	pkgsrc-2010Q4:1.3.0.8
	pkgsrc-2010Q4-base:1.3
	pkgsrc-2010Q3:1.3.0.6
	pkgsrc-2010Q3-base:1.3
	pkgsrc-2010Q2:1.3.0.4
	pkgsrc-2010Q2-base:1.3
	pkgsrc-2010Q1:1.3.0.2
	pkgsrc-2010Q1-base:1.3
	pkgsrc-2009Q4:1.1.0.62
	pkgsrc-2009Q4-base:1.1
	pkgsrc-2009Q3:1.1.0.60
	pkgsrc-2009Q3-base:1.1
	pkgsrc-2009Q2:1.1.0.58
	pkgsrc-2009Q2-base:1.1
	pkgsrc-2009Q1:1.1.0.56
	pkgsrc-2009Q1-base:1.1
	pkgsrc-2008Q4:1.1.0.54
	pkgsrc-2008Q4-base:1.1
	pkgsrc-2008Q3:1.1.0.52
	pkgsrc-2008Q3-base:1.1
	cube-native-xorg:1.1.0.50
	cube-native-xorg-base:1.1
	pkgsrc-2008Q2:1.1.0.48
	pkgsrc-2008Q2-base:1.1
	cwrapper:1.1.0.46
	pkgsrc-2008Q1:1.1.0.44
	pkgsrc-2008Q1-base:1.1
	pkgsrc-2007Q4:1.1.0.42
	pkgsrc-2007Q4-base:1.1
	pkgsrc-2007Q3:1.1.0.40
	pkgsrc-2007Q3-base:1.1
	pkgsrc-2007Q2:1.1.0.38
	pkgsrc-2007Q2-base:1.1
	pkgsrc-2007Q1:1.1.0.36
	pkgsrc-2007Q1-base:1.1
	pkgsrc-2006Q4:1.1.0.34
	pkgsrc-2006Q4-base:1.1
	pkgsrc-2006Q3:1.1.0.32
	pkgsrc-2006Q3-base:1.1
	pkgsrc-2006Q2:1.1.0.30
	pkgsrc-2006Q2-base:1.1
	pkgsrc-2006Q1:1.1.0.28
	pkgsrc-2006Q1-base:1.1
	pkgsrc-2005Q4:1.1.0.26
	pkgsrc-2005Q4-base:1.1
	pkgsrc-2005Q3:1.1.0.24
	pkgsrc-2005Q3-base:1.1
	pkgsrc-2005Q2:1.1.0.22
	pkgsrc-2005Q2-base:1.1
	pkgsrc-2005Q1:1.1.0.20
	pkgsrc-2005Q1-base:1.1
	pkgsrc-2004Q4:1.1.0.18
	pkgsrc-2004Q4-base:1.1
	pkgsrc-2004Q3:1.1.0.16
	pkgsrc-2004Q3-base:1.1
	pkgsrc-2004Q2:1.1.0.14
	pkgsrc-2004Q2-base:1.1
	pkgsrc-2004Q1:1.1.0.12
	pkgsrc-2004Q1-base:1.1
	pkgsrc-2003Q4:1.1.0.10
	pkgsrc-2003Q4-base:1.1
	netbsd-1-6-1:1.1.0.6
	netbsd-1-6-1-base:1.1
	netbsd-1-6:1.1.0.8
	netbsd-1-6-RELEASE-base:1.1
	pkgviews:1.1.0.4
	pkgviews-base:1.1
	buildlink2:1.1.0.2
	buildlink2-base:1.1
	netbsd-1-5-PATCH003:1.1
	netbsd-1-5-PATCH001:1.1
	netbsd-1-5-RELEASE:1.1
	netbsd-1-4-PATCH003:1.1
	netbsd-1-4-PATCH002:1.1;
locks; strict;
comment	@# @;


1.3
date	2010.02.22.21.58.47;	author wiz;	state Exp;
branches;
next	1.2;

1.2
date	2010.02.21.16.17.13;	author wiz;	state dead;
branches;
next	1.1;

1.1
date	2000.02.03.16.01.15;	author abs;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Re-add xdoom, requested by drochner.
Address PR 24024 by marking it as not-for-lp64platforms.
@
text
@$NetBSD: patch-at,v 1.1 2000/02/03 16:01:15 abs Exp $

--- linuxdoom-1.10/s_sound.c.orig	Thu Feb  3 13:28:09 2000
+++ linuxdoom-1.10/s_sound.c	Thu Feb  3 13:37:06 2000
@@@@ -115,6 +115,7 @@@@
 // Maximum volume of music. Useless so far.
 int 		snd_MusicVolume = 15; 
 
+static int	no_sound = 0;
 
 
 // whether songs are mus_paused
@@@@ -164,6 +165,8 @@@@
 {  
   int		i;
 
+  if (no_sound)
+    return;
   fprintf( stderr, "S_Init: default sfx volume %d\n", sfxVolume);
 
   // Whatever these did with DMX, these are rather dummies now.
@@@@ -204,6 +207,8 @@@@
   int cnum;
   int mnum;
 
+  if (no_sound)
+    return;
   // kill all playing sounds at start of level
   //  (trust me - a good idea)
   for (cnum=0 ; cnum<numChannels ; cnum++)
@@@@ -268,6 +273,8 @@@@
   mobj_t*	origin = (mobj_t *) origin_p;
   
   
+  if (no_sound)
+    return;
   // Debug.
   /*fprintf( stderr,
   	   "S_StartSoundAtVolume: playing sound %d (%s)\n",
@@@@ -403,6 +410,9 @@@@
     // if (sfx_id == sfx_sawful)
     // sfx_id = sfx_itemup;
 #endif
+
+    if (no_sound)
+      return;
   
     S_StartSoundAtVolume(origin, sfx_id, snd_SfxVolume);
 
@@@@ -473,6 +483,9 @@@@
 
     int cnum;
 
+    if (no_sound)
+	return;
+
     for (cnum=0 ; cnum<numChannels ; cnum++)
     {
 	if (channels[cnum].sfxinfo && channels[cnum].origin == origin)
@@@@ -496,6 +509,8 @@@@
 //
 void S_PauseSound(void)
 {
+    if (no_sound)
+      return;
     if (mus_playing && !mus_paused)
     {
 	I_PauseSong(mus_playing->handle);
@@@@ -505,6 +520,8 @@@@
 
 void S_ResumeSound(void)
 {
+    if (no_sound)
+      return;
     if (mus_playing && mus_paused)
     {
 	I_ResumeSong(mus_playing->handle);
@@@@ -529,6 +546,8 @@@@
     mobj_t*	listener = (mobj_t*)listener_p;
 
 
+    if (no_sound)
+      return;
     
     // Clean up unused data.
     // This is currently not done for 16bit (sounds cached static).
@@@@ -636,6 +655,8 @@@@
 
     snd_SfxVolume = volume;
 
+    if (volume == 0)
+      no_sound = ! volume;
 }
 
 //
@@@@ -711,6 +732,8 @@@@
     int		i;
     channel_t*	c = &channels[cnum];
 
+    if (no_sound)
+      return;
     if (c->sfxinfo)
     {
 	// stop the sound playing
@@@@ -762,6 +785,9 @@@@
     fixed_t	ady;
     angle_t	angle;
 
+    if (no_sound)
+      return(1);
+
     // calculate the distance to sound origin
     //  and clip it if necessary
     adx = abs(listener->x - source->x);
@@@@ -834,6 +860,8 @@@@
     
     channel_t*	c;
 
+    if (no_sound)
+      return(-1);
     // Find an open channel
     for (cnum=0 ; cnum<numChannels ; cnum++)
     {
@


1.2
log
@Remove xdoom, use prboom instead, which also works on 64bit machines
(see PR 24024).
@
text
@@


1.1
log
@Update to 1.10nb1
	Actually work with the supplied WAD file
        One file-to-patch per patchfile
        Remove strange 'post-patch' substitute X11_BASE phase
        Fix numerous coredumps
        Add a '-h' usage
        Handle the sndserver dying
        Make it work on little endian systems
        Add a '-volume X' flag, and skip all sound code if 0
        Other cleanup in some of the more repellant code areas.
@
text
@d1 1
a1 1
$NetBSD$
@