summaryrefslogtreecommitdiff
path: root/src/i_sdlmusic.c
diff options
context:
space:
mode:
authorSimon Howard2010-03-08 01:14:23 +0000
committerSimon Howard2010-03-08 01:14:23 +0000
commit448adb31d703afed9e9cc2bfd109c1fcd34447c4 (patch)
treeca987d9f677ec93263840477bc1eebc9a01fecab /src/i_sdlmusic.c
parentc4fe7aa8b6962edf79e0ccec469970618a92b0ef (diff)
parentb9e18229624500d6d2a6112a5c00882d7b7051de (diff)
downloadchocolate-doom-448adb31d703afed9e9cc2bfd109c1fcd34447c4.tar.gz
chocolate-doom-448adb31d703afed9e9cc2bfd109c1fcd34447c4.tar.bz2
chocolate-doom-448adb31d703afed9e9cc2bfd109c1fcd34447c4.zip
Merge opl-branch to trunk.
OPL support still isn't perfect, and it certainly isn't complete. However, for now, it's good enough. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1878
Diffstat (limited to 'src/i_sdlmusic.c')
-rw-r--r--src/i_sdlmusic.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/i_sdlmusic.c b/src/i_sdlmusic.c
index 7f9bd8ec..4aa89add 100644
--- a/src/i_sdlmusic.c
+++ b/src/i_sdlmusic.c
@@ -334,8 +334,6 @@ static boolean I_SDL_MusicIsPlaying(void)
static snddevice_t music_sdl_devices[] =
{
- SNDDEVICE_ADLIB,
- SNDDEVICE_SB,
SNDDEVICE_PAS,
SNDDEVICE_GUS,
SNDDEVICE_WAVEBLASTER,