Commit 287be7c5 authored by Andrew Eikum's avatar Andrew Eikum Committed by Alexandre Julliard

wineandroid: Add an audio driver.

parent 9027b927
...@@ -14464,7 +14464,7 @@ test -z "$NETAPI_LIBS" || NETAPI_LIBS=`echo " $NETAPI_LIBS" | sed 's/ -L\([^/]\) ...@@ -14464,7 +14464,7 @@ test -z "$NETAPI_LIBS" || NETAPI_LIBS=`echo " $NETAPI_LIBS" | sed 's/ -L\([^/]\)
fi fi
if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv" = xnononono -a \ if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv$enable_wineandroid_drv" = xnonononono -a \
"x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono
then then
as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent." as_fn_append wine_warnings "|No sound system was found. Windows applications will be silent."
......
...@@ -1765,7 +1765,7 @@ then ...@@ -1765,7 +1765,7 @@ then
fi fi
dnl **** Check for any sound system **** dnl **** Check for any sound system ****
if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv" = xnononono -a \ if test "x$enable_winealsa_drv$enable_winecoreaudio_drv$enable_winepulse_drv$enable_wineoss_drv$enable_wineandroid_drv" = xnonononono -a \
"x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono "x$with_alsa$with_coreaudio$with_oss$with_pulse" != xnononono
then then
WINE_WARNING([No sound system was found. Windows applications will be silent.]) WINE_WARNING([No sound system was found. Windows applications will be silent.])
......
...@@ -114,7 +114,7 @@ static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context) ...@@ -114,7 +114,7 @@ static BOOL WINAPI init_driver(INIT_ONCE *once, void *param, void **context)
static const WCHAR drv_value[] = {'A','u','d','i','o',0}; static const WCHAR drv_value[] = {'A','u','d','i','o',0};
static WCHAR default_list[] = {'p','u','l','s','e',',','a','l','s','a',',','o','s','s',',', static WCHAR default_list[] = {'p','u','l','s','e',',','a','l','s','a',',','o','s','s',',',
'c','o','r','e','a','u','d','i','o',0}; 'c','o','r','e','a','u','d','i','o',',','a','n','d','r','o','i','d',0};
DriverFuncs driver; DriverFuncs driver;
HKEY key; HKEY key;
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
package="org.winehq.wine"> package="org.winehq.wine">
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
<application <application
android:icon="@drawable/wine" android:icon="@drawable/wine"
android:label="Wine" > android:label="Wine" >
......
MODULE = wineandroid.drv MODULE = wineandroid.drv
IMPORTS = user32 gdi32 advapi32 ntoskrnl IMPORTS = uuid ole32 user32 gdi32 advapi32 ntoskrnl
C_SRCS = \ C_SRCS = \
device.c \ device.c \
init.c \ init.c \
keyboard.c \ keyboard.c \
mmdevdrv.c \
opengl.c \ opengl.c \
window.c window.c
......
...@@ -29,3 +29,9 @@ ...@@ -29,3 +29,9 @@
# Desktop # Desktop
@ cdecl wine_create_desktop(long long) ANDROID_create_desktop @ cdecl wine_create_desktop(long long) ANDROID_create_desktop
# MMDevAPI driver functions
@ stdcall -private GetPriority() AUDDRV_GetPriority
@ stdcall -private GetEndpointIDs(long ptr ptr ptr ptr) AUDDRV_GetEndpointIDs
@ stdcall -private GetAudioEndpoint(ptr ptr ptr) AUDDRV_GetAudioEndpoint
@ stdcall -private GetAudioSessionManager(ptr ptr) AUDDRV_GetAudioSessionManager
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