mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added failure handling to beep_on() and the ALSA PCM output methods (patch by

Browse Source 
Dawn Teschendorf)
This commit is contained in:
Volker Ruppert 2014-05-02 06:38:49 +00:00
parent b85e582f44
commit 9c8e43b75c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bochs/iodev/sound/soundalsa.cc
View File

@ -2,7 +2,7 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2013 The Bochs Project
// Copyright (C) 2013-2014 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@ -322,6 +322,11 @@ int bx_sound_alsa_c::alsa_pcm_write()
int bx_sound_alsa_c::sendwavepacket(int length, Bit8u data[])
{
if (!alsa_pcm[0].handle) {
// Alert indicating that caller is probably erroneous
BX_ERROR(("sendwavepacket(): pcm is not open"));
return BX_SOUNDLOW_ERR;
}
if ((alsa_pcm[0].audio_bufsize+length) <= BX_SOUND_LINUX_BUFSIZE) {
memcpy(audio_buffer[0]+alsa_pcm[0].audio_bufsize, data, length);
alsa_pcm[0].audio_bufsize += length;
@ -338,7 +343,7 @@ int bx_sound_alsa_c::sendwavepacket(int length, Bit8u data[])
int bx_sound_alsa_c::stopwaveplayback()
{
if (alsa_pcm[0].audio_bufsize > 0) {
if (alsa_pcm[0].handle && alsa_pcm[0].audio_bufsize > 0) {
if (alsa_pcm[0].audio_bufsize < alsa_pcm[0].alsa_bufsize) {
memset(audio_buffer[0]+alsa_pcm[0].audio_bufsize, 0, alsa_pcm[0].alsa_bufsize-alsa_pcm[0].audio_bufsize);
alsa_pcm[0].audio_bufsize = alsa_pcm[0].alsa_bufsize;

6
bochs/iodev/sound/soundmod.cc
View File

@ -2,7 +2,7 @@
// $Id$
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2011-2013 The Bochs Project
// Copyright (C) 2011-2014 The Bochs Project
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@ -179,7 +179,9 @@ bx_bool bx_soundmod_ctl_c::beep_on(float frequency)
if (beep_control > 0) {
beep_off();
}
soundmod->startwaveplayback(44100, 8, 0, 0);
if (soundmod->startwaveplayback(44100, 8, 0, 0) == BX_SOUNDLOW_ERR) {
return 0;
}
beep_bytes = (int)(44100.0 / frequency / 2);
beep_bufsize = 4410;
beep_buffer = (Bit8u*)malloc(beep_bufsize);