Skip to content

W
wine-winehq
Commit a2f0750f authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

Remove the audioio sound driver. It is unused.

The supported Solaris version 9 and 10 do not have audioio anymore. They are using the ESD sound driver instead.
parent d44bfdbf
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 177 deletions
configure
View file @ a2f0750f
......@@ -616,7 +616,6 @@ LIBMPG123
PNGINCL
FONTCONFIGINCL
CUPSINCL
AUDIOIOLIBS
ALSALIBS
GSTREAMER_INCL
GSTREAMER_LIBS
......@@ -770,7 +769,6 @@ enable_win64
enable_tests
enable_maintainer_mode
with_alsa
with_audioio
with_capi
with_cms
with_coreaudio
......@@ -1461,7 +1459,6 @@ Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--without-alsa do not use the Alsa sound support
--without-audioio do not use the AudioIO sound support
--without-capi do not use CAPI (ISDN support)
--without-cms do not use CMS (color management support)
--without-coreaudio do not use the CoreAudio sound support
......@@ -2516,12 +2513,6 @@ if test "${with_alsa+set}" = set; then :
fi
# Check whether --with-audioio was given.
if test "${with_audioio+set}" = set; then :
withval=$with_audioio; if test "x$withval" = "xno"; then ac_cv_header_libaudioio_h=no; fi
fi
# Check whether --with-capi was given.
if test "${with_capi+set}" = set; then :
withval=$with_capi; if test "x$withval" = "xno"; then ac_cv_header_capi20_h=no; ac_cv_header_linux_capi_h=no; fi
......@@ -5806,7 +5797,6 @@ for ac_header in \
lcms.h \
lcms/lcms.h \
ldap.h \
libaudioio.h \
link.h \
linux/cdrom.h \
linux/compiler.h \
......@@ -10887,55 +10877,6 @@ fi
fi
AUDIOIOLIBS=""
if test "$ac_cv_header_libaudioio_h" = "yes"
then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AudioIOGetVersion in -laudioio" >&5
$as_echo_n "checking for AudioIOGetVersion in -laudioio... " >&6; }
if test "${ac_cv_lib_audioio_AudioIOGetVersion+set}" = set; then :
$as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
LIBS="-laudioio $LIBS"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
/* Override any GCC internal prototype to avoid an error.
Use char because int might match the return type of a GCC
builtin and then its argument prototype would still apply. */
#ifdef __cplusplus
extern "C"
#endif
char AudioIOGetVersion ();
int
main ()
{
return AudioIOGetVersion ();
;
return 0;
}
_ACEOF
if ac_fn_c_try_link "$LINENO"; then :
ac_cv_lib_audioio_AudioIOGetVersion=yes
else
ac_cv_lib_audioio_AudioIOGetVersion=no
fi
rm -f core conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_audioio_AudioIOGetVersion" >&5
$as_echo "$ac_cv_lib_audioio_AudioIOGetVersion" >&6; }
if test "x$ac_cv_lib_audioio_AudioIOGetVersion" = x""yes; then :
AUDIOIOLIBS="-laudioio"
$as_echo "#define HAVE_LIBAUDIOIO 1" >>confdefs.h
fi
fi
if test "$ac_cv_header_capi20_h" = "yes" -a "$ac_cv_header_linux_capi_h" = "yes"
then
......@@ -12076,11 +12017,11 @@ _ACEOF
fi
if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
"$ac_cv_header_sys_soundcard_h" != "yes" -a \
"$ac_cv_header_machine_soundcard_h" != "yes" -a \
"$ac_cv_header_soundcard_h" != "yes" -a \
"x$with_alsa$with_audioio$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnonononononono
"x$with_alsa$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnononononono
then
as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent."
fi
......@@ -15262,7 +15203,6 @@ wine_fn_config_dll windebug.dll16 enable_win16
wine_fn_config_dll windowscodecs enable_windowscodecs windowscodecs
wine_fn_config_test dlls/windowscodecs/tests windowscodecs_test
wine_fn_config_dll winealsa.drv enable_winealsa_drv
wine_fn_config_dll wineaudioio.drv enable_wineaudioio_drv
wine_fn_config_dll winecoreaudio.drv enable_winecoreaudio_drv
wine_fn_config_lib winecrt0
wine_fn_config_dll wined3d enable_wined3d wined3d
......
configure.ac
View file @ a2f0750f
......@@ -33,8 +33,6 @@ AC_ARG_ENABLE(maintainer-mode, AS_HELP_STRING([--enable-maintainer-mode],[enable
AC_ARG_WITH(alsa, AS_HELP_STRING([--without-alsa],[do not use the Alsa sound support]),
[if test "x$withval" = "xno"; then ac_cv_header_sys_asoundlib_h=no; ac_cv_header_alsa_asoundlib_h=no; fi])
AC_ARG_WITH(audioio, AS_HELP_STRING([--without-audioio],[do not use the AudioIO sound support]),
[if test "x$withval" = "xno"; then ac_cv_header_libaudioio_h=no; fi])
AC_ARG_WITH(capi, AS_HELP_STRING([--without-capi],[do not use CAPI (ISDN support)]),
[if test "x$withval" = "xno"; then ac_cv_header_capi20_h=no; ac_cv_header_linux_capi_h=no; fi])
AC_ARG_WITH(cms, AS_HELP_STRING([--without-cms],[do not use CMS (color management support)]),
......@@ -409,7 +407,6 @@ AC_CHECK_HEADERS(\
lcms.h \
lcms/lcms.h \
ldap.h \
libaudioio.h \
link.h \
linux/cdrom.h \
linux/compiler.h \
......@@ -1478,15 +1475,6 @@ then
ALSALIBS="-lasound"],[])])
fi
dnl **** Check for libaudioio (which can be used to get solaris audio support) ****
AC_SUBST(AUDIOIOLIBS,"")
if test "$ac_cv_header_libaudioio_h" = "yes"
then
AC_CHECK_LIB(audioio,AudioIOGetVersion,
[AUDIOIOLIBS="-laudioio"
AC_DEFINE(HAVE_LIBAUDIOIO, 1, [Define if you have libaudioIO])])
fi
dnl **** Check for capi4linux ****
if test "$ac_cv_header_capi20_h" = "yes" -a "$ac_cv_header_linux_capi_h" = "yes"
......@@ -1642,11 +1630,11 @@ dnl **** Check for libodbc ****
WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["libodbc.$LIBEXT"])])
dnl **** Check for any sound system ****
if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
if test "x$ALSALIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname_jack" = "x" -a \
"$ac_cv_header_sys_soundcard_h" != "yes" -a \
"$ac_cv_header_machine_soundcard_h" != "yes" -a \
"$ac_cv_header_soundcard_h" != "yes" -a \
"x$with_alsa$with_audioio$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnonononononono
"x$with_alsa$with_coreaudio$with_nas$with_esd$with_jack$with_oss" != xnononononono
then
WINE_WARNING([No sound system was found. Windows applications will be silent.])
fi
......@@ -2783,7 +2771,6 @@ WINE_CONFIG_DLL(windebug.dll16,enable_win16)
WINE_CONFIG_DLL(windowscodecs,,[windowscodecs])
WINE_CONFIG_TEST(dlls/windowscodecs/tests)
WINE_CONFIG_DLL(winealsa.drv)
WINE_CONFIG_DLL(wineaudioio.drv)
WINE_CONFIG_DLL(winecoreaudio.drv)
WINE_CONFIG_LIB(winecrt0)
WINE_CONFIG_DLL(wined3d,,[wined3d])
......
dlls/wineaudioio.drv/Makefile.in deleted 100644 → 0
View file @ d44bfdbf
MODULE = wineaudioio.drv
IMPORTS = dxguid uuid winmm user32
EXTRALIBS = @AUDIOIOLIBS@
C_SRCS = \
audio.c \
audioio.c
@MAKE_DLL_RULES@
dlls/wineaudioio.drv/audioio.c deleted 100644 → 0
View file @ d44bfdbf
/* -*- tab-width: 8; c-basic-offset: 4 -*- */
/*
* Wine Driver for Libaudioio
* Derived From WineOSS
* Copyright 1999 Eric Pouech
* Modifications by Robert Lunnon 2002
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include "config.h"
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
#include "mmddk.h"
#ifdef HAVE_LIBAUDIOIO
extern LONG LIBAUDIOIO_WaveInit(void);
/**************************************************************************
* LIBAUDIOIO_drvOpen [internal]
*/
static LRESULT LIBAUDIOIO_drvOpen(LPSTR str)
{
return 1;
}
/**************************************************************************
* LIBAUDIOIO_drvClose [internal]
*/
static LRESULT LIBAUDIOIO_drvClose(DWORD_PTR dwDevID)
{
return 1;
}
#endif
/**************************************************************************
* DriverProc
*/
LRESULT CALLBACK LIBAUDIOIO_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
LPARAM dwParam1, LPARAM dwParam2)
{
/* EPP TRACE("(%08lX, %04X, %08lX, %08lX, %08lX)\n", */
/* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */
switch(wMsg) {
#ifdef HAVE_LIBAUDIOIO
case DRV_LOAD: LIBAUDIOIO_WaveInit();
return 1;
case DRV_FREE: return 1;
case DRV_OPEN: return LIBAUDIOIO_drvOpen((LPSTR)dwParam1);
case DRV_CLOSE: return LIBAUDIOIO_drvClose(dwDevID);
case DRV_ENABLE: return 1;
case DRV_DISABLE: return 1;
case DRV_QUERYCONFIGURE: return 1;
case DRV_CONFIGURE: MessageBoxA(0, "Libaudioio MultiMedia Driver !", "Libaudioio 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);
}
}
dlls/wineaudioio.drv/wineaudioio.drv.spec deleted 100644 → 0
View file @ d44bfdbf
@ stdcall -private DriverProc(long long long long long) LIBAUDIOIO_DriverProc
@ stdcall -private widMessage(long long long long long) LIBAUDIOIO_widMessage
@ stdcall -private wodMessage(long long long long long) LIBAUDIOIO_wodMessage
include/config.h.in
View file @ a2f0750f
......@@ -355,12 +355,6 @@
/* Define to 1 if you have the `ldap_parse_vlv_control' function. */
#undef HAVE_LDAP_PARSE_VLV_CONTROL
/* Define if you have libaudioIO */
#undef HAVE_LIBAUDIOIO
/* Define to 1 if you have the <libaudioio.h> header file. */
#undef HAVE_LIBAUDIOIO_H
/* Define to 1 if you have the `i386' library (-li386). */
#undef HAVE_LIBI386
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment