Commit Graph

211 Commits

Author SHA1 Message Date
Ragnvald Maartmann-Moe IV 9648fbf181 Whitespace. 2002-10-10 19:24:36 +00:00
Bill Currie 4a1db5a998 fix the crash on focus loss when using in_snd_block and -nosound 2002-09-30 03:59:55 +00:00
Bill Currie ec47e08e1c go back to using QFile, quakeio.h and quakefs.h 2002-08-27 07:16:28 +00:00
Ragnvald Maartmann-Moe IV 89412eee10 One step closer to BSD working. Now just needs some work on autoconfiscation... Yech. 2002-08-25 16:34:28 +00:00
Ragnvald Maartmann-Moe IV 9d6bdf5fca Attempt to work around BSD segfault. 2002-08-24 07:40:10 +00:00
Jeff Teunissen 87fd1adadb Enable compiling the null plugin by default. 2002-08-14 05:16:11 +00:00
Jeff Teunissen 2037db210c whitespace. 2002-08-14 05:12:57 +00:00
Bill Currie 2ce0f2ded2 we now require modern autoconf (2.52+), automake (1.6+) and libtool (1.4+).
This gives us a bunch more flexibility. plugins no longer have the "lib"
prefix or the version suffix, they're now installed in
$fs_sharepath/QFplugins,, builds should take much less time (in general,
only one of pic or non-pic versions are build), bins and libs can have
individual CFLAGS
2002-08-01 19:49:10 +00:00
Bill Currie a7f1e1185b Patch to get oss sound working in BSD thanks to Alexander Leidinger
<Alexander@Leidinger.net>
2002-06-10 15:36:33 +00:00
Bill Currie d7c7ac7891 don't add -version-info for static plugins 2002-06-03 16:34:46 +00:00
Bill Currie 44dcf74627 strip the \n from all(?) of the Sys_Error calls (Sys_Error itself will be
adding \n).
2002-05-14 06:12:29 +00:00
Bill Currie 08f12355c5 this /should/ fix CoolMoDee's autoconf 2.53 issues 2002-04-29 19:19:26 +00:00
Bill Currie ef81af9245 the "two birds with one stone" commit
1) when /not/ building static plugins, the plugin info name is, once again,
   PluginInfo, but is still type_name_PluginInfo for static plugins. This
   allows plugins to be symlinked (highly desirable for the debian packages,
   and likely others). This also requires plugins to /not/ be loaded with
   RTLD_GLOBAL.
2) because of 1, snd_alsa_0_9 has to explicitly load libasound itself. This
   just happens to fix my segfault on shutdown in RedHat 6.2.
2002-04-19 20:08:54 +00:00
Bill Currie e34ab5541c munmap the sound buffer when closing the device. This might help with some
hangs on shutdown.
2002-04-17 21:15:19 +00:00
Bill Currie db75da7733 this should fix compiling snd_sun on solaris 2002-04-07 03:24:29 +00:00
Bill Currie 5a2538faaf dstring.[ch]:
create dsprintf and dvsprintf to do formated prints to dynamic strings.
rest
	Use the new functions :)
