* 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:
parent
2c1e724ba4
commit
71f36ed3c2
|
@ -1,3 +1,14 @@
|
||||||
|
2014-03-19 Christopher Faylor <me.cygwin2014@cgf.cx>
|
||||||
|
|
||||||
|
* 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.
|
||||||
|
|
||||||
2014-03-19 Corinna Vinschen <corinna@vinschen.de>
|
2014-03-19 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
* exception.h (exception::handle_while_being_debugged): Declare.
|
* exception.h (exception::handle_while_being_debugged): Declare.
|
||||||
|
|
|
@ -1792,23 +1792,23 @@ class fhandler_dev_dsp: public fhandler_base
|
||||||
fhandler_dev_dsp ();
|
fhandler_dev_dsp ();
|
||||||
fhandler_dev_dsp *base () const {return (fhandler_dev_dsp *)archetype;}
|
fhandler_dev_dsp *base () const {return (fhandler_dev_dsp *)archetype;}
|
||||||
|
|
||||||
int open (int flags, mode_t mode = 0);
|
int open (int, mode_t mode = 0);
|
||||||
ssize_t __stdcall write (const void *ptr, size_t len);
|
ssize_t __stdcall write (const void *, size_t);
|
||||||
void __reg3 read (void *ptr, size_t& len);
|
void __reg3 read (void *, size_t&);
|
||||||
int ioctl (unsigned int cmd, void *);
|
int ioctl (unsigned int, void *);
|
||||||
int close ();
|
int close ();
|
||||||
void fixup_after_fork (HANDLE parent);
|
void fixup_after_fork (HANDLE);
|
||||||
void fixup_after_exec ();
|
void fixup_after_exec ();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
ssize_t __stdcall _write (const void *ptr, size_t len);
|
ssize_t __stdcall _write (const void *, size_t);
|
||||||
void __reg3 _read (void *ptr, size_t& len);
|
void __reg3 _read (void *, size_t&);
|
||||||
int _ioctl (unsigned int cmd, void *);
|
int _ioctl (unsigned int, void *);
|
||||||
void _fixup_after_fork (HANDLE parent);
|
void _fixup_after_fork (HANDLE);
|
||||||
void _fixup_after_exec ();
|
void _fixup_after_exec ();
|
||||||
|
|
||||||
void close_audio_in ();
|
void __reg1 close_audio_in ();
|
||||||
void close_audio_out (bool immediately = false);
|
void __reg2 close_audio_out (bool = false);
|
||||||
bool use_archetype () const {return true;}
|
bool use_archetype () const {return true;}
|
||||||
|
|
||||||
fhandler_dev_dsp (void *) {}
|
fhandler_dev_dsp (void *) {}
|
||||||
|
|
|
@ -1160,7 +1160,7 @@ fhandler_dev_dsp::_read (void *ptr, size_t& len)
|
||||||
audio_in_->read ((char *)ptr, (int&)len);
|
audio_in_->read ((char *)ptr, (int&)len);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void __reg1
|
||||||
fhandler_dev_dsp::close_audio_in ()
|
fhandler_dev_dsp::close_audio_in ()
|
||||||
{
|
{
|
||||||
if (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)
|
fhandler_dev_dsp::close_audio_out (bool immediately)
|
||||||
{
|
{
|
||||||
if (audio_out_)
|
if (audio_out_)
|
||||||
|
@ -1187,7 +1187,7 @@ fhandler_dev_dsp::close ()
|
||||||
{
|
{
|
||||||
debug_printf ("audio_in=%p audio_out=%p", audio_in_, audio_out_);
|
debug_printf ("audio_in=%p audio_out=%p", audio_in_, audio_out_);
|
||||||
close_audio_in ();
|
close_audio_in ();
|
||||||
close_audio_out (exit_state != ES_NOT_EXITING);
|
close_audio_out ();
|
||||||
return fhandler_base::close ();
|
return fhandler_base::close ();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue