Module: wine Branch: master Commit: 41d9d0a2f351d983834422aba70ea44841fa974c URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d9d0a2f351d983834422aba7...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Mar 28 22:15:12 2011 +0200
winecoreaudio.drv: Remove unnecessary ifdefs.
---
dlls/winecoreaudio.drv/audio.c | 27 --------------------------- dlls/winecoreaudio.drv/audiounit.c | 4 ---- dlls/winecoreaudio.drv/coreaudio.c | 6 +----- dlls/winecoreaudio.drv/coremidi.c | 3 --- dlls/winecoreaudio.drv/midi.c | 16 ---------------- dlls/winecoreaudio.drv/mixer.c | 11 ----------- 6 files changed, 1 insertions(+), 66 deletions(-)
diff --git a/dlls/winecoreaudio.drv/audio.c b/dlls/winecoreaudio.drv/audio.c index 9fb11b1..faf4f54 100644 --- a/dlls/winecoreaudio.drv/audio.c +++ b/dlls/winecoreaudio.drv/audio.c @@ -59,9 +59,6 @@ #include "wine/list.h"
WINE_DEFAULT_DEBUG_CHANNEL(wave); - -#if defined(HAVE_COREAUDIO_COREAUDIO_H) && defined(HAVE_AUDIOUNIT_AUDIOUNIT_H) - WINE_DECLARE_DEBUG_CHANNEL(coreaudio);
/* @@ -2547,27 +2544,3 @@ OSStatus CoreAudio_wiAudioUnitIOProc(void *inRefCon, if (needNotify) wodSendNotifyInputCompletionsMessage(wwi); return err; } - -#else - -/************************************************************************** - * widMessage (WINECOREAUDIO.6) - */ -DWORD WINAPI CoreAudio_widMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) -{ - FIXME("(%u, %04X, %08X, %08X, %08X): CoreAudio support not compiled into wine\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -/************************************************************************** -* wodMessage (WINECOREAUDIO.7) -*/ -DWORD WINAPI CoreAudio_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) -{ - FIXME("(%u, %04X, %08X, %08X, %08X): CoreAudio support not compiled into wine\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -#endif diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index bd0ad17..bbe565f 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -20,8 +20,6 @@
#include "config.h"
-#ifdef HAVE_AUDIOUNIT_AUDIOUNIT_H - #define ULONG CoreFoundation_ULONG #define HRESULT CoreFoundation_HRESULT #ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H @@ -503,5 +501,3 @@ int SynthUnit_Close(AUGraph graph)
return 1; } - -#endif diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index 0690afd..b065030 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -34,7 +34,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(coreaudio);
-#ifdef HAVE_COREAUDIO_COREAUDIO_H
/************************************************************************** * CoreAudio_drvLoad [internal] @@ -80,7 +79,6 @@ static DWORD CoreAudio_drvClose(DWORD dwDevID) TRACE("(%08x)\n", dwDevID); return 1; } -#endif /* HAVE_COREAUDIO_COREAUDIO_H */
/************************************************************************** * DriverProc (WINECOREAUDIO.1) @@ -100,9 +98,8 @@ LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, wMsg == DRV_INSTALL ? "DRV_INSTALL" : wMsg == DRV_REMOVE ? "DRV_REMOVE" : "UNKNOWN", wMsg, dwParam1, dwParam2); - + switch(wMsg) { -#ifdef HAVE_COREAUDIO_COREAUDIO_H case DRV_LOAD: return CoreAudio_drvLoad(); case DRV_FREE: return CoreAudio_drvFree(); case DRV_OPEN: return CoreAudio_drvOpen((LPSTR)dwParam1); @@ -113,7 +110,6 @@ LRESULT CALLBACK CoreAudio_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, case DRV_CONFIGURE: MessageBoxA(0, "CoreAudio driver!", "CoreAudio driver", MB_OK); return 1; case DRV_INSTALL: return DRVCNF_RESTART; case DRV_REMOVE: return DRVCNF_RESTART; -#endif default: return DefDriverProc(dwDevID, hDriv, wMsg, dwParam1, dwParam2); } diff --git a/dlls/winecoreaudio.drv/coremidi.c b/dlls/winecoreaudio.drv/coremidi.c index ea7d2fd..1733418 100644 --- a/dlls/winecoreaudio.drv/coremidi.c +++ b/dlls/winecoreaudio.drv/coremidi.c @@ -21,8 +21,6 @@
#include "config.h"
-#ifdef HAVE_COREAUDIO_COREAUDIO_H - #include <CoreMIDI/CoreMIDI.h> #include <mach/mach_time.h>
@@ -84,4 +82,3 @@ void MIDIOut_Send(MIDIPortRef port, MIDIEndpointRef dest, UInt8 *buffer, unsigne if (packet) MIDISend(port, dest, packetList); } -#endif /* HAVE_COREAUDIO_COREAUDIO_H */ diff --git a/dlls/winecoreaudio.drv/midi.c b/dlls/winecoreaudio.drv/midi.c index 071e937..a50fc78 100644 --- a/dlls/winecoreaudio.drv/midi.c +++ b/dlls/winecoreaudio.drv/midi.c @@ -44,7 +44,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(midi);
-#if defined(HAVE_COREAUDIO_COREAUDIO_H) #include <CoreAudio/CoreAudio.h>
#define WINE_DEFINITIONS @@ -1021,18 +1020,3 @@ DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dw } return MMSYSERR_NOTSUPPORTED; } -#else - -DWORD WINAPI CoreAudio_modMessage(UINT wDevID, UINT wMsg, DWORD dwUser, DWORD dwParam1, DWORD dwParam2) -{ - TRACE("%08x, %08x, %08x, %08x, %08x\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -DWORD WINAPI CoreAudio_midMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD dwParam1, DWORD dwParam2) -{ - TRACE("%08x, %08x, %08x, %08x, %08x\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} -#endif diff --git a/dlls/winecoreaudio.drv/mixer.c b/dlls/winecoreaudio.drv/mixer.c index 1e9faef..7a64aa4 100644 --- a/dlls/winecoreaudio.drv/mixer.c +++ b/dlls/winecoreaudio.drv/mixer.c @@ -43,7 +43,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(mixer);
-#if defined(HAVE_COREAUDIO_COREAUDIO_H) #include <CoreAudio/CoreAudio.h> #include <CoreFoundation/CoreFoundation.h>
@@ -1027,13 +1026,3 @@ DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, return MMSYSERR_NOTSUPPORTED; } } - -#else - -DWORD WINAPI CoreAudio_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - TRACE("(%04X, %04x, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} -#endif /* HAVE_COREAUDIO_COREAUDIO_H */