From: <bi...@ke...> - 2007-05-22 11:03:53
|
CVS Root: /cvs/gstreamer Module: gst-plugins-bad Changes by: bilboed Date: Tue May 22 2007 11:03:42 UTC Log message: * docs/plugins/Makefile.am: Also look for .m (objectivec) files. * docs/plugins/gst-plugins-bad-plugins-sections.txt: * docs/plugins/gst-plugins-bad-plugins.args: * sys/osxvideo/osxvideosink.m: Add documentation for element and properties. Modified files: . : ChangeLog docs/plugins : Makefile.am gst-plugins-bad-plugins-sections.txt gst-plugins-bad-plugins.args sys/osxvideo : osxvideosink.m Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/ChangeLog.diff?r1=1.2567&r2=1.2568 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/docs/plugins/Makefile.am.diff?r1=1.16&r2=1.17 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/docs/plugins/gst-plugins-bad-plugins-sections.txt.diff?r1=1.16&r2=1.17 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/docs/plugins/gst-plugins-bad-plugins.args.diff?r1=1.11&r2=1.12 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-bad/sys/osxvideo/osxvideosink.m.diff?r1=1.9&r2=1.10 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-bad/ChangeLog,v retrieving revision 1.2567 retrieving revision 1.2568 diff -u -d -r1.2567 -r1.2568 --- ChangeLog 21 May 2007 14:01:14 -0000 1.2567 +++ ChangeLog 22 May 2007 11:03:30 -0000 1.2568 @@ -1,3 +1,12 @@ +2007-05-22 Edward Hervey <ed...@fl...> + + * docs/plugins/Makefile.am: + Also look for .m (objectivec) files. + * docs/plugins/gst-plugins-bad-plugins-sections.txt: + * docs/plugins/gst-plugins-bad-plugins.args: + * sys/osxvideo/osxvideosink.m: + Add documentation for element and properties. 2007-05-21 Stefan Kost <en...@us...> * ChangeLog: Index: osxvideosink.m RCS file: /cvs/gstreamer/gst-plugins-bad/sys/osxvideo/osxvideosink.m,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- osxvideosink.m 17 May 2007 10:59:00 -0000 1.9 +++ osxvideosink.m 22 May 2007 11:03:30 -0000 1.10 @@ -23,6 +23,29 @@ * */ +/** + * SECTION:element-osxvideosink + * + * <refsect2> + * <para> + * The OSXVideoSink renders video frames to a MacOSX window. The video output + * can be directed to a window embedded in an existing NSApp. This can be done + * by setting the "embed" property to #TRUE. When the NSView to be embedded is + * created an element #GstMessage with a name of 'have-ns-view' will be created + * and posted on the bus. The pointer to the NSView to embed will be in the + * 'nsview' field of that message. If no embedding is requested, the plugin will + * create a standalone window. + * </para> + * <title>Examples</title> + * Simple timeline to test the sink : + * <programlisting> + * gst-launch-0.10 -v videotestsrc ! osxvideosink + * </programlisting> + * </refsect2> + */ #include "config.h" /* Object header */ @@ -560,9 +583,23 @@ gstbasesink_class->render = gst_osx_video_sink_show_frame; gstelement_class->change_state = gst_osx_video_sink_change_state; + /** + * GstOSXVideoSink:embed + * + * Set to #TRUE if you are embedding the video window in an application. + **/ g_object_class_install_property (gobject_class, ARG_EMBED, g_param_spec_boolean ("embed", "embed", "When enabled, it " "can be embedded", FALSE, G_PARAM_READWRITE)); + * GstOSXVideoSink:fullscreen + * Set to #TRUE to have the video displayed in fullscreen. g_object_class_install_property (gobject_class, ARG_FULLSCREEN, g_param_spec_boolean ("fullscreen", "fullscreen", "When enabled, the view " "is fullscreen", FALSE, Index: Makefile.am RCS file: /cvs/gstreamer/gst-plugins-bad/docs/plugins/Makefile.am,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Makefile.am 20 May 2007 15:12:31 -0000 1.16 +++ Makefile.am 22 May 2007 11:03:30 -0000 1.17 @@ -50,7 +50,7 @@ #EXTRA_DIST = gstreamer.types.in gstreamer.hierarchy $(DOC_MODULE)-sections.txt gstreamer-sections.txt $(DOC_MAIN_SGML_FILE) # Extra options to supply to gtkdoc-mkdb. -MKDB_OPTIONS=--sgml-mode --source-suffixes=c,h,cc +MKDB_OPTIONS=--sgml-mode --source-suffixes=c,h,cc,m # Extra options to supply to gtkdoc-fixref. FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \ @@ -61,7 +61,7 @@ # Used for dependencies. HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.h -CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.c $(DOC_SOURCE_DIR)/*/*/*.cc +CFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.c $(DOC_SOURCE_DIR)/*/*/*.cc $(DOC_SOURCE_DIR)/*/*/*.m # this is a wingo addition # thomasvs: another nice wingo addition would be an explanation on why @@ -92,6 +92,7 @@ $(top_srcdir)/sys/directdraw/gstdirectdrawsink.h \ $(top_srcdir)/sys/directsound/gstdirectsoundsink.h \ $(top_srcdir)/sys/waveform/gstwaveformsink.h \ + $(top_srcdir)/sys/osxvideo/osxvideosink.h \ $(top_srcdir)/ext/directfb/dfbvideosink.h \ $(top_srcdir)/ext/jack/gstjackaudiosink.h \ $(top_srcdir)/ext/musicbrainz/gsttrm.h \ Index: gst-plugins-bad-plugins-sections.txt RCS file: /cvs/gstreamer/gst-plugins-bad/docs/plugins/gst-plugins-bad-plugins-sections.txt,v --- gst-plugins-bad-plugins-sections.txt 19 May 2007 10:01:44 -0000 1.16 +++ gst-plugins-bad-plugins-sections.txt 22 May 2007 11:03:30 -0000 1.17 @@ -45,6 +45,14 @@ <TITLE>osxvideosink</TITLE> <SUBSECTION Standard> GstOSXVideoSinkClass +<SUBSECTION Private> +GST_IS_OSX_VIDEO_SINK +GST_IS_OSX_VIDEO_SINK_CLASS +GST_OSX_VIDEO_SINK +GST_OSX_VIDEO_SINK_CLASS +GST_TYPE_OSXVIDEOBUFFER +GST_TYPE_OSX_VIDEO_SINK +GstOSXWindow </SECTION> <SECTION> Index: gst-plugins-bad-plugins.args RCS file: /cvs/gstreamer/gst-plugins-bad/docs/plugins/gst-plugins-bad-plugins.args,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- gst-plugins-bad-plugins.args 9 May 2007 20:01:21 -0000 1.11 +++ gst-plugins-bad-plugins.args 22 May 2007 11:03:30 -0000 1.12 @@ -17103,4 +17103,24 @@ <NICK>Attenuation of the sound</NICK> <BLURB>The attenuation for the directsound buffer (default is 0 so the directsound buffer will not be attenuated).</BLURB> <DEFAULT>0</DEFAULT> -</ARG> \ No newline at end of file +</ARG> +<ARG> +<NAME>GstOSXVideoSink::embed</NAME> +<TYPE>gboolean</TYPE> +<RANGE></RANGE> +<FLAGS>rw</FLAGS> +<NICK>embed</NICK> +<BLURB>When enabled, it can be embedded.</BLURB> +<DEFAULT>FALSE</DEFAULT> +<NAME>GstOSXVideoSink::fullscreen</NAME> +<NICK>fullscreen</NICK> +<BLURB>When enabled, the view is fullscreen.</BLURB> |