diff options
| author | Simon Howard | 2010-04-30 20:53:31 +0000 |
|---|---|---|
| committer | Simon Howard | 2010-04-30 20:53:31 +0000 |
| commit | 1162b2c65c5bcff51e2d13aa2cfc2051529cfe68 (patch) | |
| tree | f87e1751ec53be3322d6f0caf2ee6ab34132b7cc /src/i_sound.c | |
| parent | 63ff4879e6c7811d9e8cf357b4e44701964adf21 (diff) | |
| parent | f151517ba6b7e7caf7b49e8ceafbf0969959e068 (diff) | |
| download | chocolate-doom-1162b2c65c5bcff51e2d13aa2cfc2051529cfe68.tar.gz chocolate-doom-1162b2c65c5bcff51e2d13aa2cfc2051529cfe68.tar.bz2 chocolate-doom-1162b2c65c5bcff51e2d13aa2cfc2051529cfe68.zip | |
Merge from trunk.
Subversion-branch: /branches/raven-branch
Subversion-revision: 1924
Diffstat (limited to 'src/i_sound.c')
| -rw-r--r-- | src/i_sound.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/i_sound.c b/src/i_sound.c index a9e953ce..75f82702 100644 --- a/src/i_sound.c +++ b/src/i_sound.c @@ -46,7 +46,7 @@ int snd_samplerate = 44100; static sound_module_t *sound_module; static music_module_t *music_module; -int snd_musicdevice = SNDDEVICE_SB; +int snd_musicdevice = SNDDEVICE_GENMIDI; int snd_sfxdevice = SNDDEVICE_SB; // Sound modules @@ -54,6 +54,7 @@ int snd_sfxdevice = SNDDEVICE_SB; extern sound_module_t sound_sdl_module; extern sound_module_t sound_pcsound_module; extern music_module_t music_sdl_module; +extern music_module_t music_opl_module; // DOS-specific options: These are unused but should be maintained // so that the config file can be shared between chocolate @@ -81,6 +82,7 @@ static music_module_t *music_modules[] = { #ifdef FEATURE_SOUND &music_sdl_module, + &music_opl_module, #endif NULL, }; |