diff options
| -rw-r--r-- | LICENSE_readme | 2 | ||||
| -rw-r--r-- | REQUIREMENTS | 2 | ||||
| -rw-r--r-- | ext/Makefile.am | 14 | ||||
| -rw-r--r-- | ext/arts/.gitignore | 4 | ||||
| -rw-r--r-- | ext/arts/Makefile.am | 28 | ||||
| -rw-r--r-- | ext/arts/gst_arts.c | 178 | ||||
| -rw-r--r-- | ext/arts/gst_arts.h | 65 | ||||
| -rw-r--r-- | ext/arts/gst_artsio.idl | 21 | ||||
| -rw-r--r-- | ext/arts/gst_artsio_impl.cc | 187 | ||||
| -rw-r--r-- | ext/arts/gst_artsio_impl.h | 14 | ||||
| -rw-r--r-- | ext/artsd/Makefile.am | 10 | ||||
| -rw-r--r-- | ext/artsd/REQUIREMENTS | 4 | ||||
| -rw-r--r-- | ext/artsd/gstartsdsink.c | 349 | ||||
| -rw-r--r-- | ext/artsd/gstartsdsink.h | 78 | ||||
| -rw-r--r-- | m4/Makefile.am | 2 | ||||
| -rw-r--r-- | m4/as-arts.m4 | 209 | ||||
| -rw-r--r-- | m4/gst-artsc.m4 | 28 |
17 files changed, 0 insertions, 1195 deletions
diff --git a/LICENSE_readme b/LICENSE_readme index a4115d044..7cafa7a6c 100644 --- a/LICENSE_readme +++ b/LICENSE_readme @@ -49,7 +49,6 @@ vbidec None (Algorithm by Billy Biggs, Doug Bell, Plugins which use a LGPL library are as follows: alsa alsa (http://alsa-project.org/) -artsdsink aRts (http://arts-project.org/) cacasink libcaca (http://sam.zoy.org/projects/libcaca/) colorspacelcs libcolorspace dvdec libdv (http://libdv.sourceforge.net/) @@ -59,7 +58,6 @@ fameenc libfame (http://fame.sourceforge.net/) ffmpeg ffmpeg (http://ffmpeg.sourceforge.net/) gdkpixbuf GTK+ (http://www.gtk.org/) gnomevfs gnome-vfs (ftp.gnome.org//pub/GNOME/stable/sources/gnome-vfs/) -gst_arts aRts (http://arts-project.org/) gst1394 libraw1394 (http://www.linux1394.org/) gstaf libaudiofile (http://www.68k.org/~michael/audiofile/) gstsf libsndfile (http://www.mega-nerd.com/libsndfile/) diff --git a/REQUIREMENTS b/REQUIREMENTS index 8acd4a8af..bf4dcf7ea 100644 --- a/REQUIREMENTS +++ b/REQUIREMENTS @@ -32,8 +32,6 @@ ext/(library) dirac (Dirac video codec) http://www.bbc.co.uk/rd/projects/dirac/index.shtml -aRts (for the arts plugin wrapper, and the artsd sink) - http://www.arts-project.org libdvdread (for the dvdsrc) http://www.dtek.chalmers.se/groups/dvd/ (optional: libcss for encrypted DVDs) diff --git a/ext/Makefile.am b/ext/Makefile.am index de43bbe55..a0d6463b5 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -16,18 +16,6 @@ else APEXSINK_DIR = endif -# if USE_ARTS -# ARTS_DIR=arts -# else -ARTS_DIR= -# endif - -# if USE_ARTSC -# ARTSC_DIR=artsd -# else -ARTSC_DIR= -# endif - # if USE_AUDIOFILE # AUDIOFILE_DIR=audiofile # else @@ -384,8 +372,6 @@ SUBDIRS=\ $(ASSRENDER_DIR) \ $(VOAMRWBENC_DIR) \ $(APEXSINK_DIR) \ - $(ARTS_DIR) \ - $(ARTSC_DIR) \ $(AUDIOFILE_DIR) \ $(BZ2_DIR) \ $(CDAUDIO_DIR) \ diff --git a/ext/arts/.gitignore b/ext/arts/.gitignore deleted file mode 100644 index 9a6a379ac..000000000 --- a/ext/arts/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -gst_artsio.cc -gst_artsio.h -gst_artsio.mcopclass -gst_artsio.mcoptype diff --git a/ext/arts/Makefile.am b/ext/arts/Makefile.am deleted file mode 100644 index b59d734d3..000000000 --- a/ext/arts/Makefile.am +++ /dev/null @@ -1,28 +0,0 @@ - -plugin_LTLIBRARIES = libgstarts.la - -SUFFIXES = .idl -# on FC2, artsc-config --cflags has -pthread, which mcopidl doesn't like -# If someone has time and energy, please check if -pthread should be allowed -# in compile flags at all. -.idl.cc: - mcopidl -t `echo $(ARTS_CXXFLAGS) | sed 's/-pthread//g'` $< - -# mcopidl Extension Expansion Technology clean up -CLEANFILES = gst_artsio.h gst_artsio.cc gst_artsio.mcopclass gst_artsio.mcoptype - -EXTRA_DIST = gst_artsio.idl -BUILT_SOURCES = gst_artsio.cc - -libgstarts_la_SOURCES = gst_arts.c gst_artsio_impl.cc -nodist_libgstarts_la_SOURCES = gst_artsio.cc -libgstarts_la_CFLAGS = $(GST_CFLAGS) -libgstarts_la_CXXFLAGS = $(ARTS_CXXFLAGS) $(GST_CFLAGS) -libgstarts_la_LIBADD = $(ARTS_LIBS) -lartsflow -lartsflow_idl -libgstarts_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstarts_la_LIBTOOLFLAGS = --tag=disable-static - -noinst_HEADERS = gst_arts.h gst_artsio_impl.h - -dist-hook: - rm -f $(distdir)/gst_artsio.cc diff --git a/ext/arts/gst_arts.c b/ext/arts/gst_arts.c deleted file mode 100644 index 97df29151..000000000 --- a/ext/arts/gst_arts.c +++ /dev/null @@ -1,178 +0,0 @@ -/* GStreamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif -#include <string.h> -#include <math.h> - -#ifdef HAVE_OSS_INCLUDE_IN_SYS -#include <sys/soundcard.h> -#else - -#ifdef HAVE_OSS_INCLUDE_IN_ROOT -#include <soundcard.h> -#else - -#include <machine/soundcard.h> - -#endif /* HAVE_OSS_INCLUDE_IN_ROOT */ - -#endif /* HAVE_OSS_INCLUDE_IN_SYS */ - - -/*#define DEBUG_ENABLED */ -#include "gst_arts.h" -#include "gst_artsio_impl.h" - - -static GstStaticPadTemplate sink_temp = GST_STATIC_PAD_TEMPLATE ("sink", - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS ("audio/x-raw-int, " - "depth = (int) 16, " - "width = (int) 16, " - "signed = (boolean) true, " - "channels = (int) 2, " - "rate = (int) 44100, " "endianness = (int) byte_order") - ); - -static GstStaticPadTemplate src_temp = GST_STATIC_PAD_TEMPLATE ("src", - GST_PAD_SRC, - GST_PAD_ALWAYS, - GST_STATIC_CAPS ("audio/x-raw-int, " - "depth = (int) 16, " - "width = (int) 16, " - "signed = (boolean) true, " - "channels = (int) 2, " - "rate = (int) 44100, " "endianness = (int) byte_order") - ); - -enum -{ - ARG_0, - ARG_LAST -}; - -static void gst_arts_base_init (gpointer g_class); -static void gst_arts_class_init (GstARTSClass * klass); -static void gst_arts_init (GstARTS * arts); - -static void gst_arts_loop (GstElement * element); - - -static GstElementClass *parent_class = NULL; - -/*static guint gst_arts_signals[LAST_SIGNAL] = { 0 }; */ - -GType -gst_arts_get_type (void) -{ - static GType gst_arts_type = 0; - - if (!gst_arts_type) { - static const GTypeInfo gst_arts_info = { - sizeof (GstARTSClass), - gst_arts_base_init, - NULL, - (GClassInitFunc) gst_arts_class_init, - NULL, - NULL, - sizeof (GstARTS), - 0, - (GInstanceInitFunc) gst_arts_init, - }; - - gst_arts_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstArts", &gst_arts_info, 0); - } - return gst_arts_type; -} - -static void -gst_arts_base_init (gpointer g_class) -{ - GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&sink_temp)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&src_temp)); - gst_element_class_set_details_simple (element_class, "aRts plugin", - "Filter/Audio", "aRts wrapper filter", - "Erik Walthinsen <omega@temple-baptist.com, " - "Stefan Westerfeld <stefan@space.twc.de>"); -} - -static void -gst_arts_class_init (GstARTSClass * klass) -{ - GObjectClass *gobject_class; - GstElementClass *gstelement_class; - - parent_class = g_type_class_peek_parent (klass); - - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; -} - -static void -gst_arts_init (GstARTS * arts) -{ - arts->sinkpad = - gst_pad_new_from_template (gst_element_get_pad_template (GST_ELEMENT - (arts), "sink"), "sink"); - gst_element_add_pad (GST_ELEMENT (arts), arts->sinkpad); - - arts->srcpad = - gst_pad_new_from_template (gst_element_get_pad_template (GST_ELEMENT - (arts), "src"), "src"); - gst_element_add_pad (GST_ELEMENT (arts), arts->srcpad); - - gst_element_set_loop_function (GST_ELEMENT (arts), gst_arts_loop); - - arts->wrapper = gst_arts_wrapper_new (arts->sinkpad, arts->srcpad); -} - -static void -gst_arts_loop (GstElement * element) -{ - GstARTS *arts = (GstARTS *) element; - - g_return_if_fail (arts != NULL); - - gst_arts_wrapper_do (arts->wrapper); -} - -static gboolean -plugin_init (GstPlugin * plugin) -{ - if (!gst_element_register (plugin, "artsfilter", GST_RANK_NONE, - GST_TYPE_ARTS)) - return FALSE; - - return TRUE; -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - arts, - "arTs filter wrapper", - plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/ext/arts/gst_arts.h b/ext/arts/gst_arts.h deleted file mode 100644 index fad6d7d15..000000000 --- a/ext/arts/gst_arts.h +++ /dev/null @@ -1,65 +0,0 @@ -/* GStreamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> - * - * gstarts.h: Header for ARTS plugin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - - -#ifndef __GST_ARTS_H__ -#define __GST_ARTS_H__ - - -#include <gst/gst.h> - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#define GST_TYPE_ARTS \ - (gst_arts_get_type()) -#define GST_ARTS(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ARTS,GstARTS)) -#define GST_ARTS_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ARTS,GstARTSClass)) -#define GST_IS_ARTS(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ARTS)) -#define GST_IS_ARTS_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ARTS)) - -typedef struct _GstARTS GstARTS; -typedef struct _GstARTSClass GstARTSClass; - -struct _GstARTS { - GstElement element; - - GstPad *sinkpad, *srcpad; - void *wrapper; -}; - -struct _GstARTSClass { - GstElementClass parent_class; -}; - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __GST_ARTS_H__ */ diff --git a/ext/arts/gst_artsio.idl b/ext/arts/gst_artsio.idl deleted file mode 100644 index b656a0ac1..000000000 --- a/ext/arts/gst_artsio.idl +++ /dev/null @@ -1,21 +0,0 @@ -#include "artsflow.idl" - -module Gst { - -interface ArtsMonoSink : Arts::SynthModule { - default out audio stream output; -}; - -interface ArtsStereoSink : Arts::SynthModule { - default out audio stream outleft,outright; -}; - -interface ArtsMonoSrc : Arts::SynthModule { - default in audio stream input; -}; - -interface ArtsStereoSrc : Arts::SynthModule { - default in audio stream inleft,inright; -}; - -}; diff --git a/ext/arts/gst_artsio_impl.cc b/ext/arts/gst_artsio_impl.cc deleted file mode 100644 index 18d099ea3..000000000 --- a/ext/arts/gst_artsio_impl.cc +++ /dev/null @@ -1,187 +0,0 @@ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include <math.h> -#include "artsflow.h" -#include "stdsynthmodule.h" -#include "gst_artsio.h" -#include "convert.h" -#include "connect.h" -#include "flowsystem.h" - -#include <gst/gst.h> - -using namespace Arts; - -namespace Gst -{ - - class ArtsStereoSink_impl:virtual public ArtsStereoSink_skel, - virtual public StdSynthModule - { - - GstPad *sinkpad; - GstPad *srcpad; - unsigned long remainingsamples; - GstData *inbuf; - unsigned char *dataptr; - - public: - - ArtsStereoSink_impl () - { - remainingsamples = 0; - inbuf = NULL; - dataptr = NULL; - } - - void calculateBlock (unsigned long samples) - { - unsigned long fulfilled = 0; -//gint16 *s; -//fprintf(stderr,"StereoSink: getting %d samples\n",samples); - - while (fulfilled < samples) - { - if (remainingsamples == 0) { -//fprintf(stderr,"need to get a buffer\n"); - if (inbuf) { - gst_data_unref (inbuf); - inbuf = NULL; - } - // start by pulling a buffer from GStreamer - inbuf = gst_pad_pull (sinkpad); - - while (GST_IS_EVENT (inbuf)) { - switch (GST_EVENT_TYPE (inbuf)) { - case GST_EVENT_EOS: - gst_element_set_eos (GST_PAD_PARENT (sinkpad)); - default: - break; - } - gst_pad_event_default (srcpad, GST_EVENT (inbuf)); - inbuf = gst_pad_pull (sinkpad); - } - - dataptr = GST_BUFFER_DATA (GST_BUFFER (inbuf)); - remainingsamples = GST_BUFFER_SIZE (GST_BUFFER (inbuf)) / 4; -//fprintf(stderr,"got a buffer with %d samples\n",remainingsamples); - } - - unsigned long count = MIN (remainingsamples, samples - fulfilled); - -//fprintf(stderr,"have %d samples left, can fill %d\n",remainingsamples,count); - convert_stereo_i16le_2float (count, dataptr, outleft, outright); -//s = (gint16 *)dataptr; -//fprintf(stderr,"samples in are %d and %d, out are %f and %f\n",s[0],s[1],outleft[0],outright[0]); - remainingsamples -= count; - dataptr += 4 * count; - fulfilled += count; - } - } - - - void setPad (GstPad * pad) - { - sinkpad = pad; - } - void setSrcPad (GstPad * pad) - { - srcpad = pad; - } - }; - - - class ArtsStereoSrc_impl:virtual public ArtsStereoSrc_skel, - virtual public StdSynthModule - { - - GstPad *srcpad; - GstBuffer *outbuf; - unsigned char *dataptr; - - public: - - void calculateBlock (unsigned long samples) - { -//gint16 *s; -//fprintf(stderr,"StereoSrc: handed %d samples\n",samples); - outbuf = gst_buffer_new (); - GST_BUFFER_DATA (outbuf) = (guchar *) g_malloc (samples * 4); - GST_BUFFER_SIZE (outbuf) = samples * 4; - memset (GST_BUFFER_DATA (outbuf), 0, samples * 4); - convert_stereo_2float_i16le (samples, inleft, inright, - GST_BUFFER_DATA (outbuf)); -//s = (gint16 *)GST_BUFFER_DATA(outbuf); -//fprintf(stderr,"samples in are %f and %f, out are %d and %d\n",inleft[0],inright[0],s[0],s[1]); - gst_pad_push (srcpad, GST_DATA (outbuf)); - outbuf = NULL; - } - - - void setPad (GstPad * pad) - { - srcpad = pad; - } - }; - - class GstArtsWrapper - { - Dispatcher *dispatcher; - ArtsStereoSink sink; - ArtsStereoSrc source; - StereoVolumeControl effect; - - public: - GstArtsWrapper (GstPad * sinkpad, GstPad * sourcepad) - { - dispatcher = new Arts::Dispatcher (); - ArtsStereoSink_impl *sink_impl = new ArtsStereoSink_impl (); - ArtsStereoSrc_impl *source_impl = new ArtsStereoSrc_impl (); - sink_impl->setPad (sinkpad); - sink_impl->setSrcPad (sourcepad); - source_impl->setPad (sourcepad); - sink = ArtsStereoSink::_from_base (sink_impl); - source = ArtsStereoSrc::_from_base (source_impl); - sink.start (); - effect.start (); - source.start (); - effect.scaleFactor (0.5); - connect (sink, effect); - connect (effect, source); -// connect(sink,source); - } - void iterate () - { - source._node ()->requireFlow (); - } - }; - - -}; - - -extern "C" -{ - - void *gst_arts_wrapper_new (GstPad * sinkpad, GstPad * sourcepad) - { - return new Gst::GstArtsWrapper (sinkpad, sourcepad); - } - - void gst_arts_wrapper_free (void *wrapper) - { - Gst::GstArtsWrapper * w = (Gst::GstArtsWrapper *) wrapper; - delete w; - } - - void gst_arts_wrapper_do (void *wrapper) - { - Gst::GstArtsWrapper * w = (Gst::GstArtsWrapper *) wrapper; - w->iterate (); - } - -} - -// vim:sts=2:sw=2 diff --git a/ext/arts/gst_artsio_impl.h b/ext/arts/gst_artsio_impl.h deleted file mode 100644 index 8ffb29b6f..000000000 --- a/ext/arts/gst_artsio_impl.h +++ /dev/null @@ -1,14 +0,0 @@ -#include <gst/gst.h> - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -void *gst_arts_wrapper_new(GstPad *sinkpad, GstPad *sourcepad); -void gst_arts_wrapper_free(void *wrapper); -void gst_arts_wrapper_do(void *wrapper); - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - diff --git a/ext/artsd/Makefile.am b/ext/artsd/Makefile.am deleted file mode 100644 index e0b3f9444..000000000 --- a/ext/artsd/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ - -plugin_LTLIBRARIES = libgstartsdsink.la - -libgstartsdsink_la_SOURCES = gstartsdsink.c -libgstartsdsink_la_CFLAGS = $(GST_CFLAGS) $(ARTSC_CFLAGS) -libgstartsdsink_la_LIBADD = $(ARTSC_LIBS) -libgstartsdsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstartsdsink_la_LIBTOOLFLAGS = --tag=disable-static - -noinst_HEADERS = gstartsdsink.h diff --git a/ext/artsd/REQUIREMENTS b/ext/artsd/REQUIREMENTS deleted file mode 100644 index babc38651..000000000 --- a/ext/artsd/REQUIREMENTS +++ /dev/null @@ -1,4 +0,0 @@ - - -To compile: artsc.h (On debian: libarts-dev) -To use: libartsc (On debian: libarts) diff --git a/ext/artsd/gstartsdsink.c b/ext/artsd/gstartsdsink.c deleted file mode 100644 index 6b77c8e07..000000000 --- a/ext/artsd/gstartsdsink.c +++ /dev/null @@ -1,349 +0,0 @@ -/* GStreamer - * Copyright (C) <2001> Richard Boulton <richard-gst@tartarus.org> - * - * Based on example.c: - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif -#include "gstartsdsink.h" -#include <gst/audio/audio.h> - -/* Signals and args */ -enum -{ - /* FILL ME */ - LAST_SIGNAL -}; - -enum -{ - ARG_0, - ARG_MUTE, - ARG_NAME -}; - -static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink", - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS (GST_AUDIO_INT_PAD_TEMPLATE_CAPS) - ); - -static void gst_artsdsink_base_init (gpointer g_class); -static void gst_artsdsink_class_init (GstArtsdsinkClass * klass); -static void gst_artsdsink_init (GstArtsdsink * artsdsink); - -static gboolean gst_artsdsink_open_audio (GstArtsdsink * sink); -static void gst_artsdsink_close_audio (GstArtsdsink * sink); -static GstStateChangeReturn gst_artsdsink_change_state (GstElement * element, - GstStateChange transition); -static gboolean gst_artsdsink_sync_parms (GstArtsdsink * artsdsink); -static GstPadLinkReturn gst_artsdsink_link (GstPad * pad, const GstCaps * caps); -static void gst_artsdsink_chain (GstPad * pad, GstData * _data); - -static void gst_artsdsink_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec); -static void gst_artsdsink_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec); - -static GstElementClass *parent_class = NULL; - -/*static guint gst_artsdsink_signals[LAST_SIGNAL] = { 0 }; */ - -GType -gst_artsdsink_get_type (void) -{ - static GType artsdsink_type = 0; - - if (!artsdsink_type) { - static const GTypeInfo artsdsink_info = { - sizeof (GstArtsdsinkClass), - gst_artsdsink_base_init, - NULL, - (GClassInitFunc) gst_artsdsink_class_init, - NULL, - NULL, - sizeof (GstArtsdsink), - 0, - (GInstanceInitFunc) gst_artsdsink_init, - }; - - artsdsink_type = - g_type_register_static (GST_TYPE_ELEMENT, "GstArtsdsink", - &artsdsink_info, 0); - } - return artsdsink_type; -} - -static void -gst_artsdsink_base_init (gpointer g_class) -{ - GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); - - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&sink_factory)); - gst_element_class_set_details_simple (element_class, "aRtsd audio sink", - "Sink/Audio", - "Plays audio to an aRts server", - "Richard Boulton <richard-gst@tartarus.org>"); -} - -static void -gst_artsdsink_class_init (GstArtsdsinkClass * klass) -{ - GObjectClass *gobject_class; - GstElementClass *gstelement_class; - - gobject_class = (GObjectClass *) klass; - gstelement_class = (GstElementClass *) klass; - - parent_class = g_type_class_peek_parent (klass); - - /* FIXME: add long property descriptions */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MUTE, - g_param_spec_boolean ("mute", "mute", "mute", TRUE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - /* FIXME: rename to e.g. "client-name" */ - g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_NAME, - g_param_spec_string ("name", "name", "name", NULL, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); - - gobject_class->set_property = gst_artsdsink_set_property; - gobject_class->get_property = gst_artsdsink_get_property; - - gstelement_class->change_state = gst_artsdsink_change_state; -} - -static void -gst_artsdsink_init (GstArtsdsink * artsdsink) -{ - artsdsink->sinkpad = - gst_pad_new_from_template (gst_element_get_pad_template (GST_ELEMENT - (artsdsink), "sink"), "sink"); - gst_element_add_pad (GST_ELEMENT (artsdsink), artsdsink->sinkpad); - gst_pad_set_chain_function (artsdsink->sinkpad, gst_artsdsink_chain); - gst_pad_set_link_function (artsdsink->sinkpad, gst_artsdsink_link); - - artsdsink->connected = FALSE; - artsdsink->mute = FALSE; - artsdsink->connect_name = NULL; -} - -static gboolean -gst_artsdsink_sync_parms (GstArtsdsink * artsdsink) -{ - g_return_val_if_fail (artsdsink != NULL, FALSE); - g_return_val_if_fail (GST_IS_ARTSDSINK (artsdsink), FALSE); - - if (!artsdsink->connected) - return TRUE; - - /* Need to set stream to use new parameters: only way to do this is to reopen. */ - gst_artsdsink_close_audio (artsdsink); - return gst_artsdsink_open_audio (artsdsink); -} - -static GstPadLinkReturn -gst_artsdsink_link (GstPad * pad, const GstCaps * caps) -{ - GstArtsdsink *artsdsink = GST_ARTSDSINK (gst_pad_get_parent (pad)); - GstStructure *structure; - - structure = gst_caps_get_structure (caps, 0); - gst_structure_get_int (structure, "rate", &artsdsink->frequency); - gst_structure_get_int (structure, "depth", &artsdsink->depth); - gst_structure_get_int (structure, "signed", &artsdsink->signd); - gst_structure_get_int (structure, "channels", &artsdsink->channels); - - if (gst_artsdsink_sync_parms (artsdsink)) - return GST_PAD_LINK_OK; - - return GST_PAD_LINK_REFUSED; -} - -static void -gst_artsdsink_chain (GstPad * pad, GstData * _data) -{ - GstBuffer *buf = GST_BUFFER (_data); - GstArtsdsink *artsdsink; - - g_return_if_fail (pad != NULL); - g_return_if_fail (GST_IS_PAD (pad)); - g_return_if_fail (buf != NULL); - - artsdsink = GST_ARTSDSINK (gst_pad_get_parent (pad)); - - if (GST_BUFFER_DATA (buf) != NULL) { - gst_trace_add_entry (NULL, 0, GPOINTER_TO_INT (buf), - "artsdsink: writing to server"); - if (!artsdsink->mute && artsdsink->connected) { - int bytes; - void *bufptr = GST_BUFFER_DATA (buf); - int bufsize = GST_BUFFER_SIZE (buf); - - GST_DEBUG ("artsdsink: stream=%p data=%p size=%d", - artsdsink->stream, GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); - - do { - bytes = arts_write (artsdsink->stream, bufptr, bufsize); - if (bytes < 0) { - fprintf (stderr, "arts_write error: %s\n", arts_error_text (bytes)); - gst_buffer_unref (buf); - return; - } - bufptr += bytes; - bufsize -= bytes; - } while (bufsize > 0); - } - } - gst_buffer_unref (buf); -} - -static void -gst_artsdsink_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec) -{ - GstArtsdsink *artsdsink; - - g_return_if_fail (GST_IS_ARTSDSINK (object)); - artsdsink = GST_ARTSDSINK (object); - - switch (prop_id) { - case ARG_MUTE: - artsdsink->mute = g_value_get_boolean (value); - break; - case ARG_NAME: - if (artsdsink->connect_name != NULL) - g_free (artsdsink->connect_name); - if (g_value_get_string (value) == NULL) - artsdsink->connect_name = NULL; - else - artsdsink->connect_name = g_strdup (g_value_get_string (value)); - break; - default: - break; - } -} - -static void -gst_artsdsink_get_property (GObject * object, guint prop_id, GValue * value, - GParamSpec * pspec) -{ - GstArtsdsink *artsdsink; - - g_return_if_fail (GST_IS_ARTSDSINK (object)); - artsdsink = GST_ARTSDSINK (object); - - switch (prop_id) { - case ARG_MUTE: - g_value_set_boolean (value, artsdsink->mute); - break; - case ARG_NAME: - g_value_set_string (value, artsdsink->connect_name); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static gboolean -plugin_init (GstPlugin * plugin) -{ - if (!gst_element_register (plugin, "artsdsink", GST_RANK_NONE, - GST_TYPE_ARTSDSINK)) - return FALSE; - - return TRUE; -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - artsdsink, - "Plays audio to an aRts server", - plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN); - -static gboolean -gst_artsdsink_open_audio (GstArtsdsink * sink) -{ - const char connname[] = "gstreamer"; - int errcode; - - /* Name used by aRtsd for this connection. */ - if (sink->connect_name != NULL) - connname = sink->connect_name; - - /* FIXME: this should only ever happen once per process. */ - /* Really, artsc needs to be made thread safe to fix this (and other related */ - /* problems). */ - errcode = arts_init (); - if (errcode < 0) { - fprintf (stderr, "arts_init error: %s\n", arts_error_text (errcode)); - return FALSE; - } - - GST_DEBUG ("artsdsink: attempting to open connection to aRtsd server"); - sink->stream = arts_play_stream (sink->frequency, sink->depth, - sink->channels, connname); - /* FIXME: check connection */ - /* GST_DEBUG ("artsdsink: can't open connection to aRtsd server"); */ - - GST_OBJECT_FLAG_SET (sink, GST_ARTSDSINK_OPEN); - sink->connected = TRUE; - - return TRUE; -} - -static void -gst_artsdsink_close_audio (GstArtsdsink * sink) -{ - if (!sink->connected) - return; - - arts_close_stream (sink->stream); - arts_free (); - GST_OBJECT_FLAG_UNSET (sink, GST_ARTSDSINK_OPEN); - sink->connected = FALSE; - - g_print ("artsdsink: closed connection\n"); -} - -static GstStateChangeReturn -gst_artsdsink_change_state (GstElement * element, GstStateChange transition) -{ - g_return_val_if_fail (GST_IS_ARTSDSINK (element), FALSE); - - /* if going down into NULL state, close the stream if it's open */ - if (GST_STATE_PENDING (element) == GST_STATE_NULL) { - if (GST_OBJECT_FLAG_IS_SET (element, GST_ARTSDSINK_OPEN)) - gst_artsdsink_close_audio (GST_ARTSDSINK (element)); - /* otherwise (READY or higher) we need to open the stream */ - } else { - if (!GST_OBJECT_FLAG_IS_SET (element, GST_ARTSDSINK_OPEN)) { - if (!gst_artsdsink_open_audio (GST_ARTSDSINK (element))) - return GST_STATE_CHANGE_FAILURE; - } - } - - if (GST_ELEMENT_CLASS (parent_class)->change_state) - return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - return GST_STATE_CHANGE_SUCCESS; -} diff --git a/ext/artsd/gstartsdsink.h b/ext/artsd/gstartsdsink.h deleted file mode 100644 index 3f3309828..000000000 --- a/ext/artsd/gstartsdsink.h +++ /dev/null @@ -1,78 +0,0 @@ -/* GStreamer - * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - - -#ifndef __GST_ARTSDSINK_H__ -#define __GST_ARTSDSINK_H__ - -#include <gst/gst.h> -#include <artsc.h> - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - - -#define GST_TYPE_ARTSDSINK \ - (gst_artsdsink_get_type()) -#define GST_ARTSDSINK(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ARTSDSINK,GstArtsdsink)) -#define GST_ARTSDSINK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ARTSDSINK,GstArtsdsinkClass)) -#define GST_IS_ARTSDSINK(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ARTSDSINK)) -#define GST_IS_ARTSDSINK_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ARTSDSINK)) - -typedef enum { - GST_ARTSDSINK_OPEN = (GST_ELEMENT_FLAG_LAST << 0) - GST_ARTSDSINK_FLAG_LAST = (GST_ELEMENT_FLAG_LAST << 2), -} GstArtsdSinkFlags; - -typedef struct _GstArtsdsink GstArtsdsink; -typedef struct _GstArtsdsinkClass GstArtsdsinkClass; - -struct _GstArtsdsink { - GstElement element; - - GstPad *sinkpad; - - gboolean connected; - arts_stream_t stream; - gboolean mute; - gboolean signd; - gint depth; - gint channels; - gint frequency; - gchar* connect_name; -}; - -struct _GstArtsdsinkClass { - GstElementClass parent_class; -}; - -GType gst_artsdsink_get_type(void); - - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - - -#endif /* __GST_ARTSDSINK_H__ */ diff --git a/m4/Makefile.am b/m4/Makefile.am index 8357591cf..d4e78930b 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,7 +1,6 @@ EXTRA_DIST = \ a52.m4 \ aalib.m4 \ - as-arts.m4 \ as-ffmpeg.m4 \ as-liblame.m4 \ as-slurp-ffmpeg.m4 \ @@ -11,7 +10,6 @@ EXTRA_DIST = \ gconf-2.m4 \ gettext.m4 \ glibc21.m4 \ - gst-artsc.m4 \ gst-fionread.m4 \ gst-sdl.m4 \ gst-sid.m4 \ diff --git a/m4/as-arts.m4 b/m4/as-arts.m4 deleted file mode 100644 index a66a8c2d9..000000000 --- a/m4/as-arts.m4 +++ /dev/null @@ -1,209 +0,0 @@ -dnl as-arts.m4 0.1.0 - -dnl $Id: as-arts.m4,v 1.5 2004/05/21 11:20:49 thomasvs Exp $ -dnl if you copy this file to your cvs, -dnl add this file using cvs -ko add to retain this header - -dnl This is an example arts .m4 adapted and scrubbed by thomasvs - -# Configure paths for ARTS -# Philip Stadermann 2001-06-21 -# stolen from esd.m4 - -dnl AM_PATH_ARTS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -dnl Test for ARTS, and define ARTS_CXXFLAGS and ARTS_LIBS -dnl -AC_DEFUN([AM_PATH_ARTS], -[dnl -dnl Get the cflags and libraries from the artsc-config script -dnl -AC_ARG_WITH(arts-prefix, - AC_HELP_STRING([--with-arts-prefix=PFX], - [prefix where ARTS is installed (optional)]), - arts_prefix="$withval", arts_prefix="") - -AC_ARG_WITH(arts-exec-prefix, - AC_HELP_STRING([--with-arts-exec-prefix=PFX], - [exec prefix where ARTS is installed (optional)]), - arts_exec_prefix="$withval", arts_exec_prefix="") - -AC_ARG_ENABLE(artstest, - AC_HELP_STRING([--disable-artstest], - [do not try to compile and run a test ARTS program]), - , enable_artstest=yes) - - if test x$arts_exec_prefix != x ; then - arts_args="$arts_args --exec-prefix=$arts_exec_prefix" - if test x${ARTS_CONFIG+set} != xset ; then - ARTS_CONFIG=$arts_exec_prefix/bin/artsc-config - fi - fi - if test x$arts_prefix != x ; then - arts_args="$arts_args --prefix=$arts_prefix" - if test x${ARTS_CONFIG+set} != xset ; then - ARTS_CONFIG=$arts_prefix/bin/artsc-config - fi - fi - - AC_PATH_PROG(ARTS_CONFIG, artsc-config, no) - min_arts_version=ifelse([$1], ,0.9.5,$1) - AC_MSG_CHECKING(for ARTS artsc - version >= $min_arts_version) - no_arts="" - if test "$ARTS_CONFIG" = "no" ; then - no_arts=yes - else - # FIXME: thomas added this sed to get arts path instead of artsc - # replace -I.../artsc with -I.../arts - ARTS_CXXFLAGS=`$ARTS_CONFIG $artsconf_args --cflags | artsc-config --cflags | sed 's/\(-I.*\)artsc/\1arts/'` - ARTS_LIBS=`$ARTS_CONFIG $artsconf_args --libs | sed 's/artsc$/arts/'` - - arts_major_version=`$ARTS_CONFIG $arts_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - arts_minor_version=`$ARTS_CONFIG $arts_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - arts_micro_version=`$ARTS_CONFIG $arts_config_args --version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_artstest" = "xyes" ; then - dnl ac_save_CXXFLAGS="$CXXFLAGS" - dnl ac_save_LIBS="$LIBS" - dnl CFLAGS="$CFLAGS $ARTS_CXXFLAGS" - dnl LIBS="$LIBS $ARTS_LIBS" -dnl -dnl Now check if the installed ARTS is sufficiently new. (Also sanity -dnl checks the results of artsc-config to some extent) -dnl - -dnl a*s: to successfully compile the C++ test app, we need to -dnl first make sure we're going to compile it as C++ (with AC_LANG_PUSH), -dnl then add the CFLAGS and CLIBS of arts which we just discovered to the -dnl C++ compilation and linking flags. -dnl We also need to clean up after the test; this means using AC_LANG_POP -dnl and restoring the CPPFLAGS and LDFLAGS from the saved values we take -dnl here. - -dnl ask nicely for C++ compilation - AC_LANG_PUSH(C++) - -dnl save compilation and link flags and make our own - ac_save_CPPFLAGS="$CPPFLAGS" - ac_save_LDFLAGS="$LDFLAGS" - AC_SUBST(CPPFLAGS,"$CPPFLAGS $ARTS_CXXFLAGS") - AC_SUBST(LDFLAGS,"$LDFLAGS $ARTS_CLIBS") - - rm -f conf.artstest - AC_TRY_RUN([ -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include <artsflow.h> - -char* -my_strdup (char *str) -{ - char *new_str; - - if (str) - { - // thomas: the original test did not have the typecast - new_str = (char *) malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.artstest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_arts_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_arts_version"); - exit(1); - } - - if (($arts_major_version > major) || - (($arts_major_version == major) && ($arts_minor_version > minor)) || - (($arts_major_version == major) && ($arts_minor_version == minor) && ($arts_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** 'artsc-config --version' returned %d.%d.%d, but the minimum version\n", $arts_major_version, $arts_minor_version, $arts_micro_version); - printf("*** of ARTS required is %d.%d.%d. If artsc-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If artsc-config was wrong, set the environment variable ARTS_CONFIG\n"); - printf("*** to point to the correct copy of artsc-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - return 1; - } -} - -],, no_arts=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - dnl CFLAGS="$ac_save_CFLAGS" - dnl LIBS="$ac_save_LIBS" - dnl a*s this is were we clean up after the test - AC_LANG_POP(C++) - CXXFLAGS="$ac_save_CXXFLAGS" - LDFLAGS="$ac_save_LDFLAGS" - dnl a*s we are sure that these are right, so we make them active - AC_SUBST(CXXFLAGS,"$CXXFLAGS") - AC_SUBST(LDFLAGS,"$LDFLAGS") - fi - fi - if test "x$no_arts" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$ARTS_CONFIG" = "no" ; then - echo "*** The artsc-config script installed by ARTS could not be found" - echo "*** If ARTS was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the ARTS_CONFIG environment variable to the" - echo "*** full path to artsc-config." - else - if test -f conf.artstest ; then - : - else - echo "*** Could not run ARTS test program, checking why..." - CFLAGS="$CFLAGS $ARTS_CXXFLAGS" - LIBS="$LIBS $ARTS_LIBS" - AC_TRY_LINK([ -#include <stdio.h> -#include <artsflow.h> -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding ARTS or finding the wrong" - echo "*** version of ARTS. If it is not finding ARTS, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means ARTS was incorrectly installed" - echo "*** or that you have moved ARTS since it was installed. In the latter case, you" - echo "*** may want to edit the artsc-config script: $ARTS_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - ARTS_CXXFLAGS="" - ARTS_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(ARTS_CXXFLAGS) - AC_SUBST(ARTS_LIBS) - rm -f conf.artstest -]) - -dnl release C++ question - diff --git a/m4/gst-artsc.m4 b/m4/gst-artsc.m4 deleted file mode 100644 index 465996096..000000000 --- a/m4/gst-artsc.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl Perform a check for existence of ARTSC -dnl Richard Boulton <richard-alsa@tartarus.org> -dnl Last modification: 26/06/2001 -dnl GST_CHECK_ARTSC() -dnl -dnl This check was written for GStreamer: it should be renamed and checked -dnl for portability if you decide to use it elsewhere. -dnl -AC_DEFUN([GST_CHECK_ARTSC], -[ - AC_PATH_PROG(ARTSC_CONFIG, artsc-config, no) - if test "x$ARTSC_CONFIG" = "xno"; then - AC_MSG_WARN([Couldn't find artsc-config]) - HAVE_ARTSC=no - ARTSC_LIBS= - ARTSC_CFLAGS= - else - ARTSC_LIBS=`artsc-config --libs` - ARTSC_CFLAGS=`artsc-config --cflags` - dnl AC_CHECK_HEADER uses CPPFLAGS, but not CFLAGS. - dnl FIXME: Ensure only suitable flags result from artsc-config --cflags - CPPFLAGS="$CPPFLAGS $ARTSC_CFLAGS" - AC_CHECK_HEADER(artsc.h, HAVE_ARTSC=yes, HAVE_ARTSC=no) - fi - AC_SUBST(ARTSC_LIBS) - AC_SUBST(ARTSC_CFLAGS) -]) - |