added PulseAudio sound driver Thanks to Arthur Talyor
=3D?utf-8?q?R=3DC3=3DA9mi=3D20Assailly?=3D
remi.assailly at free.fr
Wed Apr 8 13:53:18 CDT 2009
---
configure | 50 ++++++++++++++++++++++++++++++++++++++=
---
configure.ac | 22 +++++++++++++++++-
include/config.h.in | 3 ++
programs/winecfg/Bg.rc | 1 +
programs/winecfg/Cs.rc | 1 +
programs/winecfg/Da.rc | 1 +
programs/winecfg/De.rc | 1 +
programs/winecfg/En.rc | 1 +
programs/winecfg/Es.rc | 1 +
programs/winecfg/Fi.rc | 1 +
programs/winecfg/Fr.rc | 1 +
programs/winecfg/Hu.rc | 1 +
programs/winecfg/Ja.rc | 1 +
programs/winecfg/Ko.rc | 1 +
programs/winecfg/Nl.rc | 1 +
programs/winecfg/No.rc | 1 +
programs/winecfg/Pl.rc | 1 +
programs/winecfg/Pt.rc | 1 +
programs/winecfg/Ro.rc | 1 +
programs/winecfg/Ru.rc | 1 +
programs/winecfg/Si.rc | 1 +
programs/winecfg/Sv.rc | 1 +
programs/winecfg/Tr.rc | 1 +
programs/winecfg/Zh.rc | 1 +
programs/winecfg/audio.c | 1 +
programs/winecfg/libraries.c | 1 +
programs/winecfg/resource.h | 2 +-
27 files changed, 94 insertions(+), 6 deletions(-)
diff --git a/configure b/configure
index 3e4d8d6..1296630 100755
--- a/configure
+++ b/configure
@@ -665,6 +665,7 @@ FONTCONFIGINCL
CUPSINCL
AUDIOIOLIBS
ALSALIBS
+PULSELIBS
ESDLIBS
ESDINCL
ESDCONFIG
@@ -841,6 +842,7 @@ with_openssl
with_oss
with_png
with_pthread
+with_pulse
with_sane
with_xcomposite
with_xcursor
@@ -1531,6 +1533,7 @@ Optional Packages:
--without-oss do not use the OSS sound support
--without-png do not use PNG
--without-pthread do not use the pthread library
+ --without-pulse do not use PulseAudio sound support
--without-sane do not use SANE (scanner support)
--without-xcomposite do not use the Xcomposite extension
--without-xcursor do not use the Xcursor extension
@@ -2206,6 +2209,12 @@ if test "${with_pthread+set}" =3D set; then
fi
=20
=20
+# Check whether --with-pulse was given.
+if test "${with_pulse+set}" =3D set; then
+ withval=3D$with_pulse;
+fi
+
+
# Check whether --with-sane was given.
if test "${with_sane+set}" =3D set; then
withval=3D$with_sane;
@@ -15610,6 +15619,30 @@ fi
CFLAGS=3D"$save_CFLAGS"
fi
=20
+if test "x$with_pulse" !=3D "xno"; then
+ if test "$PKG_CONFIG" !=3D "false"; then
+=09{ $as_echo "$as_me:$LINENO: checking for pulseaudio >=3D 0.9.8" >&5
+$as_echo_n "checking for pulseaudio >=3D 0.9.8... " >&6; }
+=09if "$PKG_CONFIG" --atleast-version=3D0.9.8 libpulse; then
+=09 have_pulseaudio=3D"yes"
+ else
+=09 have_pulseaudio=3D"no"
+=09fi
+=09{ $as_echo "$as_me:$LINENO: result: $have_pulseaudio" >&5
+$as_echo "$have_pulseaudio" >&6; }
+=09if test x"$have_pulseaudio" =3D xyes; then
+=09 ac_pulse_libs=3D`$PKG_CONFIG --libs libpulse`
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_PULSEAUDIO 1
+_ACEOF
+
+=09 PULSELIBS=3D"$ac_pulse_libs"
+
+=09fi
+ fi
+fi
+
ALSALIBS=3D""
=20
if test "$ac_cv_header_sys_asoundlib_h" =3D "yes" -o "$ac_cv_header_alsa_a=
soundlib_h" =3D "yes"
@@ -17138,7 +17171,7 @@ _ACEOF
fi
=20
=20
-if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname=
_jack" =3D "x" -a \
+if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_=
lib_soname_jack" =3D "x" -a \
"$ac_cv_header_sys_soundcard_h" !=3D "yes" -a \
"$ac_cv_header_machine_soundcard_h" !=3D "yes" -a \
"$ac_cv_header_soundcard_h" !=3D "yes" -a \
@@ -27411,6 +27444,14 @@ dlls/wineps.drv/Makefile: dlls/wineps.drv/Makefile=
.in dlls/Makedll.rules"
ac_config_files=3D"$ac_config_files dlls/wineps.drv/Makefile"
=20
ALL_MAKEFILES=3D"$ALL_MAKEFILES \\
+=09dlls/winepulse.drv/Makefile"
+test "x$enable_winepulse_drv" !=3D xno && ALL_DLL_DIRS=3D"$ALL_DLL_DIRS \\
+=09winepulse.drv"
+ALL_MAKEFILE_DEPENDS=3D"$ALL_MAKEFILE_DEPENDS
+dlls/winepulse.drv/Makefile: dlls/winepulse.drv/Makefile.in dlls/Makedll.r=
ules"
+ac_config_files=3D"$ac_config_files dlls/winepulse.drv/Makefile"
+
+ALL_MAKEFILES=3D"$ALL_MAKEFILES \\
=09dlls/winequartz.drv/Makefile"
test "x$enable_winequartz_drv" !=3D xno && ALL_DLL_DIRS=3D"$ALL_DLL_DIRS \=
\
=09winequartz.drv"
@@ -28720,9 +28761,9 @@ esac
=20
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=3D1
# Files that config.status was made for.
-config_files=3D"$ac_config_files"
-config_headers=3D"$ac_config_headers"
-config_commands=3D"$ac_config_commands"
+config_files=3D"`echo $ac_config_files`"
+config_headers=3D"`echo $ac_config_headers`"
+config_commands=3D"`echo $ac_config_commands`"
=20
_ACEOF
=20
@@ -29280,6 +29321,7 @@ do
"dlls/winenas.drv/Makefile") CONFIG_FILES=3D"$CONFIG_FILES dlls/winena=
s.drv/Makefile" ;;
"dlls/wineoss.drv/Makefile") CONFIG_FILES=3D"$CONFIG_FILES dlls/wineos=
s.drv/Makefile" ;;
"dlls/wineps.drv/Makefile") CONFIG_FILES=3D"$CONFIG_FILES dlls/wineps.=
drv/Makefile" ;;
+ "dlls/winepulse.drv/Makefile") CONFIG_FILES=3D"$CONFIG_FILES dlls/wine=
pulse.drv/Makefile" ;;
"dlls/winequartz.drv/Makefile") CONFIG_FILES=3D"$CONFIG_FILES dlls/win=
equartz.drv/Makefile" ;;
"dlls/winex11.drv/Makefile") CONFIG_FILES=3D"$CONFIG_FILES dlls/winex1=
1.drv/Makefile" ;;
"dlls/wing32/Makefile") CONFIG_FILES=3D"$CONFIG_FILES dlls/wing32/Make=
file" ;;
diff --git a/configure.ac b/configure.ac
index e6d9688..0a9ff96 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,7 @@ AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do=
not use PNG]),
[if test "x$withval" =3D "xno"; then ac_cv_header_png_h=3Dno; =
fi])
AC_ARG_WITH(pthread, AS_HELP_STRING([--without-pthread],[do not use the =
pthread library]),
[if test "x$withval" =3D "xno"; then ac_cv_header_pthread_h=3D=
no; fi])
+AC_ARG_WITH(pulse, AC_HELP_STRING([--without-pulse],[do not use PulseA=
udio sound support]))
AC_ARG_WITH(sane, AS_HELP_STRING([--without-sane],[do not use SANE (s=
canner support)]))
AC_ARG_WITH(xcomposite,AS_HELP_STRING([--without-xcomposite],[do not use t=
he Xcomposite extension]),
[if test "x$withval" =3D "xno"; then ac_cv_header_X11_extensio=
ns_Xcomposite_h=3Dno; fi])
@@ -1183,6 +1184,24 @@ then
CFLAGS=3D"$save_CFLAGS"
fi
=20
+dnl **** Check for PulseAudio ****
+if test "x$with_pulse" !=3D "xno"; then
+ if test "$PKG_CONFIG" !=3D "false"; then
+=09AC_MSG_CHECKING([for pulseaudio >=3D 0.9.8])
+=09if "$PKG_CONFIG" --atleast-version=3D0.9.8 libpulse; then
+=09 have_pulseaudio=3D"yes"
+ else
+=09 have_pulseaudio=3D"no"
+=09fi
+=09AC_MSG_RESULT([$have_pulseaudio])
+=09if test x"$have_pulseaudio" =3D xyes; then
+=09 ac_pulse_libs=3D`$PKG_CONFIG --libs libpulse`
+=09 AC_DEFINE([HAVE_PULSEAUDIO], 1, [define this if you have pulseaudio=
])
+=09 AC_SUBST(PULSELIBS, "$ac_pulse_libs")
+=09fi
+ fi
+fi
+
dnl **** Check for ALSA 1.x ****
AC_SUBST(ALSALIBS,"")
if test "$ac_cv_header_sys_asoundlib_h" =3D "yes" -o "$ac_cv_header_alsa_a=
soundlib_h" =3D "yes"
@@ -1296,7 +1315,7 @@ dnl **** Check for libodbc ****
WINE_CHECK_SONAME(odbc,SQLConnect,,[AC_DEFINE_UNQUOTED(SONAME_LIBODBC,["li=
bodbc.$LIBEXT"])])
=20
dnl **** Check for any sound system ****
-if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$ac_cv_lib_soname=
_jack" =3D "x" -a \
+if test "x$ALSALIBS$AUDIOIOLIBS$COREAUDIO$NASLIBS$ESDLIBS$PULSELIBS$ac_cv_=
lib_soname_jack" =3D "x" -a \
"$ac_cv_header_sys_soundcard_h" !=3D "yes" -a \
"$ac_cv_header_machine_soundcard_h" !=3D "yes" -a \
"$ac_cv_header_soundcard_h" !=3D "yes" -a \
@@ -2255,6 +2274,7 @@ WINE_CONFIG_MAKEFILE([dlls/winemp3.acm/Makefile],[dll=
s/Makedll.rules],[dlls],[AL
WINE_CONFIG_MAKEFILE([dlls/winenas.drv/Makefile],[dlls/Makedll.rules],[dll=
s],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/wineoss.drv/Makefile],[dlls/Makedll.rules],[dll=
s],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/wineps.drv/Makefile],[dlls/Makedll.rules],[dlls=
],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/winepulse.drv/Makefile],[dlls/Makedll.rules],[d=
lls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winequartz.drv/Makefile],[dlls/Makedll.rules],[=
dlls],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/winex11.drv/Makefile],[dlls/Makedll.rules],[dll=
s],[ALL_DLL_DIRS])
WINE_CONFIG_MAKEFILE([dlls/wing32/Makefile],[dlls/Makedll.rules],[dlls],[A=
LL_DLL_DIRS])
diff --git a/include/config.h.in b/include/config.h.in
index 9e93513..908e2f6 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -594,6 +594,9 @@
/* Define to 1 if you have the <pthread_np.h> header file. */
#undef HAVE_PTHREAD_NP_H
=20
+/* define this if you have pulseaudio */
+#undef HAVE_PULSEAUDIO
+
/* Define to 1 if you have the <pwd.h> header file. */
#undef HAVE_PWD_H
=20
diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index 8861657..cf91012 100644
--- a/programs/winecfg/Bg.rc
+++ b/programs/winecfg/Bg.rc
@@ -274,6 +274,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
IDS_DRIVER_ALSA "ALSA Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
diff --git a/programs/winecfg/Cs.rc b/programs/winecfg/Cs.rc
index 07f035f..8897237 100644
--- a/programs/winecfg/Cs.rc
+++ b/programs/winecfg/Cs.rc
@@ -273,6 +273,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standardn=ED"
IDS_ACCEL_BASIC "Z=E1kladn=ED"
IDS_ACCEL_EMULATION "Emulace"
+ IDS_DRIVER_PULSE "Ovlada=E8 PulseAudio"
IDS_DRIVER_ALSA "Ovlada=E8 ALSA"
IDS_DRIVER_ESOUND "Ovlada=E8 EsounD"
IDS_DRIVER_OSS "Ovlada=E8 OSS"
diff --git a/programs/winecfg/Da.rc b/programs/winecfg/Da.rc
index 1d655ad..a1c9653 100644
--- a/programs/winecfg/Da.rc
+++ b/programs/winecfg/Da.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Grundl=E6ggende"
IDS_ACCEL_EMULATION "Emul=E9ring"
+ IDS_DRIVER_PULSE "PulseAudio-driver"
IDS_DRIVER_ALSA "ALSA-driver"
IDS_DRIVER_ESOUND "EsounD-driver"
IDS_DRIVER_OSS "OSS-driver"
diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc
index 9ed3d63..614247b 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Einfach"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio-Treiber"
IDS_DRIVER_ALSA "ALSA-Treiber"
IDS_DRIVER_ESOUND "EsounD-Treiber"
IDS_DRIVER_OSS "OSS-Treiber"
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index 5743ba3..b165a81 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -270,6 +270,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
IDS_DRIVER_ALSA "ALSA Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 440ea71..dd1b764 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Est=E1ndar"
IDS_ACCEL_BASIC "B=E1sica"
IDS_ACCEL_EMULATION "Emulaci=F3n"
+ IDS_DRIVER_PULSE "Manejador PulseAudio"
IDS_DRIVER_ALSA "Manejador ALSA"
IDS_DRIVER_ESOUND "Manejador EsounD"
IDS_DRIVER_OSS "Manejador OSS"
diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc
index 1d761f8..e1b1583 100644
--- a/programs/winecfg/Fi.rc
+++ b/programs/winecfg/Fi.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
IDS_DRIVER_ALSA "ALSA Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc
index d72bafc..e0495c2 100644
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basique"
IDS_ACCEL_EMULATION "=C9mulation"
+ IDS_DRIVER_PULSE "Pilote PulseAudio"
IDS_DRIVER_ALSA "Pilote ALSA"
IDS_DRIVER_ESOUND "Pilote EsounD"
IDS_DRIVER_OSS "Pilote OSS"
diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc
index 5afbf91..4131f5f 100644
--- a/programs/winecfg/Hu.rc
+++ b/programs/winecfg/Hu.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
IDS_DRIVER_ALSA "ALSA Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc
index 8eaa603..543ed2c 100644
--- a/programs/winecfg/Ja.rc
+++ b/programs/winecfg/Ja.rc
@@ -273,6 +273,7 @@ BEGIN
IDS_ACCEL_STANDARD "=E6=A8=99=E6=BA=96"
IDS_ACCEL_BASIC "=E5=9F=BA=E6=9C=AC"
IDS_ACCEL_EMULATION "=E3=82=A8=E3=83=9F=E3=83=A5=E3=83=AC=E3=
=83=BC=E3=82=B7=E3=83=A7=E3=83=B3"
+ IDS_DRIVER_PULSE "PulseAudio Driver"
IDS_DRIVER_ALSA "ALSA Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc
index ca94b5b..a79cc03 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -272,6 +272,7 @@ BEGIN
IDS_ACCEL_STANDARD "=C7=A5=C1=D8"
IDS_ACCEL_BASIC "=B1=E2=BA=BB"
IDS_ACCEL_EMULATION "=BE=D6=B9=C4=B7=B9=C0=CC=BC=C7"
+ IDS_DRIVER_PULSE "PulseAudio =B5=E5=B6=F3=C0=CC=B9=F6"
IDS_DRIVER_ALSA "ALSA =B5=E5=B6=F3=C0=CC=B9=F6"
IDS_DRIVER_ESOUND "EsounD =B5=E5=B6=F3=C0=CC=B9=F6"
IDS_DRIVER_OSS "OSS =B5=E5=B6=F3=C0=CC=B9=F6"
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc
index fb91290..b23e919 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -270,6 +270,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standaard"
IDS_ACCEL_BASIC "Eenvoudig"
IDS_ACCEL_EMULATION "Emulatie"
+ IDS_DRIVER_PULSE "PulseAudio Stuurprogramma"
IDS_DRIVER_ALSA "ALSA Stuurprogramma"
IDS_DRIVER_ESOUND "EsounD Stuurprogramma"
IDS_DRIVER_OSS "OSS Stuurprogramma"
diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc
index aaa64c3..9dd3572 100644
--- a/programs/winecfg/No.rc
+++ b/programs/winecfg/No.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Grunnleggende"
IDS_ACCEL_EMULATION "Emulering"
+ IDS_DRIVER_PULSE "PulseAudio-driver"
IDS_DRIVER_ALSA "ALSA-driver"
IDS_DRIVER_ESOUND "EsounD-driver"
IDS_DRIVER_OSS "OSS-driver"
diff --git a/programs/winecfg/Pl.rc b/programs/winecfg/Pl.rc
index c426443..e3bf093 100644
--- a/programs/winecfg/Pl.rc
+++ b/programs/winecfg/Pl.rc
@@ -271,6 +271,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standardowe"
IDS_ACCEL_BASIC "Podstawowe"
IDS_ACCEL_EMULATION "Emulacja"
+ IDS_DRIVER_PULSE "Sterownik PulseAudio"
IDS_DRIVER_ALSA "Sterownik ALSA"
IDS_DRIVER_ESOUND "Sterownik EsounD"
IDS_DRIVER_OSS "Sterownik OSS"
diff --git a/programs/winecfg/Pt.rc b/programs/winecfg/Pt.rc
index 830cabf..0ed1dbd 100644
--- a/programs/winecfg/Pt.rc
+++ b/programs/winecfg/Pt.rc
@@ -465,6 +465,7 @@ BEGIN
IDS_ACCEL_STANDARD "Padr=E3o"
IDS_ACCEL_BASIC "B=E1sico"
IDS_ACCEL_EMULATION "Emula=E7=E3o"
+ IDS_DRIVER_PULSE "Controlador PulseAudio"
IDS_DRIVER_ALSA "Controlador ALSA"
IDS_DRIVER_ESOUND "Controlador EsounD"
IDS_DRIVER_OSS "Controlador OSS"
diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc
index a4b0cad..c065d36 100644
--- a/programs/winecfg/Ro.rc
+++ b/programs/winecfg/Ro.rc
@@ -270,6 +270,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "De bas=C4=83"
IDS_ACCEL_EMULATION "Emulare"
+ IDS_DRIVER_PULSE "Driver PulseAudio"
IDS_DRIVER_ALSA "Driver ALSA"
IDS_DRIVER_ESOUND "Driver Esound"
IDS_DRIVER_OSS "Driver OSS"
diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc
index 782e1fd..f516399 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -272,6 +272,7 @@ BEGIN
IDS_ACCEL_STANDARD "=D1=F2=E0=ED=E4=E0=F0=F2=ED=EE=E5"
IDS_ACCEL_BASIC "=CC=E8=ED=E8=EC=E0=EB=FC=ED=EE=E5"
IDS_ACCEL_EMULATION "=DD=EC=F3=EB=FF=F6=E8=FF"
+ IDS_DRIVER_PULSE "PulseAudio =E4=F0=E0=E9=E2=E5=F0"
IDS_DRIVER_ALSA "ALSA =E4=F0=E0=E9=E2=E5=F0"
IDS_DRIVER_ESOUND "EsounD =E4=F0=E0=E9=E2=E5=F0"
IDS_DRIVER_OSS "OSS =E4=F0=E0=E9=E2=E5=F0"
diff --git a/programs/winecfg/Si.rc b/programs/winecfg/Si.rc
index 0bd04ef..c8bd35e 100644
--- a/programs/winecfg/Si.rc
+++ b/programs/winecfg/Si.rc
@@ -270,6 +270,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standardno"
IDS_ACCEL_BASIC "Osnovno"
IDS_ACCEL_EMULATION "Emulacija"
+ IDS_DRIVER_PULSE "PulseAudio gonilnik"
IDS_DRIVER_ALSA "ALSA gonilnik"
IDS_DRIVER_ESOUND "EsounD gonilnik"
IDS_DRIVER_OSS "OSS gonilnik"
diff --git a/programs/winecfg/Sv.rc b/programs/winecfg/Sv.rc
index 49bb236..7efe2c0 100644
--- a/programs/winecfg/Sv.rc
+++ b/programs/winecfg/Sv.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standard"
IDS_ACCEL_BASIC "Grundl=E4ggande"
IDS_ACCEL_EMULATION "Emulering"
+ IDS_DRIVER_PULSE "PulseAudio-drivrutin"
IDS_DRIVER_ALSA "ALSA-drivrutin"
IDS_DRIVER_ESOUND "EsounD-drivrutin"
IDS_DRIVER_OSS "OSS-drivrutin"
diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc
index 4157f86..1be23c5 100644
--- a/programs/winecfg/Tr.rc
+++ b/programs/winecfg/Tr.rc
@@ -268,6 +268,7 @@ BEGIN
IDS_ACCEL_STANDARD "Standart"
IDS_ACCEL_BASIC "Temel"
IDS_ACCEL_EMULATION "Taklit"
+ IDS_DRIVER_PULSE "PulseAudio S=FCr=FCc=FCs=FC"
IDS_DRIVER_ALSA "ALSA S=FCr=FCc=FCs=FC"
IDS_DRIVER_ESOUND "EsounD S=FCr=FCc=FCs=FC"
IDS_DRIVER_OSS "OSS S=FCr=FCc=FCs=FC"
diff --git a/programs/winecfg/Zh.rc b/programs/winecfg/Zh.rc
index 4c18e99..029a26d 100644
--- a/programs/winecfg/Zh.rc
+++ b/programs/winecfg/Zh.rc
@@ -271,6 +271,7 @@ BEGIN
IDS_ACCEL_STANDARD "=E6=A0=87=E5=87=86"
IDS_ACCEL_BASIC "=E5=9F=BA=E6=9C=AC"
IDS_ACCEL_EMULATION "=E8=BD=AF=E4=BB=B6=E6=A8=A1=E6=8B=9F"
+ IDS_DRIVER_PULSE "PulseAudio =E9=A9=B1=E5=8A=A8"
IDS_DRIVER_ALSA "ALSA =E9=A9=B1=E5=8A=A8"
IDS_DRIVER_ESOUND "EsounD =E9=A9=B1=E5=8A=A8"
IDS_DRIVER_OSS "OSS =E9=A9=B1=E5=8A=A8"
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 8e966a5..9c2cde3 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -88,6 +88,7 @@ typedef struct
} AUDIO_DRIVER;
=20
static const AUDIO_DRIVER sAudioDrivers[] =3D {
+ {IDS_DRIVER_PULSE, "pulse"},
{IDS_DRIVER_ALSA, "alsa"},
{IDS_DRIVER_OSS, "oss"},
{IDS_DRIVER_COREAUDIO, "coreaudio"},
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index 37cc12b..a53c4cf 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -69,6 +69,7 @@ static const char * const builtin_only[] =3D
"user32",
"vdmdbg",
"w32skrnl",
+ "winepulse.drv",
"winealsa.drv",
"wineaudioio.drv",
"wined3d",
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index a18fe76..1c4a1e7 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -182,7 +182,7 @@
#define IDS_ACCEL_BASIC 8302
#define IDS_ACCEL_EMULATION 8303
#define IDS_DRIVER_ALSA 8304
-
+#define IDS_DRIVER_PULSE 8305
#define IDS_DRIVER_ESOUND 8306
#define IDS_DRIVER_OSS 8307
#define IDS_DRIVER_JACK 8308
--=20
1.6.1
------=_Part_65445_28911239.1239218177911--
More information about the wine-patches
mailing list