Module: wine Branch: master Commit: 6eea1119af872147b676be900c9d9126b796d27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eea1119af872147b676be900c...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Mar 28 22:12:59 2011 +0200
wineesd.drv: Remove unnecessary ifdefs.
---
configure | 3 -- configure.ac | 3 +- dlls/wineesd.drv/Makefile.in | 3 +- dlls/wineesd.drv/audio.c | 39 +++++++++++++--------------- dlls/wineesd.drv/esound.c | 58 ------------------------------------------ include/config.h.in | 3 -- 6 files changed, 20 insertions(+), 89 deletions(-)
diff --git a/configure b/configure index 507791f..948058f 100755 --- a/configure +++ b/configure @@ -10799,9 +10799,6 @@ if test "x$ac_cv_lib_esd_esd_open_sound" = x""yes; then :
ESDLIBS="$ac_esd_libs"
- -$as_echo "#define HAVE_ESD 1" >>confdefs.h - fi
fi diff --git a/configure.ac b/configure.ac index a59cae9..5b6d018 100644 --- a/configure.ac +++ b/configure.ac @@ -1470,8 +1470,7 @@ then AC_CHECK_HEADER(esd.h, [AC_CHECK_LIB(esd,esd_open_sound, [AC_SUBST(ESDINCL, "$ac_esd_incl") - AC_SUBST(ESDLIBS, "$ac_esd_libs") - AC_DEFINE(HAVE_ESD, 1, [Define if you have EsounD sound server])],, + AC_SUBST(ESDLIBS, "$ac_esd_libs")],, [$ac_esd_libs])]) CFLAGS="$save_CFLAGS" fi diff --git a/dlls/wineesd.drv/Makefile.in b/dlls/wineesd.drv/Makefile.in index 52da94a..91d9731 100644 --- a/dlls/wineesd.drv/Makefile.in +++ b/dlls/wineesd.drv/Makefile.in @@ -4,7 +4,6 @@ EXTRAINCL = @ESDINCL@ EXTRALIBS = @ESDLIBS@
C_SRCS = \ - audio.c \ - esound.c + audio.c
@MAKE_DLL_RULES@ diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index 9f7ff00..f7f190c 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -71,8 +71,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wave); #include <sys/errno.h> #endif
-#ifdef HAVE_ESD - #include <esd.h>
/* unless someone makes a wineserver kernel module, Unix pipes are faster than win32 events */ @@ -2100,26 +2098,25 @@ DWORD WINAPI ESD_widMessage(UINT wDevID, UINT wMsg, DWORD dwUser, return MMSYSERR_NOTSUPPORTED; }
-#else /* !HAVE_ESD */ - /************************************************************************** - * wodMessage (WINEESD.@) + * DriverProc (WINEESD.@) */ -DWORD WINAPI ESD_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) +LRESULT CALLBACK ESD_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, + LPARAM dwParam1, LPARAM dwParam2) { - FIXME("(%u, %04X, %08X, %08lX, %08lX):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; -} - -/************************************************************************** - * widMessage (WINEESD.6) - */ -DWORD WINAPI ESD_widMessage(UINT wDevID, UINT wMsg, DWORD dwUser, - DWORD_PTR dwParam1, DWORD_PTR dwParam2) -{ - FIXME("(%u, %04X, %08X, %08lX, %08lX):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2); - return MMSYSERR_NOTENABLED; + switch(wMsg) { + case DRV_LOAD: + case DRV_FREE: + case DRV_OPEN: + case DRV_CLOSE: + case DRV_INSTALL: + case DRV_REMOVE: + case DRV_ENABLE: + case DRV_DISABLE: + case DRV_QUERYCONFIGURE: + return 1; + case DRV_CONFIGURE: MessageBoxA(0, "EsounD MultiMedia Driver!", "EsounD Driver", MB_OK); return 1; + default: + return 0; + } } - -#endif /* HAVE_ESD */ diff --git a/dlls/wineesd.drv/esound.c b/dlls/wineesd.drv/esound.c deleted file mode 100644 index 64c0753..0000000 --- a/dlls/wineesd.drv/esound.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Wine Driver for EsounD Sound Server - * http://www.tux.org/~ricdude/EsounD.html - * - * Copyright 2004 Zhangrong Huang hzhr@users.sourceforge.net - * - * Code massively copied from Eric Pouech's OSS driver - * and Chris Morgan aRts driver - * - * 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" - -/************************************************************************** - * DriverProc (WINEESD.@) - */ -LRESULT CALLBACK ESD_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg, - LPARAM dwParam1, LPARAM dwParam2) -{ - switch(wMsg) { -#ifdef HAVE_ESD - case DRV_LOAD: - case DRV_FREE: - case DRV_OPEN: - case DRV_CLOSE: - case DRV_INSTALL: - case DRV_REMOVE: - case DRV_ENABLE: - case DRV_DISABLE: - case DRV_QUERYCONFIGURE: - return 1; - case DRV_CONFIGURE: MessageBoxA(0, "EsounD MultiMedia Driver!", "EsounD Driver", MB_OK); return 1; -#endif - default: - return 0; - } -} diff --git a/include/config.h.in b/include/config.h.in index dbe35f9..0c5a5f0 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -104,9 +104,6 @@ /* Define to 1 if you have the `epoll_create' function. */ #undef HAVE_EPOLL_CREATE
-/* Define if you have EsounD sound server */ -#undef HAVE_ESD - /* Define to 1 if you have the `ffs' function. */ #undef HAVE_FFS