2002-03-08 23:11:42 +00:00
Bill Currie 26d7463be7 the majority of raptor's sgi build patch. I'll look at the last two bits
(server.c and vid_sdl.c) later.
2002-03-03 06:03:51 +00:00
Bill Currie 03ae513559 compile fixes. we've finally got a sun sound user 2002-01-31 06:50:18 +00:00
Bill Currie 6039c210a7 compile fix for mandrake 2001-12-06 20:34:58 +00:00
Ragnvald Maartmann-Moe IV eabfbd6c98 Remove ugly ifdef (and coincidentally support for early ALSA 0.9). 2001-11-24 08:05:44 +00:00
Bill Currie d168a3daee this should remove the requirement for gmake on bsd systems 2001-11-12 16:23:41 +00:00
Adam Olsen 3bba5398ba - audit malloc usage. now everything checks the return value :) 2001-10-24 22:50:06 +00:00
Bill Currie b3914eeaaa elimination of bare printf (with some exceptions) from libs: Sys_Printf is
used instead
2001-10-18 16:42:14 +00:00
Bill Currie f18974bd89 fix a missing sys/types.h 2001-10-16 16:25:32 +00:00
Jeff Teunissen 0485fbe09e Makefile fixes. 2001-10-14 07:05:06 +00:00
Bill Currie 0952af5529 fix up the sound restart code 2001-10-12 15:49:50 +00:00
Bill Currie 8b2da8cbec make the static plugins link properly with older libtool 2001-10-10 15:44:35 +00:00
Bill Currie eee1aaf283 static plugins (--with-static-plugins to force on, --without-static-plugins
to force off, defaults to off for *nix and on for win32). does not work yet
due to lack of support in libs/util/plugin.c, but that's next.
2001-10-10 05:52:14 +00:00
Chris Ison fda073acb6 oops audio targets makefile fix 2001-10-09 21:43:01 +00:00
Chris Ison 15bdd4ad67 disabled -lm checking for cygwin and mingw32 and added plugin_LDFLAGS and plugin_LIBADD for win32 builds 2001-10-09 21:36:57 +00:00
Bill Currie 36508058ea QFPLUGIN now does the __declspec stuff and all plugins now use it on their
plgin info function. doesn't actually /work/ yet :(
2001-10-08 05:54:46 +00:00
Chris Ison 2f8efd7360 changes to get mingw32 sw clients to compile under cygwin 2001-10-07 12:45:47 +00:00
Adam Olsen 4937ad6c71 - some changes to snd_win.c that will hopefully bring it closer to
operation
2001-10-05 09:51:21 +00:00
Bill Currie f505e8630c fixes for rh 7.1 2001-09-30 23:24:53 +00:00
Jeff Teunissen d63243380f Aaaaaaand, it's done!
Special note: I hope to never do this again. :)
2001-09-28 10:31:20 +00:00
Bill Currie b1f4a778f9 the rcsid commit from hell }:> 2001-09-28 06:26:31 +00:00
Jeff Teunissen e6d7aec03a Build system updates/fixes for audio libs. MUCH cleaner, probably
faster, doesn't do anything unnecessary any more as far as I can tell.
2001-09-28 05:33:12 +00:00
Bill Currie 37495db521 this should work for older alsa 0.9 where asoundlib.h is still in sys instead of alsa 2001-09-27 17:12:17 +00:00
Chris Ison 0efd28abcc trying to get bootstrap to work in cygwin 2001-09-25 23:04:13 +00:00
Bill Currie 49a85718f8 total nukage of Con_*Printf calls from libs (except for video). Sys_*Printf
(Sys_DPrintf is new) is now used exclusively for all lib printing. Con_Init
sets the sys printf recirection to Con_Print (which has been revamped
appropriatly) and the server sets it to SV_Print (which was SV_Printf and
the new SV_Printf calls /it/). This should fix the rcon print redirection
issues.
2001-09-21 04:22:46 +00:00
Ragnvald Maartmann-Moe IV a474c7ad2f Update for current alsa header locations. 2001-09-14 12:08:52 +00:00
Ragnvald Maartmann-Moe IV 7af79b96ec Lots of whitespace, header cleanups, and a few tiny optimizations. 2001-09-09 21:41:35 +00:00
Bill Currie 888bdb7052 fix some static issues 2001-09-07 21:40:45 +00:00
Bill Currie e9cf5b4eba include sys/types.h for freebsd 2001-09-07 04:41:13 +00:00
Bill Currie 2c51098ac9 the plugin structs /definitly/ have to be static and remove some debug from
alsa_0_9
2001-08-31 03:42:54 +00:00
Bill Currie e469b934ea get alsa0_9 working with latest cvs, we need to dlopen the plugin with
RTDL_GLOBAL. To use RTDL_GLOBAL, we need to make as much static as possible
 and PluginInfo needs a unique name (%s_%s_PluginInfo, type, name).
