summaryrefslogtreecommitdiff
path: root/setup/sound.h
diff options
context:
space:
mode:
authorSimon Howard2009-11-19 21:49:13 +0000
committerSimon Howard2009-11-19 21:49:13 +0000
commit43b0dbd272da1d590797d2974e94413971131129 (patch)
treea4deab2b5fe6a50d66966a792a103563a4464103 /setup/sound.h
parente62fdd771f01ef7b50fe3cb8f456eae5d7db3748 (diff)
downloadchocolate-doom-43b0dbd272da1d590797d2974e94413971131129.tar.gz
chocolate-doom-43b0dbd272da1d590797d2974e94413971131129.tar.bz2
chocolate-doom-43b0dbd272da1d590797d2974e94413971131129.zip
Rework the OS X MIDI disabling code, as SDL_mixer 1.2.11 fixes the
crash. Check and disable MIDI by default if using an older version of SDL on OS X. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1730
Diffstat (limited to 'setup/sound.h')
-rw-r--r--setup/sound.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/setup/sound.h b/setup/sound.h
index 170dda0a..6c366151 100644
--- a/setup/sound.h
+++ b/setup/sound.h
@@ -22,6 +22,20 @@
#ifndef SETUP_SOUND_H
#define SETUP_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,
+};
+
extern int snd_sfxdevice;
extern int numChannels;
extern int sfxVolume;