diff options
| author | Simon Howard | 2009-11-21 01:16:14 +0000 |
|---|---|---|
| committer | Simon Howard | 2009-11-21 01:16:14 +0000 |
| commit | 3cf74a97261b1a0aceb591b495b0857781918edd (patch) | |
| tree | 28caae31dc6d338310998b2cd8855ca6a16e9c3d /setup/sound.c | |
| parent | 299e1c5abf804e2e249c4f77b82fb7949a3f9d7b (diff) | |
| parent | 892ad7c072a6717e8935053d7837a33974d0d824 (diff) | |
| download | chocolate-doom-3cf74a97261b1a0aceb591b495b0857781918edd.tar.gz chocolate-doom-3cf74a97261b1a0aceb591b495b0857781918edd.tar.bz2 chocolate-doom-3cf74a97261b1a0aceb591b495b0857781918edd.zip | |
Merge from trunk.
Subversion-branch: /branches/opl-branch
Subversion-revision: 1734
Diffstat (limited to 'setup/sound.c')
| -rw-r--r-- | setup/sound.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/setup/sound.c b/setup/sound.c index 92a6cbae..0ca95b08 100644 --- a/setup/sound.c +++ b/setup/sound.c @@ -27,20 +27,6 @@ #include "sound.h" -enum -{ - SNDDEVICE_NONE = 0, - SNDDEVICE_PCSPEAKER = 1, - SNDDEVICE_ADLIB = 2, - SNDDEVICE_SB = 3, - SNDDEVICE_PAS = 4, - SNDDEVICE_GUS = 5, - SNDDEVICE_WAVEBLASTER = 6, - SNDDEVICE_SOUNDCANVAS = 7, - SNDDEVICE_GENMIDI = 8, - SNDDEVICE_AWE32 = 9, -}; - typedef enum { SFXMODE_DISABLED, @@ -71,13 +57,11 @@ static char *musmode_strings[] = "Native MIDI" }; -#define DEFAULT_MUSIC_DEVICE SNDDEVICE_SB - int snd_sfxdevice = SNDDEVICE_SB; int numChannels = 8; int sfxVolume = 15; -int snd_musicdevice = DEFAULT_MUSIC_DEVICE; +int snd_musicdevice = SNDDEVICE_SB; int musicVolume = 15; int snd_samplerate = 22050; |