From 6653af6cc2d118f50dc8b7a37ba24d9bb9865ef6 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 23 Mar 2004 11:05:56 +0000 Subject: * autoload.cc: Load eight more functions for waveIn support. * fhandler.h (class fhandler_dev_dsp): Add class Audio, class Audio_in and class Audio_out members and audio_in_, audio_out_ pointers so that future changes are restricted to file fhandler_dsp.cc. * fhandler_dsp.cc (fhandler_dev_dsp::Audio): Add this class to treat things common to audio recording and playback. Add more format conversions. (fhandler_dev_dsp::Audio::queue): New queues for buffer management to fix incomplete cleanup of buffers passed to the wave device. (fhandler_dev_dsp::Audio_in): New, added class to implement audio recording. (fhandler_dev_dsp::Audio_out): Rework to use functionality provided by fhandler_dev_dsp::Audio. Allocate memory audio buffers late, just before write. (fhandler_dev_dsp::Audio_out::start): Size of wave buffer allocated here depends on audio rate/bits/channels. (fhandler_dev_dsp::Audio_in::start): Ditto. (fhandler_dev_dsp::setupwav): Replaced by following function. (fhandler_dev_dsp::Audio_out::parsewav): Does not setup wave device any more. Discard wave header properly. (fhandler_dev_dsp::open): Add O_RDONLY and_RDWR as legal modes. Protect against re-open. Activate fork_fixup. (fhandler_dev_dsp::ioctl): Protect against actions when audio is active. SNDCTL_DSP_GETFMTS only returns formats supported by mmsystem wave API, not all supported formats. SNDCTL_DSP_GETBLKSIZE result now depends on current audio format. (fhandler_dev_dsp::fixup_after_fork): Call fork_fixup for the Audio classes to let them duplicate the CRITICAL_SECTION. --- winsup/cygwin/fhandler.h | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/fhandler.h') diff --git a/winsup/cygwin/fhandler.h b/winsup/cygwin/fhandler.h index 26380e263..c7d7568ed 100644 --- a/winsup/cygwin/fhandler.h +++ b/winsup/cygwin/fhandler.h @@ -1105,14 +1105,20 @@ class fhandler_windows: public fhandler_base bool is_slow () {return 1;} }; -class fhandler_dev_dsp : public fhandler_base +class fhandler_dev_dsp: public fhandler_base { + public: + class Audio; + class Audio_out; + class Audio_in; private: int audioformat_; int audiofreq_; int audiobits_; int audiochannels_; - bool setupwav(const char *pData, int nBytes); + static int open_count; // per process + Audio_out *audio_out_; + Audio_in *audio_in_; public: fhandler_dev_dsp (); ~fhandler_dev_dsp(); @@ -1125,6 +1131,7 @@ class fhandler_dev_dsp : public fhandler_base int close (void); int dup (fhandler_base *child); void dump (void); + void fixup_after_fork (HANDLE parent); void fixup_after_exec (); }; -- cgit v1.2.3