From 997d2ee86ef77422ce7ddd08859bd5a4aef66145 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 4 Mar 2009 22:07:27 +0000
Subject: Add initial stub for OPL backend.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1447
---
 src/s_sound.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/s_sound.c')

diff --git a/src/s_sound.c b/src/s_sound.c
index 70fa75f3..f038e9cd 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -136,6 +136,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;
 
 // Compiled-in sound modules:
 
@@ -154,6 +155,7 @@ static music_module_t *music_modules[] =
 {
 #ifdef FEATURE_SOUND
     &music_sdl_module,
+    &music_opl_module,
 #endif
     NULL,
 };
-- 
cgit v1.2.3


From 7e2eaa105e270586e81c04fdf61bcafd7c96a34c Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 13 Sep 2009 00:15:24 +0000
Subject: Change intro/introa fix to be more accurate: Doom uses d_intro, but
 transforms this to d_introa when using OPL playback (thanks entryway)

Subversion-branch: /branches/opl-branch
Subversion-revision: 1672
---
 src/s_sound.c | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/s_sound.c')

diff --git a/src/s_sound.c b/src/s_sound.c
index f038e9cd..9e70ec73 100644
--- a/src/s_sound.c
+++ b/src/s_sound.c
@@ -804,6 +804,15 @@ void S_ChangeMusic(int musicnum, int looping)
     char namebuf[9];
     void *handle;
 
+    // The Doom IWAD file has two versions of the intro music: d_intro
+    // and d_introa.  The latter is used for OPL playback.
+
+    if (musicnum == mus_intro && (snd_musicdevice == SNDDEVICE_ADLIB
+                               || snd_musicdevice == SNDDEVICE_SB))
+    {
+        musicnum = mus_introa;
+    }
+
     if (musicnum <= mus_None || musicnum >= NUMMUSIC)
     {
         I_Error("Bad music number %d", musicnum);
-- 
cgit v1.2.3