summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/fhandler_dsp.cc
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2005-07-05 03:16:46 +0000
committerChristopher Faylor <me@cgf.cx>2005-07-05 03:16:46 +0000
commit2f9ae2ed94384a3df6687545338e363654dd7d8f (patch)
tree1e3a8d3c5c555b498bb165b66abac6994ea96127 /winsup/cygwin/fhandler_dsp.cc
parent26edeb6a7f6c541a25ee7fa4c201b24fea01cc50 (diff)
downloadcygnal-2f9ae2ed94384a3df6687545338e363654dd7d8f.tar.gz
cygnal-2f9ae2ed94384a3df6687545338e363654dd7d8f.tar.bz2
cygnal-2f9ae2ed94384a3df6687545338e363654dd7d8f.zip
Change foo (void) to foo () for all c++ functions throughout. Remove all
fhandler_*::dump functions throughout. * fhandler.h (fhandler_dev_mem::close): Remove pass-through function in favor of virtual method. (handler_dev_raw::close): Ditto. (fhandler_dev_clipboard::fixup_after_exec): New method. * fhandler_dev_mem.cc (fhandler_dev_mem::close): Eliminate pass through * fhandler_dev_raw.cc (fhandler_dev_raw::close): Ditto. * fhandler_clipboard.cc (fhandler_dev_clipboard::close): Don't go to extra effort when execing. (fhandler_dev_clipboard::fixup_after_exec): New function. * fhandler_console.cc (fhandler_console::close): Don't do "extra stuff" when we know we're execing. * fhandler_disk_file.cc (fhandler_disk_file::close): Ditto. * fhandler_dsp.cc (fhandler_dev_dsp::close): Ditto. * fhandler_fifo.cc (fhandler_fifo.cc::close): Ditto. function in favor of base function. * fhandler_random.cc (fhandler_dev_random::close): Ditto. * fhandler_registry.cc (fhandler_registry::close): Ditto. * fhandler_tty.cc (fhandler_tty_slave::close): Ditto. * fhandler_virtual.cc (fhandler_virtual::close): Ditto. * pinfo.cc (proc_waiter): Remove unneeded hExeced declaration. * sigproc.cc: Ditto. * winsup.h (hExeced): Define here. * fhandler_virtual.cc (fhandler_virtual::fixup_after_exec): Just call close() to reinitialize things to known state.
Diffstat (limited to 'winsup/cygwin/fhandler_dsp.cc')
-rw-r--r--winsup/cygwin/fhandler_dsp.cc23
1 files changed, 10 insertions, 13 deletions
diff --git a/winsup/cygwin/fhandler_dsp.cc b/winsup/cygwin/fhandler_dsp.cc
index 6a10a24f9..c3e185af0 100644
--- a/winsup/cygwin/fhandler_dsp.cc
+++ b/winsup/cygwin/fhandler_dsp.cc
@@ -1109,17 +1109,20 @@ fhandler_dev_dsp::close_audio_out (bool immediately)
}
int
-fhandler_dev_dsp::close (void)
+fhandler_dev_dsp::close ()
{
debug_printf ("audio_in=%08x audio_out=%08x",
(int)audio_in_, (int)audio_out_);
- if ((fhandler_dev_dsp *) archetype != this)
- return ((fhandler_dev_dsp *)archetype)->close ();
-
- if (--usecount == 0)
+ if (!hExeced)
{
- close_audio_in ();
- close_audio_out (exit_state != ES_NOT_EXITING);
+ if ((fhandler_dev_dsp *) archetype != this)
+ return ((fhandler_dev_dsp *) archetype)->close ();
+
+ if (--usecount == 0)
+ {
+ close_audio_in ();
+ close_audio_out (exit_state != ES_NOT_EXITING);
+ }
}
return 0;
}
@@ -1343,12 +1346,6 @@ fhandler_dev_dsp::ioctl (unsigned int cmd, void *ptr)
}
void
-fhandler_dev_dsp::dump ()
-{
- paranoid_printf ("here");
-}
-
-void
fhandler_dev_dsp::fixup_after_fork (HANDLE parent)
{ // called from new child process
debug_printf ("audio_in=%08x audio_out=%08x",