From 4807b0f93c3c00fa547513d5611a34b6e58407b0 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Wed, 8 Sep 2004 09:41:13 +0000 Subject: [PATCH] Removed tandy option Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1951 --- src/dosbox.cpp | 5 ++--- src/hardware/tandy_sound.cpp | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/dosbox.cpp b/src/dosbox.cpp index 24a542e0..542d1315 100644 --- a/src/dosbox.cpp +++ b/src/dosbox.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: dosbox.cpp,v 1.75 2004-08-23 08:24:07 harekiet Exp $ */ +/* $Id: dosbox.cpp,v 1.76 2004-09-08 09:41:13 qbix79 Exp $ */ #include #include @@ -340,7 +340,6 @@ void DOSBOX_Init(void) { secprop->Add_bool("pcspeaker",true); secprop->Add_int("pcrate",22050); secprop->AddInitFunction(&TANDYSOUND_Init); - secprop->Add_bool("tandy",true); secprop->Add_int("tandyrate",22050); secprop->AddInitFunction(&DISNEY_Init); secprop->Add_bool("disney",true); @@ -348,8 +347,8 @@ void DOSBOX_Init(void) { MSG_Add("SPEAKER_CONFIGFILE_HELP", "pcspeaker -- Enable PC-Speaker emulation.\n" "pcrate -- Sample rate of the PC-Speaker sound generation.\n" - "tandy -- Enable Tandy 3-Voice emulation.\n" "tandyrate -- Sample rate of the Tandy 3-Voice generation.\n" + " Tandysound emulation is present if machine is set to tandy.\n" "disney -- Enable Disney Sound Source emulation.\n" ); secprop=control->AddSection_prop("bios",&BIOS_Init); diff --git a/src/hardware/tandy_sound.cpp b/src/hardware/tandy_sound.cpp index 4ba44264..0983a28e 100644 --- a/src/hardware/tandy_sound.cpp +++ b/src/hardware/tandy_sound.cpp @@ -311,7 +311,6 @@ static void SN76496_set_gain(int gain) void TANDYSOUND_Init(Section* sec) { if (machine!=MCH_TANDY) return; Section_prop * section=static_cast(sec); - if(!section->Get_bool("tandy")) return; IO_RegisterWriteHandler(0xc0,SN76496Write,IO_MB,2); IO_RegisterWriteHandler(0xc4,TandyDACWrite,IO_MB,4);