ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winealsa.drv: Remove unnecessary ifdefs.

This commit is contained in:
Alexandre Julliard 2011-03-28 22:07:26 +02:00
parent 8e59bbb027
commit 255cc210b6
12 changed files with 3 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure vendored
View File

@ -10985,10 +10985,7 @@ int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL)
} }
_ACEOF _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_compile "$LINENO"; then :
ALSALIBS="-lasound"
$as_echo "#define HAVE_ALSA 1" >>confdefs.h
ALSALIBS="-lasound"
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi fi

3
configure.ac
View File

@ -1513,8 +1513,7 @@ then
#elif defined(HAVE_SYS_ASOUNDLIB_H) #elif defined(HAVE_SYS_ASOUNDLIB_H)
#include <sys/asoundlib.h> #include <sys/asoundlib.h>
#endif]], [[int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL)]])], #endif]], [[int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL)]])],
[AC_DEFINE(HAVE_ALSA,1,[Define if you have ALSA 1.x including devel headers]) [ALSALIBS="-lasound"])])
ALSALIBS="-lasound"],[])])
fi fi
dnl **** Check for capi4linux **** dnl **** Check for capi4linux ****

6
dlls/winealsa.drv/alsa.c
View File

@ -39,8 +39,6 @@
#include "alsa.h" #include "alsa.h"
#ifdef HAVE_ALSA
#include "wine/library.h" #include "wine/library.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -725,8 +723,6 @@ if (err<0) { \
return; return;
} }
#endif
/************************************************************************** /**************************************************************************
* DriverProc (WINEALSA.@) * DriverProc (WINEALSA.@)
*/ */
@ -737,7 +733,6 @@ LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
/* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */ /* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */
switch(wMsg) { switch(wMsg) {
#ifdef HAVE_ALSA
case DRV_LOAD: case DRV_LOAD:
case DRV_FREE: case DRV_FREE:
case DRV_OPEN: case DRV_OPEN:
@ -750,7 +745,6 @@ LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
case DRV_INSTALL: case DRV_INSTALL:
case DRV_REMOVE: case DRV_REMOVE:
return DRV_SUCCESS; return DRV_SUCCESS;
#endif
default: default:
return 0; return 0;
} }

2
dlls/winealsa.drv/alsa.h
View File

@ -24,7 +24,7 @@
# error You must include config.h to use this header # error You must include config.h to use this header
#endif #endif
#if defined(HAVE_ALSA) && !defined(__ALSA_H) #ifndef __ALSA_H
#define __ALSA_H #define __ALSA_H
#ifdef interface #ifdef interface

4
dlls/winealsa.drv/dscapture.c
View File

@ -54,8 +54,6 @@
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
#ifdef HAVE_ALSA
/* Notify timer checks every 10 ms with a resolution of 2 ms */ /* Notify timer checks every 10 ms with a resolution of 2 ms */
#define DS_TIME_DEL 10 #define DS_TIME_DEL 10
#define DS_TIME_RES 2 #define DS_TIME_RES 2
@ -1092,5 +1090,3 @@ DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc)
*desc = WInDev[wDevID].ds_desc; *desc = WInDev[wDevID].ds_desc;
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
} }
#endif /* HAVE_ALSA */

4
dlls/winealsa.drv/dsoutput.c
View File

@ -58,8 +58,6 @@
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/debug.h" #include "wine/debug.h"
#ifdef HAVE_ALSA
WINE_DEFAULT_DEBUG_CHANNEL(dsalsa); WINE_DEFAULT_DEBUG_CHANNEL(dsalsa);
typedef struct IDsDriverImpl IDsDriverImpl; typedef struct IDsDriverImpl IDsDriverImpl;
@ -959,5 +957,3 @@ DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc)
*desc = WOutDev[wDevID].ds_desc; *desc = WOutDev[wDevID].ds_desc;
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
} }
#endif /* HAVE_ALSA */

