adding NAS plugin

Original commit message from CVS:
adding NAS plugin

diff --git a/ChangeLog b/ChangeLog
index 6e5f93a..daffeed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-21  Christian Schaller <uraeus@gnome.org>
+
+       * 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  <jesimon@libertysurf.fr>
 
        * ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_caps_to_extradata):

diff --git a/Makefile.am b/Makefile.am
index fc5fd04..db020ef 100644 (file)
--- 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 c776974..21b862b 100644 (file)
--- 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 a8af0ae..0fa8bc5 100644 (file)
--- 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 36a605f..b5eb149 100644 (file)
--- 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/gst-plugins.spec.in b/gst-plugins.spec.in
index 63aa74f..0d8985f 100644 (file)
--- a/gst-plugins.spec.in
+++ b/gst-plugins.spec.in
@@ -385,7 +385,6 @@ GStreamer support libraries header files.
 @USE_AALIB_TRUE@Summary:        GStreamer plug-in for libcaca Ascii-art output.
 @USE_AALIB_TRUE@Group:          Libraries/Multimedia
 @USE_AALIB_TRUE@Requires:       gstreamer-plugins = %{version}
-@USE_AALIB_TRUE@Requires:       libcaca >= 0.7
 @USE_AALIB_TRUE@BuildRequires:  libcaca-devel >= 0.7
 @USE_AALIB_TRUE@
 @USE_AALIB_TRUE@%description -n gstreamer-libcaca
@@ -637,6 +636,28 @@ Plug-ins for playback of AVI format media files.
 @USE_JACK_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
 @USE_JACK_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
 
+#### NETWORK AUDIO SYSTEM  ###
+@USE_NAS_TRUE@%package -n gstreamer-nas
+@USE_NAS_TRUE@Summary:  GStreamer plug-in for the Network Audio System.
+@USE_NAS_TRUE@Group:    Libraries/Multimedia
+@USE_NAS_TRUE@Requires: gstreamer-plugins = %{version}
+@USE_NAS_TRUE@Requires: libnas2 => 1.6
+@USE_NAS_TRUE@
+@USE_NAS_TRUE@%description -n gstreamer-nas
+@USE_NAS_TRUE@Plug-in for the Network Audio System sound server.
+@USE_NAS_TRUE@
+@USE_NAS_TRUE@%files -n gstreamer-nas
+@USE_NAS_TRUE@%defattr(-, root, root)
+@USE_NAS_TRUE@%{_libdir}/gstreamer-%{majorminor}/libgstnassink.so
+@USE_NAS_TRUE@
+@USE_NAS_TRUE@%post -n gstreamer-nas
+@USE_NAS_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
+@USE_NAS_TRUE@### %{_bindir}/gst-compprep > /dev/null 2> /dev/null
+@USE_NAS_TRUE@
+@USE_NAS_TRUE@%postun -n gstreamer-nas
+@USE_NAS_TRUE@%{_bindir}/gst-register-%{majorminor} > /dev/null 2> /dev/null
+
+
 ### LADSPA ###
 @USE_LADSPA_TRUE@%package -n gstreamer-ladspa
 @USE_LADSPA_TRUE@Summary:       GStreamer wrapper for LADSPA plug-ins.
@@ -887,6 +908,9 @@ Plug-in for playing ASF movies under GStreamer.
 
 
 %changelog
+* Wed Jan 21 2004 Christian Schaller <Uraeus@gnome.org>
+- added NAS plugin
+
 * Fri Jan 16 2004 Christian Schaller <uraeus@gnome.org>
 - added libcaca plugin
 - added libgstcolorspace - fixed name of libgsthermescolorspace

diff --git a/po/nl.po b/po/nl.po
index 60dd6a8..68beb7f 100644 (file)
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-01-19 16:09+0100\n"
+"POT-Creation-Date: 2004-01-20 23:32+0100\n"
 "PO-Revision-Date: 2004-01-13 12:03+0100\n"
 "Last-Translator: Thomas Vander Stichele <thomas@apestaart.org>\n"
 "Language-Team: Dutch <nl@li.org>\n"
