Commit graph

52 commits

Author SHA1 Message Date
Eric Wasylishen
143fbe8ea8 Hack to play allow playing named cd tracks
from the worldspawn sounds key
2011-01-20 13:03:40 -07:00
Eric Wasylishen
57f67bc798 Edit warning message 2011-01-20 12:32:01 -07:00
Eric Wasylishen
946fb4aefd Get rid of the USE_CODEC_VORBIS ifdef; we always
want vorbis.
2011-01-20 12:27:02 -07:00
Eric Wasylishen
be88ebbf15 Remove debug check 2011-01-19 23:18:37 -07:00
Eric Wasylishen
109bfc1ccf fix wrong malloc size 2011-01-19 23:12:56 -07:00
Eric Wasylishen
6f44bebff8 Take away choices for music track and standardize
on music/cdtracks/track01.ogg.

We can only support one search location so that
mods can override tracks.
2011-01-19 23:09:43 -07:00
Eric Wasylishen
01556256fa Fix the OGG codec code to deal with OGGs in
pak files
2011-01-19 16:04:03 -07:00
Eric Wasylishen
1276aa62cd Warn when a CD track can't be played 2011-01-19 15:50:46 -07:00
Eric Wasylishen
fa8a6f88f2 Allow playing oggs using 'play soundname' 2011-01-19 15:10:12 -07:00
Eric Wasylishen
f908623606 Mark OGGs as non looping 2011-01-19 15:09:59 -07:00
Eric Wasylishen
e052ab19a2 Undo some debugging code 2011-01-19 14:44:48 -07:00
Eric Wasylishen
396ff706ed remove some unneeded stuff 2011-01-19 14:02:42 -07:00
Eric Wasylishen
30825d4d0a fix last commit 2011-01-19 14:02:28 -07:00
Eric Wasylishen
4ad3c2d0ee Remove unused function 2011-01-19 13:50:44 -07:00
Eric Wasylishen
f2de795e5e Cleanup/refactor of resampling code.
Use resampler for background music.
Should work with 8 or 16 bit output.
2011-01-19 13:41:51 -07:00
Eric Wasylishen
a0f74edc77 Update copyright notices 2011-01-19 01:19:09 -07:00
Eric Wasylishen
7fbb90771d Undo the autosave patch so it's not mixed
in with the ogg patch
2011-01-19 01:00:03 -07:00
Eric Wasylishen
5bcea42cb9 Include an embedded copy of OggVorbis 2011-01-18 21:29:13 -07:00
Eric Wasylishen
84a8e4c899 Update windows project 2011-01-18 16:17:17 -07:00
Eric Wasylishen
db58c073e1 Make the track search code Darkplaces-compatible 2011-01-18 15:49:11 -07:00
Eric Wasylishen
125689a499 Don't lower the volume of 8-bit sounds
(because some game sounds are 16-bit)
2011-01-18 15:11:44 -07:00
Eric Wasylishen
35f0014502 get the fallback to CD hardware working 2011-01-18 14:30:13 -07:00
Eric Wasylishen
0f8f8381d0 Refactoring of cd player code WIP 2011-01-18 13:32:12 -07:00
Eric Wasylishen
1273c59c1e debugging checks 2011-01-18 13:31:30 -07:00
Eric Wasylishen
2d4649f183 some debugging checks in the resampler 2011-01-18 13:31:23 -07:00
Eric Wasylishen
31651088f8 some debugging checks in the mixer 2011-01-18 13:31:00 -07:00
Eric Wasylishen
09b23123d0 Add some extra functions to query the music
player state
2011-01-18 13:30:17 -07:00
Eric Wasylishen
d986fed089 increase zone size 2011-01-18 13:28:57 -07:00
Eric Wasylishen
ca48cae13b fix endianness check in ogg code 2011-01-18 13:27:53 -07:00
Eric Wasylishen
1fe91caf69 add speex sse code 2011-01-17 17:14:46 -07:00
Eric Wasylishen
057e08a8ef attempt to reduce clipping.. haven't found
the best solution yet.
2011-01-17 16:19:03 -07:00
Eric Wasylishen
edbad56202 reuse resampler object 2011-01-17 15:34:15 -07:00
Eric Wasylishen
c1c1b1f749 First try at integrating Speex resampler 2011-01-17 15:15:20 -07:00
Eric Wasylishen
4dab33292e Clamp volume of 16-bit channels at 255 as well 2011-01-17 14:07:18 -07:00
Eric Wasylishen
85d97fac9a fix bugs in last commit 2011-01-17 13:54:17 -07:00
Eric Wasylishen
c2a9180391 Modify Q3 WAV reader code to read loop markers 2011-01-17 13:27:38 -07:00
Eric Wasylishen
91ff92b33c Refactor resampler code. Use Quake 3 wav codec
and delete most of snd_mem.c.
2011-01-17 11:18:31 -07:00
Eric Wasylishen
e10670b8bc Advance to the next track when the current one
finishes
2011-01-16 23:18:43 -07:00
Eric Wasylishen
990f42683f Correct some Sys_FileOpenRead's to be COM_OpenFile 2011-01-16 22:25:39 -07:00
Eric Wasylishen
2983bf5c49 hook up pause/resume 2011-01-16 22:05:57 -07:00
Eric Wasylishen
e14fc05aab ogg playback working!!! 2011-01-16 20:53:50 -07:00
Eric Wasylishen
7162fd4029 Q3 code integrated, almost compiles except
for some ogg link error
2011-01-16 19:24:18 -07:00
Eric Wasylishen
474dde2a87 Partly integrated Q3 sound codec and background
music code
2011-01-16 18:35:22 -07:00
Eric Wasylishen
ffa1463a9c Fix up sound mixing code so we can control
music volume and sfx volume independently
2011-01-16 17:46:02 -07:00
Eric Wasylishen
36172fb391 Print SDL sound format. From ioquake3. 2011-01-16 16:26:53 -07:00
Eric Wasylishen
9998e06750 play static, with volume controlled by the music volume slider 2011-01-01 23:58:26 -07:00
Eric Wasylishen
195baa74bc Start to setup ogg music system:
- add a cd_shared.c inspired by darkplaces, which implements the CDAudio interface and will either play the ogg music or call the hardware CD code
- set default sound speed to 44100 Hz. this will be necessary to make music sound decent. (unfortunately the resampling code sucks, i think, so the 11025 hz sound effects sound bad when resampled to 44100, but that should be easy to fix.)
2010-12-28 15:39:03 -07:00
Eric Wasylishen
8597423e7a Only autosave when health is picked up 2010-12-22 15:05:53 -07:00
Eric Wasylishen
aa36b04130 Increase health required for autosave to 40.
Don't require the player to be dead for the 'autoload' console function to work.
Reset autoload info on 'map' and 'changelevel'.
Add future ideas for autosave criteria.
2010-12-17 00:17:26 -07:00
Eric Wasylishen
4f70e43b95 Cleanup code.
Autoload now loads normal saves, quicksaves, or autosaves (whatever was most recent).
2010-12-16 23:47:15 -07:00