annotate Makefile.am @ 942:41a59de7f2ed

Here are patches for SDL12 and SDL_mixer for 4 or 6 channel surround sound on Linux using the Alsa driver. To use them, naturally you need a sound card that will do 4 or 6 channels and probably also a recent version of the Alsa drivers and library. Since the only SDL output driver that knows about surround sound is the Alsa driver, you���ll want to choose it, using: export SDL_AUDIODRIVER=alsa There are no syntactic changes to the programming API. No new library calls, no differences in arguments. There are two semantic changes: (1) For library calls with number of channels as an argument, formerly you could use only 1 or 2 for the number of channels. Now you can also use 4 or 6. (2) The two "left" and "right" arguments to Mix_SetPanning, for the case of 4 or 6 channels, no longer simply control the volumes of the left and right channels. Now the "left" argument is converted to an angle and Mix_SetPosition is called, and the "right" argu- ment is ignored. With two exceptions, so far as I know, the modified SDL12 and SDL_mixer work the same way as the original versions, when opened for 1 or 2 channel output. The two exceptions are bugs which I fixed. Well, the first, anyway, is a bug for sure. When rate conversions up or down by a factor of two are applied (in src/audio/SDL_audiocvt.c), streams with different numbers of channels (that is, mono and stereo) are treated the same way: either each sample is copied or every other sample is omitted. This is ok for mono, but for stereo, it is frames that should be copied or omitted, where by "frame" I mean a portion of the stream containing one sample for each channel. (In the SDL source, confusingly, sometimes frames are called "samples".) So for these rate conversions, stereo streams have to be treated differently, and they are, in my modified version. The other problem that might be characterized as a bug arises when SDL_mixer is passed a multichannel chunk which does not have an integral number of frames. Due to the way the effect_position code loops over frames, when the chunk ends with a partial frame, memory outside the chunk buffer will be accessed. In the case of stereo, it���s possible that because malloc may give more memory than requested, this potential problem never actually causes a segment fault. I don���t know. For 6 channel chunks, I do know, and it does cause segment faults. If SDL_mixer is passed defective chunks and this causes a segment fault, arguably, that���s not a bug in SDL_mixer. Still, whether or not it counts as a bug, it���s easy to protect against, so why not? I added code in mixer.c to discard any partial frame at the end of a chunk. Then what about when SDL or SDL_mixer is opened for 4 or 6 chan- nel output? What happens with the parts of the current library designed for stereo? I don���t know whether I���ve covered all the bases, but I���ve tried: (1) For playing 2 channel waves, or other cases where SDL knows it has to match up a 2 channel source with a 4 or 6 channel output, I���ve added code in SDL_audiocvt.c to make the necessary conversions. (2) For playing midis using timidity, I���ve converted timidity to do 4 or 6 channel output, upon request. (3) For playing mods using mikmod, I put ad hoc code in music.c to convert the stereo output that mikmod produces to 4 or 6 chan- nels. Obviously it would be better to change the mikmod code to mix down into 4 or 6 channels, but I have a hard time following the code in mikmod, so I didn���t do that. (4) For playing mp3s, I put ad hoc code in smpeg to copy channels in the case when 4 or 6 channel output is needed. (5) There seems to be no problem with .ogg files - stereo .oggs can be up converted as .wavs are. (6) The effect_position code in SDL_mixer is now generalized to in- clude the cases of 4 and 6 channel streams. I���ve done a very limited amount of compatibility testing for some of the games using SDL I happen to have. For details, see the file TESTS. I���ve put into a separate archive, Surround-SDL-testfiles.tgz, a couple of 6 channel wave files for testing and a 6 channel ogg file. If you have the right hardware and version of Alsa, you should be able to play the wave files with the Alsa utility aplay (and hear all channels, except maybe lfe, for chan-id.wav, since it���s rather faint). Don���t expect aplay to give good sound, though. There���s something wrong with the current version of aplay. The canyon.ogg file is to test loading of 6 channel oggs. After patching and compiling, you can play it with playmus. (My version of ogg123 will not play it, and I had to patch mplayer to get it to play 6 channel oggs.) Greg Lee <greg@ling.lll.hawaii.edu> Thus, July 1, 2004
author Sam Lantinga <slouken@libsdl.org>
date Sat, 21 Aug 2004 12:27:02 +0000
parents 26fe9256c48b
children 2cd32a2d1f11
rev   line source
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
1 # The top-level input Makefile for SDL
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
2
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
3 # require automake 1.4
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
4 AUTOMAKE_OPTIONS = 1.4
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
5
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
6 ## Any directories that you want built and installed should go here.
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
7 SUBDIRS = src include docs
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
8
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
9 ## Any directories you want a part of the distribution should be listed
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
10 ## here, as well as have a Makefile generated at the end of configure.in
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
11 ##
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
12 ## This only works for subdirectories one level deep.
351
b1cae30740a2 Fixed failed make when running "make distclean"
Sam Lantinga <slouken@libsdl.org>
parents: 292
diff changeset
13 DIST_SUBDIRS = $(SUBDIRS)
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
14
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
15 # SDL runtime configuration script
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
16 bin_SCRIPTS = sdl-config
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
17
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
18 # All the rest of the distributed files
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
19 EXTRA_DIST = \
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
20 BUGS \
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
21 TODO \
465
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
22 COPYING \
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
23 CREDITS \
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
24 INSTALL \
240
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
25 README \
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
26 README.AmigaOS \
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
27 README.CVS \
509
dad72daf44b3 Added initial support for Dreamcast (thanks HERO!)
Sam Lantinga <slouken@libsdl.org>
parents: 465
diff changeset
28 README.DC \
240
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
29 README.Epoc \
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
30 README.MacOS \
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
31 README.MacOSX \
281
c5010ab8ba35 Added initial support for Atari (thanks Patrice!)
Sam Lantinga <slouken@libsdl.org>
parents: 274
diff changeset
32 README.MiNT \
240
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
33 README.NanoX \
433
706de3956894 Added initial support for PicoGUI (thanks Micah!)
Sam Lantinga <slouken@libsdl.org>
parents: 386
diff changeset
34 README.PicoGUI \
267
b0a5d198755b *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents: 254
diff changeset
35 README.QNX \
386
2c5d4c22a2ac Added a README for Qtopia
Sam Lantinga <slouken@libsdl.org>
parents: 367
diff changeset
36 README.Qtopia \
240
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
37 README.WinCE \
529ba31e8679 Include the README files with the source distribution
Sam Lantinga <slouken@libsdl.org>
parents: 168
diff changeset
38 README-SDL.txt \
465
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
39 Borland.html \
274
051b991765ba David Snopek added Borland compiler support
Sam Lantinga <slouken@libsdl.org>
parents: 267
diff changeset
40 Borland.zip \
465
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
41 VisualC.html \
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
42 VisualC.zip \
521
136d97397288 Added Visual C++ 7 (.NET) projects (thanks James!)
Sam Lantinga <slouken@libsdl.org>
parents: 509
diff changeset
43 VisualC7.zip \
453
a6fa62b1be09 Updated for embedded Visual C++ 4.0
Sam Lantinga <slouken@libsdl.org>
parents: 433
diff changeset
44 VisualCE.zip \
509
dad72daf44b3 Added initial support for Dreamcast (thanks HERO!)
Sam Lantinga <slouken@libsdl.org>
parents: 465
diff changeset
45 Makefile.dc \
465
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
46 MPWmake.sea.bin \
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
47 CWprojects.sea.bin \
54
028447a8a758 *** empty log message ***
Sam Lantinga <slouken@lokigames.com>
parents: 3
diff changeset
48 PBProjects.tar.gz \
254
4fc12b8edf74 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents: 240
diff changeset
49 EpocBuildFiles.zip \
465
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
50 WhatsNew \
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
51 docs.html \
292
eadc0746dfaf Added SDL_LockRect() and SDL_UnlockRect()
Sam Lantinga <slouken@libsdl.org>
parents: 281
diff changeset
52 sdl.m4 \
465
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
53 SDL.spec \
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
54 autogen.sh \
25f475cd4981 Updated the Borland C++ projects (thanks Dominique!)
Sam Lantinga <slouken@libsdl.org>
parents: 453
diff changeset
55 strip_fPIC.sh
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
56
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
57 # M4 macro file for inclusion with autoconf
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
58 m4datadir = $(datadir)/aclocal
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
59 m4data_DATA = sdl.m4
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
60
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
61 # Rule to build tar-gzipped distribution package
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
62 $(PACKAGE)-$(VERSION).tar.gz: dist
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
63
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
64 # Rule to build RPM distribution package
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
65 rpm: $(PACKAGE)-$(VERSION).tar.gz
138
69ee0b88b615 Applied Paul Jenner's patches to fix "make distcheck" and "make rpm"
Sam Lantinga <slouken@libsdl.org>
parents: 123
diff changeset
66 rpm -ta $(PACKAGE)-$(VERSION).tar.gz
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
67
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
68 # Rule to rebuild the export lists for BeOS, MacOS and Win32.
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
69 exports:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
70 (cd src/main/beos/exports; $(MAKE))
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
71 (cd src/main/macos/exports; $(MAKE))
754
623b453a3219 Fixed "dist" make target for newer versions of automake
Sam Lantinga <slouken@libsdl.org>
parents: 720
diff changeset
72 (cd src/main/macosx/exports; $(MAKE))
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
73 (cd src/main/win32/exports; $(MAKE))
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
74
123
d49e9d023119 Fixed the project builder project archive
Sam Lantinga <slouken@libsdl.org>
parents: 116
diff changeset
75 # Rule to build the Project Builder archive in MacOS X
d49e9d023119 Fixed the project builder project archive
Sam Lantinga <slouken@libsdl.org>
parents: 116
diff changeset
76 PBProjects.tar.gz:
d49e9d023119 Fixed the project builder project archive
Sam Lantinga <slouken@libsdl.org>
parents: 116
diff changeset
77 rm -f `find . -name .DS_Store`
d49e9d023119 Fixed the project builder project archive
Sam Lantinga <slouken@libsdl.org>
parents: 116
diff changeset
78 if [ -d PBProjects ]; then \
168
e92aa316c517 Added Max's patches for building MacOS X apps on command line
Sam Lantinga <slouken@libsdl.org>
parents: 138
diff changeset
79 tar zcvf $@ PBProjects; \
123
d49e9d023119 Fixed the project builder project archive
Sam Lantinga <slouken@libsdl.org>
parents: 116
diff changeset
80 fi
d49e9d023119 Fixed the project builder project archive
Sam Lantinga <slouken@libsdl.org>
parents: 116
diff changeset
81
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
82 # Rule to install the libraries only - prevent rebuilding apps
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
83 install-lib:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
84 cd src && $(MAKE) install-libLTLIBRARIES
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
85
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
86 # Run ldconfig after installing the library:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
87 install-hook:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
88 -ldconfig
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
89
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
90 # Grab the test programs for the distribution:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
91 dist-hook:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
92 if test -f test/Makefile; then (cd test; make distclean); fi
754
623b453a3219 Fixed "dist" make target for newer versions of automake
Sam Lantinga <slouken@libsdl.org>
parents: 720
diff changeset
93 rm -rf $(srcdir)/test/autom4te*
138
69ee0b88b615 Applied Paul Jenner's patches to fix "make distcheck" and "make rpm"
Sam Lantinga <slouken@libsdl.org>
parents: 123
diff changeset
94 cp -rp $(srcdir)/test $(distdir)
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
95 rm -rf `find $(distdir) -type d -name CVS -print`
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
96
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
97 # Create a CVS snapshot that people can run update -d on
365
263374148386 *** empty log message ***
Sam Lantinga <slouken@libsdl.org>
parents: 362
diff changeset
98 CVSROOT = :pserver:guest@libsdl.org:/home/sdlweb/libsdl.org/cvs
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
99 snapshot:
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
100 cvs -d $(CVSROOT) login
3
3b97b708523c Use correct repository when generating CVS snapshots
Sam Lantinga <slouken@lokigames.com>
parents: 0
diff changeset
101 cvs -d $(CVSROOT) checkout SDL12
831
26fe9256c48b Remove automake junk before generating a snapshot
Sam Lantinga <slouken@libsdl.org>
parents: 754
diff changeset
102 (cd SDL12 && ./autogen.sh && rm -rf autom4te.cache)
3
3b97b708523c Use correct repository when generating CVS snapshots
Sam Lantinga <slouken@lokigames.com>
parents: 0
diff changeset
103 mv SDL12 SDL-1.2
0
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
104 tar zcvf $(HOME)/SDL-1.2.tar.gz SDL-1.2
74212992fb08 Initial revision
Sam Lantinga <slouken@lokigames.com>
parents:
diff changeset
105 rm -rf SDL-1.2
720
f90d80d68071 N Sep 17 8791 Sam Lantinga Re: tks source released
Sam Lantinga <slouken@libsdl.org>
parents: 521
diff changeset
106 snapshot13:
f90d80d68071 N Sep 17 8791 Sam Lantinga Re: tks source released
Sam Lantinga <slouken@libsdl.org>
parents: 521
diff changeset
107 cvs -d $(CVSROOT) login
f90d80d68071 N Sep 17 8791 Sam Lantinga Re: tks source released
Sam Lantinga <slouken@libsdl.org>
parents: 521
diff changeset
108 cvs -d $(CVSROOT) checkout -r branch_1_3_x SDL12
831
26fe9256c48b Remove automake junk before generating a snapshot
Sam Lantinga <slouken@libsdl.org>
parents: 754
diff changeset
109 (cd SDL12 && ./autogen.sh && rm -rf autom4te.cache)
720
f90d80d68071 N Sep 17 8791 Sam Lantinga Re: tks source released
Sam Lantinga <slouken@libsdl.org>
parents: 521
diff changeset
110 mv SDL12 SDL-1.3
f90d80d68071 N Sep 17 8791 Sam Lantinga Re: tks source released
Sam Lantinga <slouken@libsdl.org>
parents: 521
diff changeset
111 tar zcvf $(HOME)/SDL-1.3.tar.gz SDL-1.3
f90d80d68071 N Sep 17 8791 Sam Lantinga Re: tks source released
Sam Lantinga <slouken@libsdl.org>
parents: 521
diff changeset
112 rm -rf SDL-1.3