Commit Graph

65 Commits

Author SHA1 Message Date
Eric Wasylishen b139cf7d86 Merge branch 'master' into autosave 2011-01-28 18:27:28 -07:00
Eric 13a6d072f8 Update linux makefile 2011-01-20 13:37:34 -07:00
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 dc494fad2e Upadte Xcode project to use embedded
copy of Ogg Vorbis
2011-01-19 01:14:28 -07:00
Eric Wasylishen 93881c3a45 Only autosave when health is picked up 2011-01-19 01:05:03 -07:00
Eric Wasylishen 07bfab72db 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.
2011-01-19 01:03:50 -07:00
Eric Wasylishen a2f2ee5e53 Cleanup code.
Autoload now loads normal saves, quicksaves, or autosaves (whatever was most recent).
2011-01-19 01:03:42 -07:00
Eric Wasylishen 26c9f12dca First iteration of autosave 2011-01-19 01:03:33 -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 eefff871a2 Get build working on Ubuntu 2011-01-19 00:15:43 -07:00
Eric Wasylishen fda9ec2962 Add ogg/vorbis COPYING and README 2011-01-18 23:12:11 -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