From: Horst G. Burkhardt III Date: Wed, 22 Feb 2012 02:55:21 +0000 (+1100) Subject: [aRts removal] Exorcizo te, omnis spiritus immunde, in nomine Dei Patris omnipotentis X-Git-Tag: v22.1.15~28^2 X-Git-Url: http://cgit.sxemacs.org/?p=sxemacs;a=commitdiff_plain;h=fe341d5ad86d63adaeb113da6c20494d484e7d21 [aRts removal] Exorcizo te, omnis spiritus immunde, in nomine Dei Patris omnipotentis Signed-off-by: Horst G. Burkhardt III --- diff --git a/INSTALL b/INSTALL index 36042e5..0329762 100644 --- a/INSTALL +++ b/INSTALL @@ -194,9 +194,6 @@ install them and incorporate them into SXEmacs. - PulseAudio: http://pulseaudio.org/ - - aRts (Analog Realtime Synthesizer): - http://www.arts-project.org/ - - Jack (Jack Audio Connection Kit): http://jackit.sourceforge.net/ diff --git a/PROBLEMS b/PROBLEMS index 3bb746e..cdf90b3 100644 --- a/PROBLEMS +++ b/PROBLEMS @@ -561,11 +561,6 @@ This is due to missing (hardware-)mixing capabilities of your soundcard. There is a user-space plugin called dmix, which can effectively circumvent this issue. -*** SXEmacs dumps core when using the aRts audio device - -Does it? Please report details (version number of aRts, backtrace, -etc.). - *** SXEmacs crashes when using state sentinels with asynchronous sounds This is a known bug (#13 in our bug database). At the moment the only diff --git a/etc/sample.init.el b/etc/sample.init.el index 2353cf3..d1007f6 100644 --- a/etc/sample.init.el +++ b/etc/sample.init.el @@ -1023,7 +1023,7 @@ previous with \\[backward-sexp]." ;; The folloing requires that PulseAudio is installed. But don't ;; fear, SXEmacs also supports: ;; -;; ALSA, ao, ESD, OSS, aRts, Jack, and NAS +;; ALSA, ao, ESD, OSS, Jack, and NAS ;; (setq default-audio-device (make-audio-device 'pulse)) diff --git a/info/lispref/media.texi b/info/lispref/media.texi index 4c58962..81f0eb8 100644 --- a/info/lispref/media.texi +++ b/info/lispref/media.texi @@ -76,13 +76,13 @@ audio library and FFmpeg as media library! @item Known caveats with SXE: none @end itemize -Since OSS was one of the most spread architectures for audio many of +Since OSS was one of the most widespread architectures for audio many of the new generation audio infrastructures support OSS with at least a compatibility layer. For instance PulseAudio provides a tool -@samp{padsp}, Esound calls it @samp{esddsp}, and @samp{artsdsp} is the -arts version. All these are intended to provide an OSS device -emulation for applications which only speak OSS. All read/write -accesses are rerouted to the respective audio server. +@samp{padsp}, and Esound calls it @samp{esddsp}. All these are +intended to provide an OSS device emulation for applications which +only speak OSS. All read/write accesses are rerouted to the +respective audio server. @subsection Audio Library: NAS (Network Audio System) @@ -162,34 +162,6 @@ directly attach to local hardware but also to other remotely running pulses or other running audio servers (like jack, esd, etc.). -@subsection Audio Library: aRts (the analog realtime synthesizer) - -@itemize -@item Availability: Unix-wide -@item Dependencies: OSS, (KDE); -optional: ALSA, Jack, ESD, mas, NAS, libaudiofile, Qt, sgilibaudio -@item Webpage: @url{http://www.arts-project.org/} -@item Download: - -@url{ftp://ftp.kde.org/pub/kde/stable/latest/src/arts-1.5.2.tar.bz2}, - -standalone version: -@url{http://arts-project.org/download/arts-0.5.4.tar.gz} - -@item Pros: -device independent (if used with ALSA or other sound servers), -network-mode possible, mixing possible, very flexible, very configurable -@item Cons: -standalone version discontinued, lots of processes, uses/needs MCOP -@item Known caveats with SXE: none -@end itemize - -Arts was designed as both audio server and synthesizer originally. -It is usable locally and transparently downmixes incoming streams. -However, since starting arts (even the standalone artsd) means -starting 80% of a bloated KDE, we highly discourage its use. - - @subsection Audio Library: Jack (a low-latency audio server) @itemize @@ -499,7 +471,7 @@ underlying driver libraries. @defun make-audio-device driver &rest device-options Create a new device to output audio via @var{driver}. @var{driver} should be a symbol out of 'oss, 'nas, 'esd, 'pulse, -'jack, 'alsa, 'arts or 'ao. +'jack, 'alsa, or 'ao. The rest arguments may be used to pass options to the selected output driver. These should be `:keyword value' pairs. @@ -562,8 +534,6 @@ sensible default in this order: - use the display specified in $DISPLAY - try "localhost:0.0" -Valid keywords for aRts are: -none at the moment @end defun @example diff --git a/info/sxemacs-faq.texi b/info/sxemacs-faq.texi index 4b6f796..704951c 100644 --- a/info/sxemacs-faq.texi +++ b/info/sxemacs-faq.texi @@ -658,7 +658,7 @@ to handle. @item Support for modern sound libraries and sound servers: ESD, Polyp, -aRts, Jack, ALSA, and ao +Jack, ALSA, and ao @item Support for various media formats (provided by external libraries): @@ -6618,7 +6618,7 @@ Portuguese added to etc/HELLO -- Ferreira. Massive improvements, enhancements for multimedia (audio) -- Freundt. SXEmacs supports several "sound servers" like: OSS, NAS, ESD, Polypaudio, -ALSA, aRts, and Jack. And media streams can be handled by sndfile, ffmpeg, +ALSA, and Jack. And media streams can be handled by sndfile, ffmpeg, sox, mad, xine, gstreamer. The SXEmacs developers recommend Polyp/ffmpeg whenever possible. diff --git a/src/media/sound.c b/src/media/sound.c index 158c20e..1eca185 100644 --- a/src/media/sound.c +++ b/src/media/sound.c @@ -52,9 +52,6 @@ Lisp_Object Qplay_sound; #ifdef HAVE_AO_SOUND #include "sound-ao.h" #endif -#ifdef HAVE_ARTS_SOUND -#include "sound-arts.h" -#endif #ifdef HAVE_POLYP_SOUND #include "sound-polyp.h" #endif @@ -883,10 +880,6 @@ audio_device_print(Lisp_Object obj, Lisp_Object printcharfun, int escapeflag) write_c_string("oss", printcharfun); break; - case ADRIVER_ARTS: - write_c_string("arts", printcharfun); - break; - case ADRIVER_NAS: write_c_string("nas", printcharfun); break; @@ -1015,10 +1008,6 @@ audio_driver decode_audio_type(Lisp_Object type) else if (EQ(type, Qao)) ad = ADRIVER_AO; #endif -#ifdef HAVE_ARTS_SOUND - else if (EQ(type, Qarts)) - ad = ADRIVER_ARTS; -#endif #ifdef HAVE_JACK_SOUND else if (EQ(type, Qjack)) ad = ADRIVER_JACK; @@ -1066,10 +1055,6 @@ audio_driver decode_audio_device(Lisp_Object device) else if (DEVICE_CONNECTED_TO_ESD_P(d)) ad = ADRIVER_ESD; #endif -#ifdef HAVE_ARTS_SOUND - else if (DEVICE_CONNECTED_TO_ARTS_P(d)) - ad = ADRIVER_ARTS; -#endif #ifdef HAVE_ALSA_SOUND else if (DEVICE_CONNECTED_TO_ALSA_P(d)) ad = ADRIVER_ALSA; @@ -1123,7 +1108,7 @@ DRIVER &rest DEVICE-OPTIONS Create a new device to output audio via DRIVER. DRIVER should be a symbol out of 'oss, 'nas, 'esd, 'pulse, -'jack, 'alsa, 'arts or 'ao. +'jack, 'alsa, or 'ao. The rest arguments may be used to pass options to the selected output driver. These should be `:keyword value' pairs. @@ -1186,9 +1171,6 @@ sensible default in this order: - use the display specified in $DISPLAY - try "localhost:0.0" -Valid keywords for aRts are: -none at the moment - */ (int nargs, Lisp_Object *args)) { @@ -1208,11 +1190,6 @@ none at the moment #ifdef HAVE_NAS_SOUND XAUDIO_DEVICE_METHS(ad) = sound_nas; break; -#endif - case ADRIVER_ARTS: -#ifdef HAVE_ARTS_SOUND - XAUDIO_DEVICE_METHS(ad) = sound_arts; - break; #endif case ADRIVER_ALSA: #ifdef HAVE_ALSA_SOUND @@ -1317,9 +1294,6 @@ void syms_of_sound(void) #ifdef HAVE_AO_SOUND defsymbol(&Qao, "ao"); #endif -#ifdef HAVE_ARTS_SOUND - defsymbol(&Qarts, "arts"); -#endif #ifdef HAVE_ALSA_SOUND defsymbol(&Qalsa, "alsa"); #endif @@ -1388,9 +1362,6 @@ void vars_of_sound(void) #ifdef HAVE_AO_SOUND Fprovide(intern("ao-sound")); #endif -#ifdef HAVE_ARTS_SOUND - Fprovide(intern("arts-sound")); -#endif #ifdef HAVE_ALSA_SOUND Fprovide(intern("alsa-sound")); #endif diff --git a/src/media/sound.h b/src/media/sound.h index 545de38..930b993 100644 --- a/src/media/sound.h +++ b/src/media/sound.h @@ -58,7 +58,6 @@ enum audio_drivers { ADRIVER_ESD, ADRIVER_POLYP, ADRIVER_PULSE, - ADRIVER_ARTS, ADRIVER_JACK, ADRIVER_ALSA, ADRIVER_AO,