8
dlls/winealsa.drv/midi.c
View File

@ -53,8 +53,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(midi); WINE_DEFAULT_DEBUG_CHANNEL(midi);
#ifdef HAVE_ALSA
#ifndef SND_SEQ_PORT_TYPE_PORT #ifndef SND_SEQ_PORT_TYPE_PORT
#define SND_SEQ_PORT_TYPE_PORT (1<<19) /* Appears in version 1.0.12rc1 */ #define SND_SEQ_PORT_TYPE_PORT (1<<19) /* Appears in version 1.0.12rc1 */
#endif #endif
@ -1299,8 +1297,6 @@ static LONG ALSA_MidiInit(void)
return TRUE; return TRUE;
} }
#endif
/************************************************************************** /**************************************************************************
* midMessage (WINEALSA.@) * midMessage (WINEALSA.@)
*/ */
@ -1310,7 +1306,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n",
wDevID, wMsg, dwUser, dwParam1, dwParam2); wDevID, wMsg, dwUser, dwParam1, dwParam2);
switch (wMsg) { switch (wMsg) {
#ifdef HAVE_ALSA
case DRVM_INIT: case DRVM_INIT:
ALSA_MidiInit(); ALSA_MidiInit();
case DRVM_EXIT: case DRVM_EXIT:
@ -1338,7 +1333,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
return midStart(wDevID); return midStart(wDevID);
case MIDM_STOP: case MIDM_STOP:
return midStop(wDevID); return midStop(wDevID);
#endif
default: default:
TRACE("Unsupported message\n"); TRACE("Unsupported message\n");
} }
@ -1355,7 +1349,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
wDevID, wMsg, dwUser, dwParam1, dwParam2); wDevID, wMsg, dwUser, dwParam1, dwParam2);
switch (wMsg) { switch (wMsg) {
#ifdef HAVE_ALSA
case DRVM_INIT: case DRVM_INIT:
ALSA_MidiInit(); ALSA_MidiInit();
case DRVM_EXIT: case DRVM_EXIT:
@ -1385,7 +1378,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
return 0; return 0;
case MODM_RESET: case MODM_RESET:
return modReset(wDevID); return modReset(wDevID);
#endif
default: default:
TRACE("Unsupported message\n"); TRACE("Unsupported message\n");
} }

10
dlls/winealsa.drv/mixer.c
View File

