[PATCH] winecoreaudio: Remove workarounds for Mac OS X 10.4 and 10.5.
Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- Also remove the check for AudioToolbox/AudioConverter.h, the only user of that macro was removed in d9ed4ee992b0b277dacf87d05cc0b69bcd06b90c ("l3codeca.acm: Remove the Mac OS AudioToolbox backend.") configure.ac | 18 ++---------------- dlls/winecoreaudio.drv/audiounit.c | 20 -------------------- dlls/winecoreaudio.drv/mmdevdrv.c | 22 ---------------------- 3 files changed, 2 insertions(+), 58 deletions(-) diff --git a/configure.ac b/configure.ac index ade04399af0..f76dd047825 100644 --- a/configure.ac +++ b/configure.ac @@ -431,9 +431,6 @@ AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ AL/al.h \ ApplicationServices/ApplicationServices.h \ - AudioToolbox/AudioConverter.h \ - AudioUnit/AudioUnit.h \ - AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ CommonCrypto/CommonCryptor.h \ @@ -800,21 +797,10 @@ case $host_os in AC_CHECK_FUNCS(SSLCopyPeerCertificates) LIBS="$ac_save_LIBS" fi - if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" + if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" then - if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" - then - AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") - else - dnl CoreServices needed by AudioUnit - AC_SUBST(COREAUDIO_LIBS,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") - fi + AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes} - dnl Check for the AUGraphAddNode function - ac_save_LIBS="$LIBS" - LIBS="$LIBS $COREAUDIO_LIBS" - AC_CHECK_FUNCS(AUGraphAddNode) - LIBS="$ac_save_LIBS" fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index a3c190870ad..030ff4d090a 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -22,9 +22,6 @@ #define ULONG CoreFoundation_ULONG #define HRESULT CoreFoundation_HRESULT -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -#include <CoreServices/CoreServices.h> -#endif #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> #undef ULONG @@ -50,23 +47,6 @@ #include "coreaudio.h" #include "wine/debug.h" -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager types for compatibility's sake */ -typedef ComponentDescription AudioComponentDescription; -#endif - -#ifndef HAVE_AUGRAPHADDNODE -static inline OSStatus AUGraphAddNode(AUGraph graph, const AudioComponentDescription *desc, AUNode *node) -{ - return AUGraphNewNode(graph, desc, 0, NULL, node); -} - -static inline OSStatus AUGraphNodeInfo(AUGraph graph, AUNode node, AudioComponentDescription *desc, AudioUnit *au) -{ - return AUGraphGetNodeInfo(graph, node, desc, 0, NULL, au); -} -#endif - WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DECLARE_DEBUG_CHANNEL(midi); diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index bc153d92511..f07f4bae5fb 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -72,28 +72,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(coreaudio); -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager functions for OSX 10.5 */ -typedef Component AudioComponent; -typedef ComponentDescription AudioComponentDescription; -typedef ComponentInstance AudioComponentInstance; - -static inline AudioComponent AudioComponentFindNext(AudioComponent ac, AudioComponentDescription *desc) -{ - return FindNextComponent(ac, desc); -} - -static inline OSStatus AudioComponentInstanceNew(AudioComponent ac, AudioComponentInstance *aci) -{ - return OpenAComponent(ac, aci); -} - -static inline OSStatus AudioComponentInstanceDispose(AudioComponentInstance aci) -{ - return CloseComponent(aci); -} -#endif - #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER) static const REFERENCE_TIME DefaultPeriod = 100000; -- 2.31.1
Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- I don't have a mac system set up to build, but the code changes look fine to me. On Thu, Jun 17, 2021 at 03:55:36PM -0700, Brendan Shanks wrote:
Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> ---
Also remove the check for AudioToolbox/AudioConverter.h, the only user of that macro was removed in d9ed4ee992b0b277dacf87d05cc0b69bcd06b90c ("l3codeca.acm: Remove the Mac OS AudioToolbox backend.")
configure.ac | 18 ++---------------- dlls/winecoreaudio.drv/audiounit.c | 20 -------------------- dlls/winecoreaudio.drv/mmdevdrv.c | 22 ---------------------- 3 files changed, 2 insertions(+), 58 deletions(-)
diff --git a/configure.ac b/configure.ac index ade04399af0..f76dd047825 100644 --- a/configure.ac +++ b/configure.ac @@ -431,9 +431,6 @@ AC_SYS_LARGEFILE() AC_CHECK_HEADERS(\ AL/al.h \ ApplicationServices/ApplicationServices.h \ - AudioToolbox/AudioConverter.h \ - AudioUnit/AudioUnit.h \ - AudioUnit/AudioComponent.h \ CL/cl.h \ Carbon/Carbon.h \ CommonCrypto/CommonCryptor.h \ @@ -800,21 +797,10 @@ case $host_os in AC_CHECK_FUNCS(SSLCopyPeerCertificates) LIBS="$ac_save_LIBS" fi - if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" -a "$ac_cv_header_AudioUnit_AudioUnit_h" = "yes" + if test "$ac_cv_header_CoreAudio_CoreAudio_h" = "yes" then - if test "$ac_cv_header_AudioUnit_AudioComponent_h" = "yes" - then - AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") - else - dnl CoreServices needed by AudioUnit - AC_SUBST(COREAUDIO_LIBS,"-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI") - fi + AC_SUBST(COREAUDIO_LIBS,"-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI") enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes} - dnl Check for the AUGraphAddNode function - ac_save_LIBS="$LIBS" - LIBS="$LIBS $COREAUDIO_LIBS" - AC_CHECK_FUNCS(AUGraphAddNode) - LIBS="$ac_save_LIBS" fi if test "$ac_cv_header_OpenAL_al_h" = "yes" then diff --git a/dlls/winecoreaudio.drv/audiounit.c b/dlls/winecoreaudio.drv/audiounit.c index a3c190870ad..030ff4d090a 100644 --- a/dlls/winecoreaudio.drv/audiounit.c +++ b/dlls/winecoreaudio.drv/audiounit.c @@ -22,9 +22,6 @@
#define ULONG CoreFoundation_ULONG #define HRESULT CoreFoundation_HRESULT -#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -#include <CoreServices/CoreServices.h> -#endif #include <AudioUnit/AudioUnit.h> #include <AudioToolbox/AudioToolbox.h> #undef ULONG @@ -50,23 +47,6 @@ #include "coreaudio.h" #include "wine/debug.h"
-#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager types for compatibility's sake */ -typedef ComponentDescription AudioComponentDescription; -#endif - -#ifndef HAVE_AUGRAPHADDNODE -static inline OSStatus AUGraphAddNode(AUGraph graph, const AudioComponentDescription *desc, AUNode *node) -{ - return AUGraphNewNode(graph, desc, 0, NULL, node); -} - -static inline OSStatus AUGraphNodeInfo(AUGraph graph, AUNode node, AudioComponentDescription *desc, AudioUnit *au) -{ - return AUGraphGetNodeInfo(graph, node, desc, 0, NULL, au); -} -#endif - WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DECLARE_DEBUG_CHANNEL(midi);
diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index bc153d92511..f07f4bae5fb 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -72,28 +72,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(coreaudio);
-#ifndef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H -/* Define new AudioComponent Manager functions for OSX 10.5 */ -typedef Component AudioComponent; -typedef ComponentDescription AudioComponentDescription; -typedef ComponentInstance AudioComponentInstance; - -static inline AudioComponent AudioComponentFindNext(AudioComponent ac, AudioComponentDescription *desc) -{ - return FindNextComponent(ac, desc); -} - -static inline OSStatus AudioComponentInstanceNew(AudioComponent ac, AudioComponentInstance *aci) -{ - return OpenAComponent(ac, aci); -} - -static inline OSStatus AudioComponentInstanceDispose(AudioComponentInstance aci) -{ - return CloseComponent(aci); -} -#endif - #define NULL_PTR_ERR MAKE_HRESULT(SEVERITY_ERROR, FACILITY_WIN32, RPC_X_NULL_REF_POINTER)
static const REFERENCE_TIME DefaultPeriod = 100000; -- 2.31.1
participants (2)
-
Andrew Eikum -
Brendan Shanks