Brendan Shanks : winecoreaudio: Remove workarounds for Mac OS X 10.4 and 10.5.
Alexandre Julliard
julliard at winehq.org
Fri Jun 18 14:45:52 CDT 2021
Module: wine
Branch: master
Commit: c50dab4828fc8422a56cccee56c2cc84ae4468f8
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c50dab4828fc8422a56cccee56c2cc84ae4468f8
Author: Brendan Shanks <bshanks at codeweavers.com>
Date: Thu Jun 17 15:55:36 2021 -0700
winecoreaudio: Remove workarounds for Mac OS X 10.4 and 10.5.
Signed-off-by: Brendan Shanks <bshanks at codeweavers.com>
Signed-off-by: Andrew Eikum <aeikum at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 27 ++-------------------------
configure.ac | 18 ++----------------
dlls/winecoreaudio.drv/audiounit.c | 20 --------------------
dlls/winecoreaudio.drv/mmdevdrv.c | 22 ----------------------
include/config.h.in | 12 ------------
5 files changed, 4 insertions(+), 95 deletions(-)
diff --git a/configure b/configure
index 1ddc2ea65a8..48983b414db 100755
--- a/configure
+++ b/configure
@@ -7453,9 +7453,6 @@ done
for ac_header in \
AL/al.h \
ApplicationServices/ApplicationServices.h \
- AudioToolbox/AudioConverter.h \
- AudioUnit/AudioUnit.h \
- AudioUnit/AudioComponent.h \
CL/cl.h \
Carbon/Carbon.h \
CommonCrypto/CommonCryptor.h \
@@ -8974,31 +8971,11 @@ done
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
- COREAUDIO_LIBS="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI"
-
- else
- COREAUDIO_LIBS="-framework CoreAudio -framework AudioUnit -framework CoreServices -framework AudioToolbox -framework CoreMIDI"
+ COREAUDIO_LIBS="-framework CoreFoundation -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework CoreMIDI"
- fi
enable_winecoreaudio_drv=${enable_winecoreaudio_drv:-yes}
- ac_save_LIBS="$LIBS"
- LIBS="$LIBS $COREAUDIO_LIBS"
- for ac_func in AUGraphAddNode
-do :
- ac_fn_c_check_func "$LINENO" "AUGraphAddNode" "ac_cv_func_AUGraphAddNode"
-if test "x$ac_cv_func_AUGraphAddNode" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_AUGRAPHADDNODE 1
-_ACEOF
-
-fi
-done
-
- LIBS="$ac_save_LIBS"
fi
if test "$ac_cv_header_OpenAL_al_h" = "yes"
then
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;
diff --git a/include/config.h.in b/include/config.h.in
index b864a6709fa..c1a68104fb8 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -31,18 +31,6 @@
/* Define to 1 if you have the <asm/user.h> header file. */
#undef HAVE_ASM_USER_H
-/* Define to 1 if you have the <AudioToolbox/AudioConverter.h> header file. */
-#undef HAVE_AUDIOTOOLBOX_AUDIOCONVERTER_H
-
-/* Define to 1 if you have the <AudioUnit/AudioComponent.h> header file. */
-#undef HAVE_AUDIOUNIT_AUDIOCOMPONENT_H
-
-/* Define to 1 if you have the <AudioUnit/AudioUnit.h> header file. */
-#undef HAVE_AUDIOUNIT_AUDIOUNIT_H
-
-/* Define to 1 if you have the `AUGraphAddNode' function. */
-#undef HAVE_AUGRAPHADDNODE
-
/* Define to 1 if you have the <capi20.h> header file. */
#undef HAVE_CAPI20_H
More information about the wine-cvs
mailing list