Move multifile plugin from -bad.

Original commit message from CVS:
* configure.ac:
* docs/plugins/Makefile.am:
* docs/plugins/gst-plugins-good-plugins-docs.sgml:
* docs/plugins/gst-plugins-good-plugins-sections.txt:
* docs/plugins/gst-plugins-good-plugins.args:
* docs/plugins/gst-plugins-good-plugins.hierarchy:
* docs/plugins/inspect/plugin-multifile.xml:
* tests/check/Makefile.am:
* tests/check/elements/.cvsignore:
Move multifile plugin from -bad.
Fixes: #490283

diff --git a/ChangeLog b/ChangeLog
index d618cf5..05d98e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,21 @@
        * docs/plugins/gst-plugins-good-plugins-sections.txt:
        * docs/plugins/gst-plugins-good-plugins.args:
        * docs/plugins/gst-plugins-good-plugins.hierarchy:
+       * docs/plugins/inspect/plugin-multifile.xml:
+       * tests/check/Makefile.am:
+       * tests/check/elements/.cvsignore:
+
+       Move multifile plugin from -bad.
+       Fixes: #490283
+
+2008-02-08  Jan Schmidt  <jan.schmidt@sun.com>
+
+       * configure.ac:
+       * docs/plugins/Makefile.am:
+       * docs/plugins/gst-plugins-good-plugins-docs.sgml:
+       * docs/plugins/gst-plugins-good-plugins-sections.txt:
+       * docs/plugins/gst-plugins-good-plugins.args:
+       * docs/plugins/gst-plugins-good-plugins.hierarchy:
        * docs/plugins/inspect/plugin-spectrum.xml:
        * gst/spectrum/Makefile.am:
        * tests/check/Makefile.am:

diff --git a/configure.ac b/configure.ac
index 2171d26..7075e03 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,7 @@ GST_PLUGINS_ALL="\
                level \
                matroska \
                monoscope \
+               multifile \
                multipart \
                 qtdemux \
                rtp     \
@@ -1022,6 +1023,7 @@ gst/law/Makefile
 gst/level/Makefile
 gst/matroska/Makefile
 gst/monoscope/Makefile
+gst/multifile/Makefile
 gst/multipart/Makefile
 gst/qtdemux/Makefile
 gst/rtp/Makefile

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index 81cd8eb..e5c0a89 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -119,6 +119,8 @@ EXTRA_HFILES = \
        $(top_srcdir)/gst/id3demux/gstid3demux.h \
        $(top_srcdir)/gst/level/gstlevel.h \
        $(top_srcdir)/gst/monoscope/gstmonoscope.h \
+       $(top_srcdir)/gst/multifile/gstmultifilesink.h \
+       $(top_srcdir)/gst/multifile/gstmultifilesrc.h \
        $(top_srcdir)/gst/multipart/multipartdemux.h \
        $(top_srcdir)/gst/multipart/multipartmux.h \
        $(top_srcdir)/gst/qtdemux/qtdemux.h \

diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml
index 11aefca..ef6e43d 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins-docs.sgml
+++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml
@@ -52,6 +52,8 @@
     <xi:include href="xml/element-jpegenc.xml" />
     <xi:include href="xml/element-level.xml" />
     <xi:include href="xml/element-monoscope.xml" />
+    <xi:include href="xml/element-multifilesink.xml" />
+    <xi:include href="xml/element-multifilesrc.xml" />
     <xi:include href="xml/element-multipartdemux.xml" />
     <xi:include href="xml/element-multipartmux.xml" />
     <xi:include href="xml/element-multiudpsink.xml" />
@@ -124,6 +126,7 @@
     <xi:include href="xml/plugin-matroska.xml" />
     <xi:include href="xml/plugin-monoscope.xml" />
     <xi:include href="xml/plugin-mulaw.xml" />
+    <xi:include href="xml/plugin-multifile.xml" />
     <xi:include href="xml/plugin-multipart.xml" />
     <xi:include href="xml/plugin-navigationtest.xml" />
     <xi:include href="xml/plugin-ossaudio.xml" />

diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt
index b6d3200..2fff3ae 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins-sections.txt
+++ b/docs/plugins/gst-plugins-good-plugins-sections.txt
@@ -623,6 +623,34 @@ GST_IS_MONOSCOPE_CLASS
 </SECTION>
 
 <SECTION>
+<FILE>element-multifilesrc</FILE>
+<TITLE>multifilesrc</TITLE>
+GstMultiFileSrc
+<SUBSECTION Standard>
+GstMultiFileSrcClass
+GST_MULTI_FILE_SRC
+GST_MULTI_FILE_SRC_CLASS
+GST_IS_MULTI_FILE_SRC
+GST_IS_MULTI_FILE_SRC_CLASS
+GST_TYPE_MULTI_FILE_SRC
+gst_multi_file_src_get_type
+</SECTION>
+
+<SECTION>
+<FILE>element-multifilesink</FILE>
+<TITLE>multifilesink</TITLE>
+GstMultiFileSink
+<SUBSECTION Standard>
+GstMultiFileSinkClass
+GST_MULTI_FILE_SINK
+GST_MULTI_FILE_SINK_CLASS
+GST_IS_MULTI_FILE_SINK
+GST_IS_MULTI_FILE_SINK_CLASS
+GST_TYPE_MULTI_FILE_SINK
+gst_multi_file_sink_get_type
+</SECTION>
+
+<SECTION>
 <FILE>element-multipartmux</FILE>
 <TITLE>multipartmux</TITLE>
 GstMultipartMux

