[winmm/winearts] Kill off winearts
Maarten Lankhorst
m.b.lankhorst at gmail.com
Wed Apr 4 12:02:04 CDT 2007
As far as I can tell, it has been disabled for at least 4 months, and I didn't hear anyone about it, so it seems like a good idea to remove winearts, if anybody feels like reviving it, it would be easy to do so by reversing this commit, but KDE itself is moving away from arts, so I dont see a point in keeping this broken, disabled audio backend.
---
-------------- next part --------------
>From f59ef01932433d0875bb215ac57a92d4079dfba6 Mon Sep 17 00:00:00 2001
From: Maarten Lankhorst <m.b.lankhorst at gmail.com>
Date: Wed, 28 Mar 2007 17:12:18 +0200
Subject: [PATCH] winmm/arts: remove unused winearts driver
As far as I can tell, it has been disabled for at least 4 months, and I didn't hear anyone about it, so it seems like a good idea to remove winearts, if anybody feels like reviving it, it would be easy to do so, but KDE itself is moving away from arts, so I dont see a point in keeping this broken, disabled audio backend.
---
configure.ac | 34 +---------------------------------
dlls/Makefile.in | 1 -
programs/winecfg/Bg.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/Ro.rc | 1 -
programs/winecfg/Ru.rc | 1 -
programs/winecfg/Tr.rc | 1 -
programs/winecfg/audio.c | 3 ---
programs/winecfg/libraries.c | 1 -
programs/winecfg/resource.h | 2 +-
19 files changed, 2 insertions(+), 53 deletions(-)
diff --git a/configure.ac b/configure.ac
index 066a289..921fdcf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -785,36 +785,6 @@ WINE_CHECK_LIB_FUNCS(\
pthread_get_stacksize_np,
[$LIBPTHREAD])
-dnl **** Check for aRts Sound Server ****
-AC_PATH_PROG(ARTSCCONFIG, artsc-config)
-if test x$ARTSCCONFIG != x -a x$ARTSCCONFIG != x'"$ARTSCCONFIG"';
-then
- ARTSC_CFLAGS=""
- for i in `$ARTSCCONFIG --cflags`
- do
- case "$i" in
- -I*) ARTSC_CFLAGS="$ARTSC_CFLAGS $i";;
- esac
- done
- ARTSC_LIBS=""
- for i in `$ARTSCCONFIG --libs`
- do
- case "$i" in
- -L/usr/lib|-L/usr/lib64) ;;
- -L*|-l*) ARTSC_LIBS="$ARTSC_LIBS $i";;
- esac
- done
- save_CFLAGS="$CFLAGS"
- CFLAGS="$CFLAGS $ARTSC_CFLAGS"
- AC_CHECK_LIB(artsc,arts_init,
- [AC_TRY_COMPILE([#include <artsc.h>],[arts_stream_t stream;],
- [AC_SUBST(ARTSLIBS, $ARTSC_LIBS)
- AC_SUBST(ARTSINCL, $ARTSC_CFLAGS)
- AC_DEFINE(HAVE_ARTS, 1, [Define if you have ARTS sound server])])],,
- $ARTSC_LIBS)
- CFLAGS="$save_CFLAGS"
-fi
-
dnl **** Check for EsounD ****
AC_PATH_PROG(ESDCONFIG, esd-config)
if test x$ESDCONFIG != x -a x$ESDCONFIG != x'"$ESDCONFIG"';
@@ -1755,7 +1725,6 @@ AC_CONFIG_FILES([dlls/vtdapi.vxd/Makefile])
AC_CONFIG_FILES([dlls/vwin32.vxd/Makefile])
AC_CONFIG_FILES([dlls/w32skrnl/Makefile])
AC_CONFIG_FILES([dlls/winealsa.drv/Makefile])
-AC_CONFIG_FILES([dlls/winearts.drv/Makefile])
AC_CONFIG_FILES([dlls/wineaudioio.drv/Makefile])
AC_CONFIG_FILES([dlls/winecoreaudio.drv/Makefile])
AC_CONFIG_FILES([dlls/winecrt0/Makefile])
@@ -2048,7 +2017,6 @@ then
fi
if test -z "$ALSALIBS" -a \
- -z "$ARTSC_LIBS" -a \
-z "$AUDIOIOLIBS" -a \
-z "$NASLIBS" -a \
-z "$ESD_LIBS" -a \
@@ -2060,7 +2028,7 @@ then
echo >&2
AC_MSG_WARN([No sound system was found. Windows applications will be silent.])
AC_MSG_WARN([The currently supported sound systems are:])
- AC_MSG_WARN([ALSA, ARTS, EsounD, AudioIO, Jack, NAS and OSS])
+ AC_MSG_WARN([ALSA, EsounD, AudioIO, Jack, NAS and OSS])
fi
echo
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index b88cde3..0675a9c 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -188,7 +188,6 @@ BASEDIRS = \
vwin32.vxd \
w32skrnl \
winealsa.drv \
- winearts.drv \
wineaudioio.drv \
winecoreaudio.drv \
winedos \
diff --git a/programs/winecfg/Bg.rc b/programs/winecfg/Bg.rc
index 13a1ed1..302bec5 100644
--- a/programs/winecfg/Bg.rc
+++ b/programs/winecfg/Bg.rc
@@ -268,7 +268,6 @@ BEGIN
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
IDS_DRIVER_ALSA "ALSA Driver"
- IDS_DRIVER_ARTS "aRts Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
IDS_DRIVER_JACK "JACK Driver"
diff --git a/programs/winecfg/De.rc b/programs/winecfg/De.rc
index 9f02421..8c77b2b 100644
--- a/programs/winecfg/De.rc
+++ b/programs/winecfg/De.rc
@@ -266,7 +266,6 @@ BEGIN
IDS_ACCEL_BASIC "Einfach"
IDS_ACCEL_EMULATION "Emulation"
IDS_DRIVER_ALSA "ALSA-Treiber"
- IDS_DRIVER_ARTS "aRts-Treiber"
IDS_DRIVER_ESOUND "EsounD-Treiber"
IDS_DRIVER_OSS "OSS-Treiber"
IDS_DRIVER_JACK "JACK-Treiber"
diff --git a/programs/winecfg/En.rc b/programs/winecfg/En.rc
index c59d517..5e81891 100644
--- a/programs/winecfg/En.rc
+++ b/programs/winecfg/En.rc
@@ -267,7 +267,6 @@ BEGIN
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
IDS_DRIVER_ALSA "ALSA Driver"
- IDS_DRIVER_ARTS "aRts Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
IDS_DRIVER_JACK "JACK Driver"
diff --git a/programs/winecfg/Es.rc b/programs/winecfg/Es.rc
index 6d2d4a9..34993c2 100644
--- a/programs/winecfg/Es.rc
+++ b/programs/winecfg/Es.rc
@@ -262,7 +262,6 @@ BEGIN
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
IDS_DRIVER_ALSA "ALSA Driver"
- IDS_DRIVER_ARTS "aRts Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
IDS_DRIVER_JACK "JACK Driver"
diff --git a/programs/winecfg/Fi.rc b/programs/winecfg/Fi.rc
index 054045a..16da0ca 100644
--- a/programs/winecfg/Fi.rc
+++ b/programs/winecfg/Fi.rc
@@ -265,7 +265,6 @@ BEGIN
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
IDS_DRIVER_ALSA "ALSA Driver"
- IDS_DRIVER_ARTS "aRts Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
IDS_DRIVER_JACK "JACK Driver"
diff --git a/programs/winecfg/Fr.rc b/programs/winecfg/Fr.rc
index 0791fc7..007ca53 100644
--- a/programs/winecfg/Fr.rc
+++ b/programs/winecfg/Fr.rc
@@ -266,7 +266,6 @@ BEGIN
IDS_ACCEL_BASIC "Basique"
IDS_ACCEL_EMULATION "Émulation"
IDS_DRIVER_ALSA "Pilote ALSA"
- IDS_DRIVER_ARTS "Pilote aRts"
IDS_DRIVER_ESOUND "Pilote EsounD"
IDS_DRIVER_OSS "Pilote OSS"
IDS_DRIVER_JACK "Pilote JACK"
diff --git a/programs/winecfg/Hu.rc b/programs/winecfg/Hu.rc
index 658a391..20e5286 100644
--- a/programs/winecfg/Hu.rc
+++ b/programs/winecfg/Hu.rc
@@ -262,7 +262,6 @@ BEGIN
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
IDS_DRIVER_ALSA "ALSA Driver"
- IDS_DRIVER_ARTS "aRts Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
IDS_DRIVER_JACK "JACK Driver"
diff --git a/programs/winecfg/Ja.rc b/programs/winecfg/Ja.rc
index 2b8579b..4b0285f 100644
--- a/programs/winecfg/Ja.rc
+++ b/programs/winecfg/Ja.rc
@@ -260,7 +260,6 @@ BEGIN
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
IDS_DRIVER_ALSA "ALSA Driver"
- IDS_DRIVER_ARTS "aRts Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
IDS_DRIVER_JACK "JACK Driver"
diff --git a/programs/winecfg/Ko.rc b/programs/winecfg/Ko.rc
index 16590d7..fe20fc4 100644
--- a/programs/winecfg/Ko.rc
+++ b/programs/winecfg/Ko.rc
@@ -268,7 +268,6 @@ BEGIN
IDS_ACCEL_BASIC "񃧯"
IDS_ACCEL_EMULATION "¾Ö¹Ä·¹À̼Ç"
IDS_DRIVER_ALSA "ALSA µå¶óÀ̹ö"
- IDS_DRIVER_ARTS "aRts µå¶óÀ̹ö"
IDS_DRIVER_ESOUND "EsounD µå¶óÀ̹ö"
IDS_DRIVER_OSS "OSS µå¶óÀ̹ö"
IDS_DRIVER_JACK "JACK µå¶óÀ̹ö"
diff --git a/programs/winecfg/Nl.rc b/programs/winecfg/Nl.rc
index e72dac7..92e112e 100644
--- a/programs/winecfg/Nl.rc
+++ b/programs/winecfg/Nl.rc
@@ -267,7 +267,6 @@ BEGIN
IDS_ACCEL_BASIC "Eenvoudig"
IDS_ACCEL_EMULATION "Emulatie"
IDS_DRIVER_ALSA "ALSA Stuurprogramma"
- IDS_DRIVER_ARTS "aRts Stuurprogramma"
IDS_DRIVER_ESOUND "EsounD Stuurprogramma"
IDS_DRIVER_OSS "OSS Stuurprogramma"
IDS_DRIVER_JACK "JACK Stuurprogramma"
diff --git a/programs/winecfg/No.rc b/programs/winecfg/No.rc
index 02e41f9..f76a47c 100644
--- a/programs/winecfg/No.rc
+++ b/programs/winecfg/No.rc
@@ -265,7 +265,6 @@ BEGIN
IDS_ACCEL_BASIC "Grunnleggende"
IDS_ACCEL_EMULATION "Emulering"
IDS_DRIVER_ALSA "ALSA-driver"
- IDS_DRIVER_ARTS "aRts-driver"
IDS_DRIVER_ESOUND "EsounD-driver"
IDS_DRIVER_OSS "OSS-driver"
IDS_DRIVER_JACK "JACK-driver"
diff --git a/programs/winecfg/Ro.rc b/programs/winecfg/Ro.rc
index 43765c2..3b62984 100644
--- a/programs/winecfg/Ro.rc
+++ b/programs/winecfg/Ro.rc
@@ -267,7 +267,6 @@ BEGIN
IDS_ACCEL_BASIC "Basic"
IDS_ACCEL_EMULATION "Emulation"
IDS_DRIVER_ALSA "ALSA Driver"
- IDS_DRIVER_ARTS "aRts Driver"
IDS_DRIVER_ESOUND "EsounD Driver"
IDS_DRIVER_OSS "OSS Driver"
IDS_DRIVER_JACK "JACK Driver"
diff --git a/programs/winecfg/Ru.rc b/programs/winecfg/Ru.rc
index 33957d9..1872a3d 100644
--- a/programs/winecfg/Ru.rc
+++ b/programs/winecfg/Ru.rc
@@ -267,7 +267,6 @@ BEGIN
IDS_ACCEL_BASIC "Ìèíèìàëüíîå"
IDS_ACCEL_EMULATION "Ýìóëÿöèÿ"
IDS_DRIVER_ALSA "ALSA äðàéâåð"
- IDS_DRIVER_ARTS "aRts äðàéâåð"
IDS_DRIVER_ESOUND "EsounD äðàéâåð"
IDS_DRIVER_OSS "OSS äðàéâåð"
IDS_DRIVER_JACK "JACK äðàéâåð"
diff --git a/programs/winecfg/Tr.rc b/programs/winecfg/Tr.rc
index c539be4..13404c7 100644
--- a/programs/winecfg/Tr.rc
+++ b/programs/winecfg/Tr.rc
@@ -265,7 +265,6 @@ BEGIN
IDS_ACCEL_BASIC "Temel"
IDS_ACCEL_EMULATION "Taklit"
IDS_DRIVER_ALSA "ALSA Sürücüsü"
- IDS_DRIVER_ARTS "aRts Sürücüsü"
IDS_DRIVER_ESOUND "EsounD Sürücüsü"
IDS_DRIVER_OSS "OSS Sürücüsü"
IDS_DRIVER_JACK "JACK Sürücüsü"
diff --git a/programs/winecfg/audio.c b/programs/winecfg/audio.c
index 2fc8c39..2eb433c 100644
--- a/programs/winecfg/audio.c
+++ b/programs/winecfg/audio.c
@@ -82,9 +82,6 @@ static const char* DSound_Bits[] = {
static const AUDIO_DRIVER sAudioDrivers[] = {
{IDS_DRIVER_ALSA, "alsa"},
-#if 0 /* arts library is buggy */
- {IDS_DRIVER_ARTS, "arts"},
-#endif
{IDS_DRIVER_ESOUND, "esd"},
{IDS_DRIVER_OSS, "oss"},
{IDS_DRIVER_JACK, "jack"},
diff --git a/programs/winecfg/libraries.c b/programs/winecfg/libraries.c
index c1457d9..78f694b 100644
--- a/programs/winecfg/libraries.c
+++ b/programs/winecfg/libraries.c
@@ -67,7 +67,6 @@ static const char * const builtin_only[] =
"vdmdbg",
"w32skrnl",
"winealsa.drv",
- "winearts.drv",
"wineaudioio.drv",
"wined3d",
"winedos",
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index 6bab26f..8944696 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -174,7 +174,7 @@
#define IDS_ACCEL_BASIC 8302
#define IDS_ACCEL_EMULATION 8303
#define IDS_DRIVER_ALSA 8304
-#define IDS_DRIVER_ARTS 8305
+
#define IDS_DRIVER_ESOUND 8306
#define IDS_DRIVER_OSS 8307
#define IDS_DRIVER_JACK 8308
--
1.4.4.2
More information about the wine-patches
mailing list