2001-08-31 00:05:58 +00:00
Adam Olsen 9c9756c19a Start of non-mmaped OSS sound support. it uses a cvar, so it's not
active yet.
2001-08-24 02:38:28 +00:00
Adam Olsen 90849100fe Build fixes, notably for snd_sdl.c. It segfaults on shutdown though
:/
2001-08-23 11:40:53 +00:00
Adam Olsen 50e545292a remove extra calls to SNDDMA_Init_Cvars 2001-08-23 04:52:54 +00:00
Adam Olsen 62e1819ec5 build fixes 2001-08-23 04:18:55 +00:00
Adam Olsen cad42cbc78 Put the sound renderer in it's proper place: as a full-fledged plugin.
Bugs expected.  Please report them :)
2001-08-23 04:01:46 +00:00
Ragnvald Maartmann-Moe IV 7a09f37e0b Lots of whitespace. 2001-08-22 20:26:25 +00:00
Bill Currie 8f269ee821 fix "cannot find -lQFsoundrenderer" on some systems 2001-08-22 03:54:26 +00:00
Bill Currie e61c56af94 hopefully make sound plugin linking work better 2001-08-20 02:32:33 +00:00
Bill Currie d48b3ee9d2 s/LIB_DEPS/DEPENDENCIES/ 2001-08-15 22:40:56 +00:00
Bill Currie edf4b85cc7 don't need to (and seems that you shouldn't) specify a path for local libs 2001-08-15 22:31:07 +00:00
Adam Olsen e3590642fb Moved the sound renderer into a seperate lib. You'll need to rerun
configure, else it won't build said lib and you'll get errors loading
sound plugins.
2001-08-15 21:03:10 +00:00
Ragnvald Maartmann-Moe IV cddaa521cc Change loadas8bit to snd_loadas8bit. 2001-08-15 00:53:37 +00:00
Ragnvald Maartmann-Moe IV 85992c58d3 Make more cvar names sane. _snd_mixahead is now snd_mixahead. 2001-08-04 18:18:33 +00:00
Bill Currie b455458629 exit cleanup. Sys_Error and Sys_Quit should be used whenever possible. 2001-08-02 17:16:12 +00:00
Bill Currie 2732797574 fix the undefined symbol error 2001-07-18 22:18:36 +00:00
Bill Currie 1c9e1b176f fear the mighty const correct patch 2001-07-15 07:04:17 +00:00
Bill Currie 3ab9ecd828 add this so it doesn't get lost. needs work. 2001-07-15 03:01:34 +00:00
Bill Currie 016563e77f found the snd_pcm_playback_pause function for 0.5 2001-07-05 20:24:41 +00:00
Bill Currie fc09d2b00f port Bruce Momjian's patches from newtree with a less incestuous
implementation of his sound/focus patch. NOTE: only alsa 0.9 is tested
(Rhamph, can you test 0.5, please?) and only the alsa drivers stop the
hardware right ow.

WARNING!!! you /will/ have to re-install your plugins, or you will get
segfaults when the window gains/loses focus.

How do you tell if a window has focus on first mapping in X11?
2001-07-05 20:18:23 +00:00
Bill Currie 560b475880 gcc 3.0 compile fixes 2001-06-19 22:05:13 +00:00
Bill Currie 8c13809e9c don't process .S files when not using asm (either --disable-asmopt or non-x86
platforms). Done by moving the asm objects into libasm.la (yes, there's one in
each dir that needs it) so that the Makefiles don't explode.
2001-06-14 19:52:38 +00:00
Adam Olsen 9e19da13de function name cleanup. the sound mixer stuff (snd_dma.c, snd_mix.c, etc) use the SND_ prefix now, and drivers (snd_oss.c) use SNDDMA_ as before. 2001-06-10 15:48:24 +00:00
Adam Olsen 2195a9296c This thing was so far out of date, there's no point pretending it still exists in current cvs. 2001-06-10 15:01:07 +00:00
Bill Currie ab9e025078 don't build cd or sound libs/plugins when not building clients 2001-06-07 03:37:05 +00:00
Ragnvald Maartmann-Moe IV 4826c5dd0f Change shm init to PROT_WRITE, instead of PROT_READ | PROT_WRITE.
This is required for mmap to succeed on my system. YMMV.
May cause a problem with incomplete shutdown.
2001-06-02 06:51:58 +00:00
Ragnvald Maartmann-Moe IV 85333a9f96 Convert cd audio libs to plugins. Windows untested, dos and sgi not converted yet. 2001-06-01 22:55:33 +00:00
Adam Olsen a187032ebf add #include "QF/cvar.h" for snd_alsa_0_5.c 2001-06-01 00:12:25 +00:00
Bill Currie 323015b11a include/QF header cleanup. including config.h (or any file from include) is
a nono because headers in include/QF get installed, but include don't and thus
would break quakeforge-dev.
2001-05-31 05:33:13 +00:00
Bill Currie 6bf58ab1af no header includes cvar.h now 2001-05-31 03:41:35 +00:00
Joseph Carter 05adfd0e53 quakefs.h -> vfs.h
quakeio.h -> vfile.h

More diff reduction between trunk and my VFS code.  Also took the time to
put some headers in order and fix a few #include's pointed out by moving
things around a bit.
2001-05-30 04:34:06 +00:00
Joseph Carter 186d577818 s/QFile/VFile/g - makes my diffs much smaller and more manageable for the
VFS work.
2001-05-30 03:21:19 +00:00
Bill Currie 5514f4870e --with-plugin-path now controls where plugins are installed, not just where
to look for them.
2001-05-28 19:30:32 +00:00
Ragnvald Maartmann-Moe IV 964ec6425d whitespace and comment cleanup. 2001-05-24 17:00:08 +00:00
Ragnvald Maartmann-Moe IV a83c3d3af5 Cleanups. 2001-05-22 20:34:03 +00:00
Bill Currie c500fd7479 make dist fixups 2001-05-22 17:09:03 +00:00
Ragnvald Maartmann-Moe IV e7f25dc731 whitespace 2001-05-22 12:31:43 +00:00
Bill Currie a79ab3faf8 abandon the oss write only attempts. 2001-05-21 17:40:12 +00:00
Bill Currie f38a233786 make snd_oss_rw affect the rest of the places it needs to 2001-05-21 01:12:07 +00:00
Adam Olsen aef4cd6da7 do shm = 0 after SNDDMA_Shutdown is called 2001-05-19 08:53:08 +00:00
Bill Currie 5fb17e384b fix the installation location of the plugins 2001-05-19 04:38:03 +00:00
Bill Currie 1e84684f27 fix the alsa plugin building 2001-05-19 02:09:59 +00:00
Adam Olsen 9cc30959e4 Sound now uses runtime plugins. Much thanks to Deek for doing all the
thinking :)
set fs_pluginpath to point to the right dir, and set snd_plugin to pick a sound
plugin.