diff --git a/docs/plugins/gst-plugins-good-plugins.args b/docs/plugins/gst-plugins-good-plugins.args
index 38c959e..be3e690 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins.args
+++ b/docs/plugins/gst-plugins-good-plugins.args
@@ -139,6 +139,56 @@
 </ARG>
 
 <ARG>
+<NAME>GstMultiFileSink::location</NAME>
+<TYPE>gchar*</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>File Location</NICK>
+<BLURB>Location of the file to write.</BLURB>
+<DEFAULT>NULL</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstMultiFileSink::index</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Index</NICK>
+<BLURB>Index to use with location property to create file names.  The index is incremented by one for each buffer read.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstMultiFileSrc::caps</NAME>
+<TYPE>GstCaps*</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Caps</NICK>
+<BLURB>Caps describing the format of the data.</BLURB>
+<DEFAULT></DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstMultiFileSrc::index</NAME>
+<TYPE>gint</TYPE>
+<RANGE>>= 0</RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>File Index</NICK>
+<BLURB>Index to use with location property to create file names.  The index is incremented by one for each buffer read.</BLURB>
+<DEFAULT>0</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstMultiFileSrc::location</NAME>
+<TYPE>gchar*</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>File Location</NICK>
+<BLURB>Pattern to create file names of input files.  File names are created by calling sprintf() with the pattern and the current index.</BLURB>
+<DEFAULT>"%05d"</DEFAULT>
+</ARG>
+
+<ARG>
 <NAME>GstOssSrc::device</NAME>
 <TYPE>gchararray</TYPE>
 <RANGE></RANGE>

diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy
index a25fee6..a3da184 100644 (file)
--- a/docs/plugins/gst-plugins-good-plugins.hierarchy
+++ b/docs/plugins/gst-plugins-good-plugins.hierarchy
@@ -18,13 +18,14 @@ GObject
       GstSpeexDec
       GstBaseSink
         GstShout2send
-        GstCACASink
         GstBaseAudioSink
           GstAudioSink
             GstEsdSink
             GstOssSink
             GstOsxAudioSink
         GstAASink
+        GstCACASink
+        GstMultiFileSink
         GstMultiUDPSink
           GstUDPSink
         GstDynUDPSink
@@ -36,6 +37,7 @@ GObject
             GstAudioSrc
               GstOssSrc
               GstOsxAudioSrc
+          GstMultiFileSrc
           GstUDPSrc
       GstPngDec
       GstPngEnc

diff --git a/docs/plugins/inspect/plugin-multifile.xml b/docs/plugins/inspect/plugin-multifile.xml
new file mode 100644 (file)
index 0000000..be11b4c
--- /dev/null
+++ b/docs/plugins/inspect/plugin-multifile.xml
@@ -0,0 +1,43 @@
+<plugin>
+  <name>multifile</name>
+  <description>Writes buffers to sequentially named files</description>
+  <filename>../../gst/multifile/.libs/libgstmultifile.so</filename>
+  <basename>libgstmultifile.so</basename>
+  <version>0.10.6.1</version>
+  <license>LGPL</license>
+  <source>gst-plugins-good</source>
+  <package>GStreamer Good Plug-ins CVS/prerelease</package>
+  <origin>Unknown package origin</origin>
+  <elements>
+    <element>
+      <name>multifilesink</name>
+      <longname>Multi-File Sink</longname>
+      <class>Sink/File</class>
+      <description>Write buffers to a sequentially named set of files</description>
+      <author>David Schleef &lt;ds@schleef.org&gt;</author>
+      <pads>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>ANY</details>
+        </caps>
+      </pads>
+    </element>
+    <element>
+      <name>multifilesrc</name>
+      <longname>Multi-File Source</longname>
+      <class>Source/File</class>
+      <description>Read a sequentially named set of files into buffers</description>
+      <author>David Schleef &lt;ds@schleef.org&gt;</author>
+      <pads>
+        <caps>
+          <name>src</name>
+          <direction>source</direction>
+          <presence>always</presence>
+          <details>ANY</details>
+        </caps>
+      </pads>
+    </element>
+  </elements>
+</plugin>
\ No newline at end of file

diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 0a5514a..ea2fcaa 100644 (file)
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -68,6 +68,7 @@ check_PROGRAMS = \
        elements/id3demux \
        elements/level \
        elements/matroskamux \
+       elements/multifile \
        elements/rtp-payloading \
        elements/spectrum \
        elements/videocrop \

diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore
index 695d8cf..c21f74e 100644 (file)
--- a/tests/check/elements/.gitignore
+++ b/tests/check/elements/.gitignore
@@ -20,6 +20,7 @@ id3demux
 id3v2mux
 level
 matroskamux
+multifile
 rtp-payloading
 spectrum
 sunaudio