From db51b635542c293b5f0f123feab80ba4cb8b5c84 Mon Sep 17 00:00:00 2001 From: Peter Veenstra Date: Wed, 20 Nov 2019 07:17:12 +0000 Subject: [PATCH] Remove some old code and do an a=a to trick a compiler in non-debug mode Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@4293 --- src/hardware/mixer.cpp | 7 +++---- src/hardware/sblaster.cpp | 2 ++ 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/hardware/mixer.cpp b/src/hardware/mixer.cpp index 41f291f1..4d4be5cb 100644 --- a/src/hardware/mixer.cpp +++ b/src/hardware/mixer.cpp @@ -612,19 +612,18 @@ public: if (cmd->FindString("MASTER",temp_line,false)) { MakeVolume((char *)temp_line.c_str(),mixer.mastervol[0],mixer.mastervol[1]); } - MixerChannel * chan=mixer.channels; + MixerChannel * chan = mixer.channels; while (chan) { if (cmd->FindString(chan->name,temp_line,false)) { MakeVolume((char *)temp_line.c_str(),chan->volmain[0],chan->volmain[1]); } chan->UpdateVolume(); - chan=chan->next; + chan = chan->next; } if (cmd->FindExist("/NOSHOW")) return; - chan=mixer.channels; WriteOut("Channel Main Main(dB)\n"); ShowVolume("MASTER",mixer.mastervol[0],mixer.mastervol[1]); - for (chan=mixer.channels;chan;chan=chan->next) + for (chan = mixer.channels;chan;chan = chan->next) ShowVolume(chan->name,chan->volmain[0],chan->volmain[1]); } private: diff --git a/src/hardware/sblaster.cpp b/src/hardware/sblaster.cpp index af73d063..056079d4 100644 --- a/src/hardware/sblaster.cpp +++ b/src/hardware/sblaster.cpp @@ -707,6 +707,8 @@ static void DSP_DoDMATransfer(DMA_MODES mode,Bitu freq,bool autoinit, bool stere autoinit ? "Auto-Init" : "Single-Cycle", freq, sb.dma.rate, sb.dma.left ); +#else + type = type; #endif }