* fhandler.h (fhandler_dev_dsp): Remove variable names from declarations.

(fhandler_dev_dsp::close_audio_in): Make __reg1.
(fhandler_dev_dsp::close_audio_out): Make __reg2.
* fhandler_dev_dsp.cc (fhandler_dev_dsp::close_audio_in): Make __reg1.
(fhandler_dev_dsp::close_audio_out): Make __reg2.
(fhandler_dev_dsp::close): Don't abruptly terminate sound just because we are
exiting.
This commit is contained in:
Christopher Faylor
2014-03-19 20:43:15 +00:00
parent 2c1e724ba4
commit 71f36ed3c2
3 changed files with 25 additions and 14 deletions

View File

@@ -1160,7 +1160,7 @@ fhandler_dev_dsp::_read (void *ptr, size_t& len)
audio_in_->read ((char *)ptr, (int&)len);
}
void
void __reg1
fhandler_dev_dsp::close_audio_in ()
{
if (audio_in_)
@@ -1171,7 +1171,7 @@ fhandler_dev_dsp::close_audio_in ()
}
}
void
void __reg2
fhandler_dev_dsp::close_audio_out (bool immediately)
{
if (audio_out_)
@@ -1187,7 +1187,7 @@ fhandler_dev_dsp::close ()
{
debug_printf ("audio_in=%p audio_out=%p", audio_in_, audio_out_);
close_audio_in ();
close_audio_out (exit_state != ES_NOT_EXITING);
close_audio_out ();
return fhandler_base::close ();
}