From 808b78153c3d3bfe1fb692106323731d17e49489 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 26 Sep 2009 20:01:58 +0000
Subject: Don't use snd_mport to control OPL base I/O port; Vanilla doesn't do
 this.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1691
---
 src/i_oplmusic.c | 4 ++--
 src/m_config.c   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/i_oplmusic.c b/src/i_oplmusic.c
index 7bfdc04d..dd62076d 100644
--- a/src/i_oplmusic.c
+++ b/src/i_oplmusic.c
@@ -336,7 +336,7 @@ static boolean init_stage_reg_writes = false;
 // Configuration file variable, containing the port number for the
 // adlib chip.
 
-int snd_mport = 0x388;
+int opl_io_port = 0x388;
 
 static unsigned int GetStatus(void)
 {
@@ -729,7 +729,7 @@ static void I_OPL_ShutdownMusic(void)
 
 static boolean I_OPL_InitMusic(void)
 {
-    if (!OPL_Init(snd_mport))
+    if (!OPL_Init(opl_io_port))
     {
         return false;
     }
diff --git a/src/m_config.c b/src/m_config.c
index 0d0faea0..4f789845 100644
--- a/src/m_config.c
+++ b/src/m_config.c
@@ -184,7 +184,6 @@ extern int      vanilla_demo_limit;
 extern int snd_musicdevice;
 extern int snd_sfxdevice;
 extern int snd_samplerate;
-extern int snd_mport;
 
 // controls whether to use libsamplerate for sample rate conversions
 
@@ -197,6 +196,7 @@ extern int use_libsamplerate;
 static int snd_sbport = 0;
 static int snd_sbirq = 0;
 static int snd_sbdma = 0;
+static int snd_mport = 0;
 
 typedef enum 
 {
-- 
cgit v1.2.3