@ -52,8 +52,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(mixer); WINE_DEFAULT_DEBUG_CHANNEL(mixer);
#ifdef HAVE_ALSA
#define WINE_MIXER_MANUF_ID 0xAA #define WINE_MIXER_MANUF_ID 0xAA
#define WINE_MIXER_PRODUCT_ID 0x55 #define WINE_MIXER_PRODUCT_ID 0x55
#define WINE_MIXER_VERSION 0x0100 #define WINE_MIXER_VERSION 0x0100
@ -1557,15 +1555,12 @@ static DWORD MIX_GetLineControls(UINT wDevID, LPMIXERLINECONTROLSW mlc, DWORD_PT
return MMSYSERR_NOERROR; return MMSYSERR_NOERROR;
} }
#endif /*HAVE_ALSA*/
/************************************************************************** /**************************************************************************
* mxdMessage (WINEALSA.3) * mxdMessage (WINEALSA.3)
*/ */
DWORD WINAPI ALSA_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, DWORD WINAPI ALSA_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
DWORD_PTR dwParam1, DWORD_PTR dwParam2) DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{ {
#ifdef HAVE_ALSA
DWORD ret; DWORD ret;
TRACE("(%04X, %s, %08lX, %08lX, %08lX);\n", wDevID, getMessage(wMsg), TRACE("(%04X, %s, %08lX, %08lX, %08lX);\n", wDevID, getMessage(wMsg),
dwUser, dwParam1, dwParam2); dwUser, dwParam1, dwParam2);
@ -1611,9 +1606,4 @@ DWORD WINAPI ALSA_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
TRACE("Returning %08X\n", ret); TRACE("Returning %08X\n", ret);
return ret; return ret;
#else /*HAVE_ALSA*/
TRACE("(%04X, %04X, %08lX, %08lX, %08lX);\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);
return MMSYSERR_NOTENABLED;
#endif /*HAVE_ALSA*/
} }

16
dlls/winealsa.drv/wavein.c
View File

@ -59,8 +59,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DEFAULT_DEBUG_CHANNEL(wave);
#ifdef HAVE_ALSA
WINE_WAVEDEV *WInDev; WINE_WAVEDEV *WInDev;
DWORD ALSA_WidNumMallocedDevs; DWORD ALSA_WidNumMallocedDevs;
DWORD ALSA_WidNumDevs; DWORD ALSA_WidNumDevs;
@ -778,17 +776,3 @@ DWORD WINAPI ALSA_widMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
} }
return MMSYSERR_NOTSUPPORTED; return MMSYSERR_NOTSUPPORTED;
} }
#else /* HAVE_ALSA */
/**************************************************************************
* widMessage (WINEALSA.@)
*/
DWORD WINAPI ALSA_widMessage(WORD wDevID, WORD wMsg, DWORD_PTR dwUser,
DWORD_PTR dwParam1, DWORD_PTR dwParam2)
{
FIXME("(%u, %04X, %08lX, %08lX, %08lX):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);
return MMSYSERR_NOTENABLED;
}
#endif /* HAVE_ALSA */

5
dlls/winealsa.drv/waveinit.c
View File

@ -25,9 +25,6 @@
*/ */
#include "config.h" #include "config.h"
#ifdef HAVE_ALSA
#include "wine/port.h" #include "wine/port.h"
#include <stdlib.h> #include <stdlib.h>
@ -1014,5 +1011,3 @@ void ALSA_WaveInit(void)
if (key) if (key)
RegCloseKey(key); RegCloseKey(key);
} }
#endif /* HAVE_ALSA */

16
dlls/winealsa.drv/waveout.c
View File

@ -60,8 +60,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(wave); WINE_DEFAULT_DEBUG_CHANNEL(wave);
#ifdef HAVE_ALSA
WINE_WAVEDEV *WOutDev; WINE_WAVEDEV *WOutDev;
DWORD ALSA_WodNumMallocedDevs; DWORD ALSA_WodNumMallocedDevs;
DWORD ALSA_WodNumDevs; DWORD ALSA_WodNumDevs;
@ -1180,17 +1178,3 @@ DWORD WINAPI ALSA_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
} }
return MMSYSERR_NOTSUPPORTED; return MMSYSERR_NOTSUPPORTED;
} }
#else /* HAVE_ALSA */
/**************************************************************************
* wodMessage (WINEALSA.@)
*/
DWORD WINAPI ALSA_wodMessage(WORD wDevID, WORD wMsg, DWORD dwUser,
DWORD dwParam1, DWORD dwParam2)
{
FIXME("(%u, %04X, %08X, %08X, %08X):stub\n", wDevID, wMsg, dwUser, dwParam1, dwParam2);
return MMSYSERR_NOTENABLED;
}
#endif /* HAVE_ALSA */

3
include/config.h.in
View File

@ -12,9 +12,6 @@
/* Define to 1 if you have the <alias.h> header file. */ /* Define to 1 if you have the <alias.h> header file. */
#undef HAVE_ALIAS_H #undef HAVE_ALIAS_H
/* Define if you have ALSA 1.x including devel headers */
#undef HAVE_ALSA
/* Define to 1 if you have the <alsa/asoundlib.h> header file. */ /* Define to 1 if you have the <alsa/asoundlib.h> header file. */
#undef HAVE_ALSA_ASOUNDLIB_H #undef HAVE_ALSA_ASOUNDLIB_H