Current issues:
- alsa 0.5 won't build properly, dunno why
- segfault on exit.  I think I know the cause of this, and how to fix it
- alsa 0.9, gus, sgi, sun, and win32 havn't been tested
2001-05-19 00:05:35 +00:00
Adam Olsen 2e11cbb8a4 some sdl audio tweaks that made it work with artsc output
thought I commited these before.. (where have we heard that before?) ;)
2001-05-17 23:21:26 +00:00
Bill Currie d16dc87dfa fix oss' device openning mode. defaults to write only, but read/write can be
selected by setting snd_oss_rw (need better name?) to non-zero
2001-05-16 18:59:31 +00:00
Ragnvald Maartmann-Moe IV b10ea42970 Update alsa support for most recent API changes. Old version temporarily left in as comments. 2001-05-08 17:16:49 +00:00
Adam Olsen 0dee26397c Make sdl audio work. And despite claims, it's not actually bad
(except for esd, but that's not sdl's fault).
I havn't tested it with other hardware or different config variables,
and I've experienced the occasional hang or segfault on exit, so
feedback is very welcome. :)
2001-04-27 07:41:47 +00:00
Bill Currie 00e510b96e --without-clients no longer builds client only libs 2001-04-18 18:04:22 +00:00
Bill Currie 527471a7de *-wgl finally links (who knows if it works?:) and some more conceptual
cleanup
2001-04-17 15:55:33 +00:00
Bill Currie c0507f5610 update for the lastest alsa pcm mmap api. not as bad as at first appearance 2001-04-14 02:30:30 +00:00
Bill Currie 475a0b0d4a must not call snd_pcm_mmap_forward with a count of 0
this fixes the alsa assert at slower rates
2001-04-13 08:08:41 +00:00
Bill Currie 6b3b94bafc sound crashing bug fixes
snd_dma.c, {nq,qw}/source/cl_parse.c:
	change the type of snd_worldmodel from * to ** and init snd_worldmodel
	with the ADDRESS of cl.worldmodel so its changes get seen by snd_dma
snd_mixa.S:
	picize
2001-04-12 06:53:07 +00:00
Bill Currie fa936b1713 back out rhamph's premature commit 2001-04-11 04:17:55 +00:00
Adam Olsen c45a4d2550 fix harmless cut&paste error 2001-04-11 03:22:52 +00:00
Bill Currie f36fa31ba2 build snd_mixa.S at all times. it does the right thing when no intel asm is
wanted.
2001-04-11 03:16:01 +00:00
Bill Currie 9cd83e178f various fixes for out-of-srcdir building
configure.in:
	foo/Makefile MUST come before foo/bar/Makefile or foo/bar will NOT be
	created.
libs/*...*/Mkaefile.am: add INCLUDES so $(top_scrdir)/include gets searched
{qw,nq}/source/Makefile.am: fix fbset compiling (and cleaning for nq)
2001-04-11 03:09:24 +00:00
Adam Olsen 0f98bc01be Forgot to edit the comments :) 2001-04-11 02:42:53 +00:00
Adam Olsen 320bd35f1e Move common variables in snd_dma.c and snd_null.c into snd_common.c 2001-04-11 02:41:12 +00:00
Adam Olsen 2b4d8ecc97 Remove some extra files linked in with snd_null.c 2001-04-11 01:17:08 +00:00
Joseph Carter 75aa40276f A few more. Also removed a couple inaccurate comments. 2001-04-11 00:10:19 +00:00
Adam Olsen b89fde285d Make snd_null.c actually work.
add --disable-sound to configure, for no sound at all :)
2001-04-10 23:18:08 +00:00
Bill Currie 8e2d89c4c2 fix up a mis-understanding about api headers
*taniwha larts himself for not explaining things to Despair
2001-04-10 21:45:42 +00:00
Ragnvald Maartmann-Moe IV cbb4af711c Remove duplicate sound.h, move some things down from include/QF to include.
Prepare for joystick merge...
2001-04-10 20:15:18 +00:00
Bill Currie dfbfd9463c mingw cross compile fixes. qw-server (only, so far) compiles but does not
yet link due to Sys_Error :/
2001-04-10 20:07:11 +00:00
Adam Olsen 5ebe111301 Probably want this :) 2001-04-10 09:53:00 +00:00
Adam Olsen 69022c7ffb Move sound targets into a library. Still doesn't pick one at runtime though. 2001-04-10 09:40:09 +00:00