diff options
| author | Fabian Greffrath | 2015-03-26 16:31:57 +0100 |
|---|---|---|
| committer | Fabian Greffrath | 2015-03-26 16:31:57 +0100 |
| commit | 27b5915111ffbdae97ce0c415157e104ee6f3493 (patch) | |
| tree | 850fc62208b642b07047e0a9ea968c365d4dfd1f /src/i_sound.c | |
| parent | 350ac122030d198b187255b19b2519ef8267364a (diff) | |
| parent | ad027ef6dbfeebabe0e6701eec968e9d474e497f (diff) | |
| download | chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.tar.gz chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.tar.bz2 chocolate-doom-27b5915111ffbdae97ce0c415157e104ee6f3493.zip | |
Merge branch 'master' of https://github.com/chocolate-doom/chocolate-doom into hexndemo
Diffstat (limited to 'src/i_sound.c')
| -rw-r--r-- | src/i_sound.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/i_sound.c b/src/i_sound.c index 4432a468..e70b9bc7 100644 --- a/src/i_sound.c +++ b/src/i_sound.c @@ -434,25 +434,25 @@ void I_BindSoundVariables(void) extern int use_libsamplerate; extern float libsamplerate_scale; - M_BindVariable("snd_musicdevice", &snd_musicdevice); - M_BindVariable("snd_sfxdevice", &snd_sfxdevice); - M_BindVariable("snd_sbport", &snd_sbport); - M_BindVariable("snd_sbirq", &snd_sbirq); - M_BindVariable("snd_sbdma", &snd_sbdma); - M_BindVariable("snd_mport", &snd_mport); - M_BindVariable("snd_maxslicetime_ms", &snd_maxslicetime_ms); - M_BindVariable("snd_musiccmd", &snd_musiccmd); - M_BindVariable("snd_samplerate", &snd_samplerate); - M_BindVariable("snd_cachesize", &snd_cachesize); - M_BindVariable("opl_io_port", &opl_io_port); - - M_BindVariable("timidity_cfg_path", &timidity_cfg_path); - M_BindVariable("gus_patch_path", &gus_patch_path); - M_BindVariable("gus_ram_kb", &gus_ram_kb); + M_BindIntVariable("snd_musicdevice", &snd_musicdevice); + M_BindIntVariable("snd_sfxdevice", &snd_sfxdevice); + M_BindIntVariable("snd_sbport", &snd_sbport); + M_BindIntVariable("snd_sbirq", &snd_sbirq); + M_BindIntVariable("snd_sbdma", &snd_sbdma); + M_BindIntVariable("snd_mport", &snd_mport); + M_BindIntVariable("snd_maxslicetime_ms", &snd_maxslicetime_ms); + M_BindStringVariable("snd_musiccmd", &snd_musiccmd); + M_BindIntVariable("snd_samplerate", &snd_samplerate); + M_BindIntVariable("snd_cachesize", &snd_cachesize); + M_BindIntVariable("opl_io_port", &opl_io_port); + + M_BindStringVariable("timidity_cfg_path", &timidity_cfg_path); + M_BindStringVariable("gus_patch_path", &gus_patch_path); + M_BindIntVariable("gus_ram_kb", &gus_ram_kb); #ifdef FEATURE_SOUND - M_BindVariable("use_libsamplerate", &use_libsamplerate); - M_BindVariable("libsamplerate_scale", &libsamplerate_scale); + M_BindIntVariable("use_libsamplerate", &use_libsamplerate); + M_BindFloatVariable("libsamplerate_scale", &libsamplerate_scale); #endif // Before SDL_mixer version 1.2.11, MIDI music caused the game |