summaryrefslogtreecommitdiff
path: root/src/i_sound.c
diff options
context:
space:
mode:
authorSimon Howard2013-03-03 20:29:15 +0000
committerSimon Howard2013-03-03 20:29:15 +0000
commitf3b53778ca850ca0b01ff445000f4f07545b62fc (patch)
treec5b1590ba3bedebf1197cbc8bae5beaedffb4765 /src/i_sound.c
parentb2a59b3eec1dcc040f58bdd5e88bfed55face2fe (diff)
downloadchocolate-doom-f3b53778ca850ca0b01ff445000f4f07545b62fc.tar.gz
chocolate-doom-f3b53778ca850ca0b01ff445000f4f07545b62fc.tar.bz2
chocolate-doom-f3b53778ca850ca0b01ff445000f4f07545b62fc.zip
Add GUS pseudo-emulation.
Subversion-branch: /branches/v2-branch Subversion-revision: 2566
Diffstat (limited to 'src/i_sound.c')
-rw-r--r--src/i_sound.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/i_sound.c b/src/i_sound.c
index 198b233e..47cae682 100644
--- a/src/i_sound.c
+++ b/src/i_sound.c
@@ -32,6 +32,7 @@
#include "doomfeatures.h"
#include "doomtype.h"
+#include "gusconf.h"
#include "i_sound.h"
#include "i_video.h"
#include "m_argv.h"
@@ -218,7 +219,9 @@ void I_InitSound(boolean use_sfx_prefix)
// the TIMIDITY_CFG environment variable here before SDL_mixer
// is opened.
- if (!nomusic && snd_musicdevice == SNDDEVICE_GENMIDI)
+ if (!nomusic
+ && (snd_musicdevice == SNDDEVICE_GENMIDI
+ || snd_musicdevice == SNDDEVICE_GUS))
{
I_InitTimidityConfig();
}
@@ -435,6 +438,8 @@ void I_BindSoundVariables(void)
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);
#ifdef FEATURE_SOUND
M_BindVariable("use_libsamplerate", &use_libsamplerate);