On Mon, 6 Jun 2011, Andriy Gapon wrote: > Woops! I admit I just copied the description and the patch from the PR. > How inattentive I could be while doing that? > > Gerald, should the patch have actually introduced SNDCTL_DSP_HALT as the > description says?
Yikes! You are totally right, Pan Tsu and Andriy. Below you'll find the corresponding patch I got into Wine upstream, so clearly this should have been about SNDCTL_DSP_HALT. Sorry about the snafu on this and the delay in getting back to this; in between business travel and vacation I haven't been home for more than three weeks. Gerald ==== patch ==== From: Gerald Pfeifer <[email protected]> To: [email protected] Cc: Andrew Eikum <[email protected]> Date: Thu, 19 May 2011 08:24:23 -0600 (MDT) Subject: wineoss.drv: Cope with system which lack SNDCTL_DSP_HALT. This is the last patch that is necessary to make vanilla Wine build on current versions of FreeBSD. I will also send a summary in response to Andrew's question around this Gerald --- dlls/wineoss.drv/mmdevdrv.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 7dec1e0..0edcb25 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -53,6 +53,13 @@ #include "audiopolicy.h" #include "audioclient.h" + +/* Some implementations of OSS, such as FreeBSD older than 9.0, lack + SNDCTL_DSP_HALT which is just a synonym for the older SNDCTL_DSP_RESET. */ +#ifndef SNDCTL_DSP_HALT +#define SNDCTL_DSP_HALT SNDCTL_DSP_RESET +#endif + WINE_DEFAULT_DEBUG_CHANNEL(oss); #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) -- 1.7.4.1 _______________________________________________ [email protected] mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "[email protected]"
