Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
255cc210
Commit
255cc210
authored
Mar 28, 2011
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winealsa.drv: Remove unnecessary ifdefs.
parent
8e59bbb0
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
3 additions
and
79 deletions
+3
-79
configure
configure
+1
-4
configure.ac
configure.ac
+1
-2
alsa.c
dlls/winealsa.drv/alsa.c
+0
-6
alsa.h
dlls/winealsa.drv/alsa.h
+1
-1
dscapture.c
dlls/winealsa.drv/dscapture.c
+0
-4
dsoutput.c
dlls/winealsa.drv/dsoutput.c
+0
-4
midi.c
dlls/winealsa.drv/midi.c
+0
-8
mixer.c
dlls/winealsa.drv/mixer.c
+0
-10
wavein.c
dlls/winealsa.drv/wavein.c
+0
-16
waveinit.c
dlls/winealsa.drv/waveinit.c
+0
-5
waveout.c
dlls/winealsa.drv/waveout.c
+0
-16
config.h.in
include/config.h.in
+0
-3
No files found.
configure
View file @
255cc210
...
...
@@ -10985,10 +10985,7 @@ int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL)
}
_ACEOF
if
ac_fn_c_try_compile
"
$LINENO
"
;
then
:
$as_echo
"#define HAVE_ALSA 1"
>>
confdefs.h
ALSALIBS
=
"-lasound"
ALSALIBS
=
"-lasound"
fi
rm
-f
core conftest.err conftest.
$ac_objext
conftest.
$ac_ext
fi
...
...
configure.ac
View file @
255cc210
...
...
@@ -1513,8 +1513,7 @@ then
#elif defined(HAVE_SYS_ASOUNDLIB_H)
#include <sys/asoundlib.h>
#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
dnl **** Check for capi4linux ****
...
...
dlls/winealsa.drv/alsa.c
View file @
255cc210
...
...
@@ -39,8 +39,6 @@
#include "alsa.h"
#ifdef HAVE_ALSA
#include "wine/library.h"
#include "wine/unicode.h"
#include "wine/debug.h"
...
...
@@ -725,8 +723,6 @@ if (err<0) { \
return
;
}
#endif
/**************************************************************************
* DriverProc (WINEALSA.@)
*/
...
...
@@ -737,7 +733,6 @@ LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
/* EPP dwDevID, hDriv, wMsg, dwParam1, dwParam2); */
switch
(
wMsg
)
{
#ifdef HAVE_ALSA
case
DRV_LOAD
:
case
DRV_FREE
:
case
DRV_OPEN
:
...
...
@@ -750,7 +745,6 @@ LRESULT CALLBACK ALSA_DriverProc(DWORD_PTR dwDevID, HDRVR hDriv, UINT wMsg,
case
DRV_INSTALL
:
case
DRV_REMOVE
:
return
DRV_SUCCESS
;
#endif
default:
return
0
;
}
...
...
dlls/winealsa.drv/alsa.h
View file @
255cc210
...
...
@@ -24,7 +24,7 @@
# error You must include config.h to use this header
#endif
#if
defined(HAVE_ALSA) && !defined(__ALSA_H)
#if
ndef __ALSA_H
#define __ALSA_H
#ifdef interface
...
...
dlls/winealsa.drv/dscapture.c
View file @
255cc210
...
...
@@ -54,8 +54,6 @@
#include "wine/unicode.h"
#include "wine/debug.h"
#ifdef HAVE_ALSA
/* Notify timer checks every 10 ms with a resolution of 2 ms */
#define DS_TIME_DEL 10
#define DS_TIME_RES 2
...
...
@@ -1092,5 +1090,3 @@ DWORD widDsDesc(UINT wDevID, PDSDRIVERDESC desc)
*
desc
=
WInDev
[
wDevID
].
ds_desc
;
return
MMSYSERR_NOERROR
;
}
#endif
/* HAVE_ALSA */
dlls/winealsa.drv/dsoutput.c
View file @
255cc210
...
...
@@ -58,8 +58,6 @@
#include "wine/unicode.h"
#include "wine/debug.h"
#ifdef HAVE_ALSA
WINE_DEFAULT_DEBUG_CHANNEL
(
dsalsa
);
typedef
struct
IDsDriverImpl
IDsDriverImpl
;
...
...
@@ -959,5 +957,3 @@ DWORD wodDsDesc(UINT wDevID, PDSDRIVERDESC desc)
*
desc
=
WOutDev
[
wDevID
].
ds_desc
;
return
MMSYSERR_NOERROR
;
}
#endif
/* HAVE_ALSA */
dlls/winealsa.drv/midi.c
View file @
255cc210
...
...
@@ -53,8 +53,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
midi
);
#ifdef HAVE_ALSA
#ifndef SND_SEQ_PORT_TYPE_PORT
#define SND_SEQ_PORT_TYPE_PORT (1<<19)
/* Appears in version 1.0.12rc1 */
#endif
...
...
@@ -1299,8 +1297,6 @@ static LONG ALSA_MidiInit(void)
return
TRUE
;
}
#endif
/**************************************************************************
* midMessage (WINEALSA.@)
*/
...
...
@@ -1310,7 +1306,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
TRACE
(
"(%04X, %04X, %08lX, %08lX, %08lX);
\n
"
,
wDevID
,
wMsg
,
dwUser
,
dwParam1
,
dwParam2
);
switch
(
wMsg
)
{
#ifdef HAVE_ALSA
case
DRVM_INIT
:
ALSA_MidiInit
();
case
DRVM_EXIT
:
...
...
@@ -1338,7 +1333,6 @@ DWORD WINAPI ALSA_midMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
return
midStart
(
wDevID
);
case
MIDM_STOP
:
return
midStop
(
wDevID
);
#endif
default:
TRACE
(
"Unsupported message
\n
"
);
}
...
...
@@ -1355,7 +1349,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
wDevID
,
wMsg
,
dwUser
,
dwParam1
,
dwParam2
);
switch
(
wMsg
)
{
#ifdef HAVE_ALSA
case
DRVM_INIT
:
ALSA_MidiInit
();
case
DRVM_EXIT
:
...
...
@@ -1385,7 +1378,6 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
return
0
;
case
MODM_RESET
:
return
modReset
(
wDevID
);
#endif
default:
TRACE
(
"Unsupported message
\n
"
);
}
...
...
dlls/winealsa.drv/mixer.c
View file @
255cc210
...
...
@@ -52,8 +52,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
mixer
);
#ifdef HAVE_ALSA
#define WINE_MIXER_MANUF_ID 0xAA
#define WINE_MIXER_PRODUCT_ID 0x55
#define WINE_MIXER_VERSION 0x0100
...
...
@@ -1557,15 +1555,12 @@ static DWORD MIX_GetLineControls(UINT wDevID, LPMIXERLINECONTROLSW mlc, DWORD_PT
return
MMSYSERR_NOERROR
;
}
#endif
/*HAVE_ALSA*/
/**************************************************************************
* mxdMessage (WINEALSA.3)
*/
DWORD
WINAPI
ALSA_mxdMessage
(
UINT
wDevID
,
UINT
wMsg
,
DWORD_PTR
dwUser
,
DWORD_PTR
dwParam1
,
DWORD_PTR
dwParam2
)
{
#ifdef HAVE_ALSA
DWORD
ret
;
TRACE
(
"(%04X, %s, %08lX, %08lX, %08lX);
\n
"
,
wDevID
,
getMessage
(
wMsg
),
dwUser
,
dwParam1
,
dwParam2
);
...
...
@@ -1611,9 +1606,4 @@ DWORD WINAPI ALSA_mxdMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
TRACE
(
"Returning %08X
\n
"
,
ret
);
return
ret
;
#else
/*HAVE_ALSA*/
TRACE
(
"(%04X, %04X, %08lX, %08lX, %08lX);
\n
"
,
wDevID
,
wMsg
,
dwUser
,
dwParam1
,
dwParam2
);
return
MMSYSERR_NOTENABLED
;
#endif
/*HAVE_ALSA*/
}
dlls/winealsa.drv/wavein.c
View file @
255cc210
...
...
@@ -59,8 +59,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
wave
);
#ifdef HAVE_ALSA
WINE_WAVEDEV
*
WInDev
;
DWORD
ALSA_WidNumMallocedDevs
;
DWORD
ALSA_WidNumDevs
;
...
...
@@ -778,17 +776,3 @@ DWORD WINAPI ALSA_widMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
}
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 */
dlls/winealsa.drv/waveinit.c
View file @
255cc210
...
...
@@ -25,9 +25,6 @@
*/
#include "config.h"
#ifdef HAVE_ALSA
#include "wine/port.h"
#include <stdlib.h>
...
...
@@ -1014,5 +1011,3 @@ void ALSA_WaveInit(void)
if
(
key
)
RegCloseKey
(
key
);
}
#endif
/* HAVE_ALSA */
dlls/winealsa.drv/waveout.c
View file @
255cc210
...
...
@@ -60,8 +60,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
wave
);
#ifdef HAVE_ALSA
WINE_WAVEDEV
*
WOutDev
;
DWORD
ALSA_WodNumMallocedDevs
;
DWORD
ALSA_WodNumDevs
;
...
...
@@ -1180,17 +1178,3 @@ DWORD WINAPI ALSA_wodMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser,
}
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 */
include/config.h.in
View file @
255cc210
...
...
@@ -12,9 +12,6 @@
/* Define to 1 if you have the <alias.h> header file. */
#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. */
#undef HAVE_ALSA_ASOUNDLIB_H
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment