From df078d98408e9cbdecc57c6739af08068996afe1 Mon Sep 17 00:00:00 2001 From: Christian Schaller Date: Wed, 21 Jan 2004 06:57:30 +0000 Subject: adding NAS plugin Original commit message from CVS: adding NAS plugin --- ChangeLog | 6 + Makefile.am | 4 +- TODO | 2 + configure.ac | 16 ++ ext/Makefile.am | 9 + ext/nas/Makefile.am | 9 + ext/nas/README | 8 + ext/nas/nassink.c | 643 ++++++++++++++++++++++++++++++++++++++++++++++++++++ ext/nas/nassink.h | 88 +++++++ gst-plugins.spec.in | 26 ++- po/nl.po | 26 +-- 11 files changed, 821 insertions(+), 16 deletions(-) create mode 100644 ext/nas/Makefile.am create mode 100644 ext/nas/README create mode 100644 ext/nas/nassink.c create mode 100644 ext/nas/nassink.h diff --git a/ChangeLog b/ChangeLog index 6e5f93a5..daffeed0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-01-21 Christian Schaller + + * ext/nas/ + Add libnas (network audio system) plugin, patch from Arwed von Merkatz + based on earlier patch from Laurent Vivier + 2004-01-20 Jeremy Simon * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_to_extradata): diff --git a/Makefile.am b/Makefile.am index fc5fd046..db020efa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,8 +25,8 @@ SUBDIRS=gst-libs \ po \ pkgconfig -DIST_SUBDIRS=gst-libs \ - gst sys ext \ +DIST_SUBDIRS=ext gst-libs \ + gst sys \ examples \ tools \ gconf \ diff --git a/TODO b/TODO index c7769749..21b862be 100644 --- a/TODO +++ b/TODO @@ -38,3 +38,5 @@ * check if we can drop some of the AC_SUBST's for libs and cflags * the mikmod author needs to drop the lib from the name ;) + +* Port wavparse plugin to use our rifflib - Ask Ronald Bultje for details diff --git a/configure.ac b/configure.ac index a8af0ae6..0fa8bc55 100644 --- a/configure.ac +++ b/configure.ac @@ -1219,6 +1219,21 @@ GST_CHECK_FEATURE(MUSICBRAINZ, [musicbrainz], musicbrainz, [ AC_SUBST(MUSICBRAINZ_LIBS) ]) +dnl *** nas *** +translit(dnm, m, l) AM_CONDITIONAL(USE_NAS, true) +GST_CHECK_FEATURE(NAS, [nas plug-in], nassink, [ + HAVE_NAS="no" + if test "x$HAVE_X" = "xyes"; then + save_cppflags=$CFLAGS + CPPFLAGS="$CPPFLAGS $X_CFLAGS" + GST_CHECK_LIBHEADER(NAS, audio, AuOpenServer, $X_LIBS, audio/audiolib.h, + NAS_LIBS="$X_LIBS -laudio" NAS_CFLAGS="$X_CFLAGS") + CPPFLAGS="$save_cppflags" + fi + AC_SUBST(NAS_CFLAGS) + AC_SUBST(NAS_LIBS) +]) + dnl *** pango *** translit(dnm, m, l) AM_CONDITIONAL(USE_PANGO, true) GST_CHECK_FEATURE(PANGO, [pango], pango, [ @@ -1659,6 +1674,7 @@ ext/mpeg2dec/Makefile ext/mpeg2enc/Makefile ext/mplex/Makefile ext/musicbrainz/Makefile +ext/nas/Makefile ext/ogg/Makefile ext/pango/Makefile ext/raw1394/Makefile diff --git a/ext/Makefile.am b/ext/Makefile.am index 36a605ff..b5eb1491 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -82,6 +82,12 @@ else FAAD_DIR= endif +if USE_NAS +NAS_DIR=nas +else +NAS_DIR= +endif + ## if USE_FESTIVAL ## FESTIVAL_DIR=festival ## else @@ -322,6 +328,7 @@ SUBDIRS=\ $(DVDREAD_DIR) \ $(DVDNAV_DIR) \ $(ESD_DIR) \ + $(NAS_DIR) \ $(FAAC_DIR) \ $(FAAD_DIR) \ $(FFMPEG_DIR) \ @@ -376,6 +383,7 @@ DIST_SUBDIRS=\ dvdread \ dvdnav \ esd \ + nas \ mas \ faac \ faad \ @@ -401,6 +409,7 @@ DIST_SUBDIRS=\ mpeg2enc \ mplex \ musicbrainz \ + nas \ ogg \ pango \ raw1394 \ diff --git a/ext/nas/Makefile.am b/ext/nas/Makefile.am new file mode 100644 index 00000000..d9fe3cb7 --- /dev/null +++ b/ext/nas/Makefile.am @@ -0,0 +1,9 @@ +plugin_LTLIBRARIES = libgstnassink.la + +libgstnassink_la_SOURCES = nassink.c +libgstnassink_la_CFLAGS = $(GST_CFLAGS) $(NAS_CFLAGS) +libgstnassink_la_LIBADD = $(NAS_LIBS) +libgstnassink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) + +noinst_HEADERS = nassink.h +EXTRA_DIST = README diff --git a/ext/nas/README b/ext/nas/README new file mode 100644 index 00000000..34b563c6 --- /dev/null +++ b/ext/nas/README @@ -0,0 +1,8 @@ +The nassink plugin +================== + +The nassink plugin is for outputting an audio stream to a Network Audio Server (NCD X/Terminal) + +nassink has arguments that it accepts: + - 'mute' (boolean value) + - 'host' (name of X/Terminal, default is $AUDIOSERVER or $DISPLAY) diff --git a/ext/nas/nassink.c b/ext/nas/nassink.c new file mode 100644 index 00000000..45862750 --- /dev/null +++ b/ext/nas/nassink.c @@ -0,0 +1,643 @@ +/* GStreamer + * Copyright (C) <2003> Laurent Vivier + * Copyright (C) <2004> Arwed v. Merkatz + * + * Based on esdsink.c: + * Copyright (C) <2001> Richard Boulton + * + * 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 +#include +#include