summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien Moutte <julien@moutte.net>2005-11-06 22:16:27 +0000
committerJulien Moutte <julien@moutte.net>2005-11-06 22:16:27 +0000
commitd55ac2830b57502bcd6d6adfab2e48fd228fcdb1 (patch)
tree2b3113dca3ac63f09dcb58c1e04e80e6ee1adbe7
parent2438f5851e8c0d6e98cf45fc50300ca4387bc470 (diff)
downloadgst-plugins-bad-d55ac2830b57502bcd6d6adfab2e48fd228fcdb1.tar.gz
gst-plugins-bad-d55ac2830b57502bcd6d6adfab2e48fd228fcdb1.tar.bz2
gst-plugins-bad-d55ac2830b57502bcd6d6adfab2e48fd228fcdb1.zip
Makefile.am: examples in dist subdirs.
Original commit message from CVS: 2005-11-06 Julien MOUTTE <julien@moutte.net> * Makefile.am: examples in dist subdirs. * configure.ac: enable parameter for building examples. * docs/plugins/gst-plugins-bad-plugins.args: * docs/plugins/inspect/plugin-dfbvideosink.xml: * examples/Makefile.am: Updates.
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.am12
-rw-r--r--configure.ac2
-rw-r--r--docs/plugins/gst-plugins-bad-plugins.args27
-rw-r--r--docs/plugins/inspect/plugin-dfbvideosink.xml12
-rw-r--r--examples/Makefile.am7
6 files changed, 53 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index eca26760..96fed426 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2005-11-06 Julien MOUTTE <julien@moutte.net>
+ * Makefile.am: examples in dist subdirs.
+ * configure.ac: enable parameter for building
+ examples.
+ * docs/plugins/gst-plugins-bad-plugins.args:
+ * docs/plugins/inspect/plugin-dfbvideosink.xml:
+ * examples/Makefile.am: Updates.
+
+2005-11-06 Julien MOUTTE <julien@moutte.net>
+
* Makefile.am:
* autogen.sh:
* configure.ac:
diff --git a/Makefile.am b/Makefile.am
index 0eccbb0f..6fa0496e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,18 @@
DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc
+if BUILD_EXAMPLES
+SUBDIRS_EXAMPLES = examples
+else
+SUBDIRS_EXAMPLES =
+endif
+
SUBDIRS = \
gst sys ext \
- m4 common docs
+ m4 common docs \
+ $(SUBDIRS_EXAMPLES)
+
+DIST_SUBDIRS = \
+ gst sys ext m4 common docs examples
EXTRA_DIST = \
gst-plugins-bad.spec depcomp \
diff --git a/configure.ac b/configure.ac
index aee90dc0..9bdaaba7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,6 +56,8 @@ AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE",
[gettext package name])
+GST_ARG_EXAMPLES
+
dnl define LOCALEDIR in config.h
AS_AC_EXPAND(LOCALEDIR, $datadir/locale)
AC_DEFINE_UNQUOTED([LOCALEDIR], "$LOCALEDIR",
diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args
index 91294e2a..62fd24cf 100644
--- a/docs/plugins/gst-plugins-bad-plugins.args
+++ b/docs/plugins/gst-plugins-bad-plugins.args
@@ -3,7 +3,28 @@
<TYPE>gpointer</TYPE>
<RANGE></RANGE>
<FLAGS>w</FLAGS>
-<NICK>Destination surface</NICK>
-<BLURB>Render video frames to this surface. The pointer you pass here has to point to an IDirectFBSurface * interface</BLURB>
-<DEFAULT>NULL</DEFAULT>
+<NICK>Surface</NICK>
+<BLURB>The target surface for video.</BLURB>
+<DEFAULT></DEFAULT>
</ARG>
+
+<ARG>
+<NAME>GstSDLVideoSink::fullscreen</NAME>
+<TYPE>gboolean</TYPE>
+<RANGE></RANGE>
+<FLAGS>rw</FLAGS>
+<NICK>Fullscreen</NICK>
+<BLURB>If true it will be Full screen.</BLURB>
+<DEFAULT>FALSE</DEFAULT>
+</ARG>
+
+<ARG>
+<NAME>GstSpeed::speed</NAME>
+<TYPE>gfloat</TYPE>
+<RANGE>[0.1,40]</RANGE>
+<FLAGS>rwx</FLAGS>
+<NICK>speed</NICK>
+<BLURB>speed.</BLURB>
+<DEFAULT>1</DEFAULT>
+</ARG>
+
diff --git a/docs/plugins/inspect/plugin-dfbvideosink.xml b/docs/plugins/inspect/plugin-dfbvideosink.xml
index 83f5fb4e..b95752d1 100644
--- a/docs/plugins/inspect/plugin-dfbvideosink.xml
+++ b/docs/plugins/inspect/plugin-dfbvideosink.xml
@@ -1,20 +1,20 @@
<plugin>
<name>dfbvideosink</name>
- <description>DirectFB video sink</description>
+ <description>DirectFB video output plugin</description>
<filename>../../ext/directfb/.libs/libgstdfbvideosink.so</filename>
<basename>libgstdfbvideosink.so</basename>
- <version>0.9.4</version>
+ <version>0.9.4.1</version>
<license>LGPL</license>
<source>gst-plugins-bad</source>
- <package>GStreamer source release</package>
+ <package>GStreamer CVS/prerelease</package>
<origin>http://gstreamer.freedesktop.org/</origin>
<elements>
<element>
<name>dfbvideosink</name>
- <longname>DirectFB video sink</longname>
+ <longname>Video sink</longname>
<class>Sink/Video</class>
- <description>DirectFB video sink</description>
+ <description>A DirectFB based videosink</description>
<author>Julien Moutte &lt;julien@moutte.net&gt;</author>
</element>
</elements>
-</plugin>
+</plugin> \ No newline at end of file
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 8606cf8a..45dfc2aa 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,8 +1,3 @@
-#if HAVE_GTK
-#GTK_SUBDIRS=dynparams level $(FT2_SUBDIRS)
-#else
-#GTK_SUBDIRS=
-#endif
if USE_DIRECTFB
DIRECTFB_DIR=directfb
@@ -10,5 +5,5 @@ else
DIRECTFB_DIR=
endif
-SUBDIRS=$(GTK_SUBDIRS) $(GCONF_SUBDIRS) $(DIRECTFB_DIR)
+SUBDIRS= $(DIRECTFB_DIR)
DIST_SUBDIRS=capsfilter dynparams indexing gstplay directfb switch level