@@ -15,17 +15,17 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/audiofile/gstafsink.c:345 ext/sndfile/gstsf.c:601
+#: ext/audiofile/gstafsink.c:350 ext/sndfile/gstsf.c:601
 #, c-format
 msgid "Could not open file \"%s\" for writing"
 msgstr "Kon bestand \"%s\" niet openen voor schrijven"
 
-#: ext/audiofile/gstafsink.c:368 ext/audiofile/gstafsrc.c:372
+#: ext/audiofile/gstafsink.c:373 ext/audiofile/gstafsrc.c:378
 #, c-format
 msgid "Error closing file \"%s\""
 msgstr "Kon bestand \"%s\" niet sluiten"
 
-#: ext/audiofile/gstafsrc.c:314
+#: ext/audiofile/gstafsrc.c:320
 #, c-format
 msgid "Could not open file \"%s\" for reading"
 msgstr "Kon bestand \"%s\" niet openen voor lezen"
@@ -58,47 +58,47 @@ msgstr "Kon niet schrijven naar bestand \"%s\""
 msgid "No or invalid input audio, AVI stream will be corrupt"
 msgstr "Geen of foutief invoergeluid, AVI zal corrupt zijn"
 
-#: sys/dxr3/dxr3audiosink.c:313
+#: sys/dxr3/dxr3audiosink.c:314
 #, c-format
 msgid "Could not open audio device \"%s\" for writing"
 msgstr "Kon audio-apparaat \"%s\" niet openen voor schrijven"
 
-#: sys/dxr3/dxr3audiosink.c:325 sys/dxr3/dxr3videosink.c:292
+#: sys/dxr3/dxr3audiosink.c:326 sys/dxr3/dxr3videosink.c:293
 #, c-format
 msgid "Could not open control device \"%s\" for writing"
 msgstr "Kon controle-apparaat \"%s\" niet openen voor schrijven"
 
-#: sys/dxr3/dxr3audiosink.c:359
+#: sys/dxr3/dxr3audiosink.c:360
 #, c-format
 msgid "Could not configure audio device \"%s\""
 msgstr "Kon audio-apparaat \"%s\" niet configureren"
 
-#: sys/dxr3/dxr3audiosink.c:373 sys/dxr3/dxr3audiosink.c:410
+#: sys/dxr3/dxr3audiosink.c:374 sys/dxr3/dxr3audiosink.c:411
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz"
 msgstr "Kon audio-apparaat \"%s\" niet instellen op %d Hz"
 
-#: sys/dxr3/dxr3audiosink.c:438
+#: sys/dxr3/dxr3audiosink.c:439
 #, c-format
 msgid "Could not close audio device \"%s\""
 msgstr "Kon audio-apparaat \"%s\" niet sluiten"
 
-#: sys/dxr3/dxr3audiosink.c:445 sys/dxr3/dxr3videosink.c:319
+#: sys/dxr3/dxr3audiosink.c:446 sys/dxr3/dxr3videosink.c:320
 #, c-format
 msgid "Could not close control device \"%s\""
 msgstr "Kon controle-apparaat \"%s\" niet sluiten"
 
-#: sys/dxr3/dxr3videosink.c:280
+#: sys/dxr3/dxr3videosink.c:281
 #, c-format
 msgid "Could not open video device \"%s\" for writing"
 msgstr "Kon video-apparaat \"%s\" niet openen voor schrijven"
 
-#: sys/dxr3/dxr3videosink.c:311
+#: sys/dxr3/dxr3videosink.c:312
 #, c-format
 msgid "Could not close video device \"%s\""
 msgstr "Kon video-apparaat \"%s\" niet sluiten"
 
-#: sys/dxr3/dxr3videosink.c:467 sys/v4l2/v4l2src_calls.c:121
+#: sys/dxr3/dxr3videosink.c:468 sys/v4l2/v4l2src_calls.c:121
 #, c-format
 msgid "Could not write to device \"%s\""
 msgstr "Kon niet schrijven naar apparaat \"%s\""