valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Only do things with the channel if it actually is present. Fixes some crashes with pcspeaker disabled

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2104
This commit is contained in:
Peter Veenstra 2005-02-03 10:34:37 +00:00
parent 7711206341
commit 3105209dad
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/hardware/pcspeaker.cpp
View file

@ -15,6 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: pcspeaker.cpp,v 1.18 2005-02-03 10:34:37 qbix79 Exp $ */
#include <math.h>
#include "dosbox.h"
@ -158,7 +160,7 @@ static void ForwardPIT(float newindex) {
void PCSPEAKER_SetCounter(Bitu cntr,Bitu mode) {
if (!spkr.last_ticks) {
spkr.chan->Enable(true);
if(spkr.chan) spkr.chan->Enable(true);
spkr.last_index=0;
}
spkr.last_ticks=PIC_Ticks;
@ -213,7 +215,7 @@ void PCSPEAKER_SetCounter(Bitu cntr,Bitu mode) {
void PCSPEAKER_SetType(Bitu mode) {
if (!spkr.last_ticks) {
spkr.chan->Enable(true);
if(spkr.chan) spkr.chan->Enable(true);
spkr.last_index=0;
}
spkr.last_ticks=PIC_Ticks;
@ -296,10 +298,10 @@ static void PCSPEAKER_CallBack(Bitu len) {
}
*stream++=(Bit16s)(value/sample_add);
}
spkr.chan->AddSamples_m16(len,(Bit16s*)MixTemp);
if(spkr.chan) spkr.chan->AddSamples_m16(len,(Bit16s*)MixTemp);
if ((spkr.last_ticks+10000)<PIC_Ticks) {
spkr.last_ticks=0;
spkr.chan->Enable(false);
if(spkr.chan) spkr.chan->Enable(false);
}
}