diff options
author | Olivier CrĂȘte <olivier.crete@collabora.co.uk> | 2008-11-11 19:23:49 +0000 |
---|---|---|
committer | Olivier CrĂȘte <olivier.crete@collabora.co.uk> | 2008-11-11 19:23:49 +0000 |
commit | f415d1908289480a3838022d47e28d6783f79cdb (patch) | |
tree | 80c7148f7b598487cc3460c1403a3d803d7c781b /docs | |
parent | d36d151870690c28328bbc6703fd61418a9deea5 (diff) | |
parent | 90bc23487c3f3b973d5bc633e948180e3169c891 (diff) | |
download | farstream-f415d1908289480a3838022d47e28d6783f79cdb.tar.gz |
Merge branch 'nice-transmitter'
Diffstat (limited to 'docs')
-rw-r--r-- | docs/plugins/Makefile.am | 18 | ||||
-rw-r--r-- | docs/plugins/farsight2-plugins-docs.sgml | 1 | ||||
-rw-r--r-- | docs/plugins/farsight2-plugins-sections.txt | 41 | ||||
-rw-r--r-- | docs/plugins/farsight2-transmitters.types | 1 |
4 files changed, 58 insertions, 3 deletions
diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 274bc9c5..4ef35813 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -44,7 +44,7 @@ MKDB_OPTIONS=--sgml-mode # Extra options to supply to gtkdoc-fixref. FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html \ --extra-dir=$(GST_PREFIX)/share/gtk-doc/html \ - --extra-dir=$(datadir)/gtk-doc/html + --extra-dir=$(datadir)/gtk-doc/html # Used for dependencies. HFILE_GLOB=$(DOC_SOURCE_DIR)/gst/*/*.h $(DOC_SOURCE_DIR)/transmitters/*/*.h @@ -59,7 +59,11 @@ SCANOBJ_DEPS = \ $(top_builddir)/transmitters/rawudp/librawudp-transmitter.la \ $(top_builddir)/gst/fsrtpconference/libfsrtpconference_doc.la \ $(top_builddir)/gst/funnel/libfsfunnel.la \ - $(top_builddir)/gst/videoanyrate/libfsvideoanyrate.la + $(top_builddir)/gst/videoanyrate/libfsvideoanyrate.la + +if USE_NICE +SCANOBJ_DEPS += $(top_builddir)/transmitters/nice/libnice-transmitter.la +endif # Header files to ignore when scanning. IGNORE_HFILES = @@ -85,6 +89,14 @@ EXTRA_HFILES = \ $(top_srcdir)/transmitters/multicast/fs-multicast-transmitter.h \ $(top_srcdir)/transmitters/multicast/fs-multicast-stream-transmitter.h +if USE_NICE +EXTRA_HFILES += \ + $(top_srcdir)/transmitters/nice/fs-nice-transmitter.h \ + $(top_srcdir)/transmitters/nice/fs-nice-stream-transmitter.h + +endif + + # Images to copy into HTML directory. HTML_IMAGES = @@ -110,7 +122,7 @@ GTKDOC_LD=$(LIBTOOL) --mode=link $(CC) #DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt DOC_OVERRIDES = -FS_PLUGIN_PATH=$(top_builddir)/transmitters/rawudp/.libs:$(top_builddir)/transmitters/multicast/.libs +FS_PLUGIN_PATH=$(top_builddir)/transmitters/rawudp/.libs:$(top_builddir)/transmitters/multicast/.libs:$(top_builddir)/transmitters/nice/.libs update-all: scanobj-trans-build.stamp update diff --git a/docs/plugins/farsight2-plugins-docs.sgml b/docs/plugins/farsight2-plugins-docs.sgml index 9cd2d282..8a795dc9 100644 --- a/docs/plugins/farsight2-plugins-docs.sgml +++ b/docs/plugins/farsight2-plugins-docs.sgml @@ -19,6 +19,7 @@ <title>Transmitters</title> <xi:include href="xml/fs-rawudp-stream-transmitter.xml"/> <xi:include href="xml/fs-multicast-stream-transmitter.xml"/> + <xi:include href="xml/fs-nice-stream-transmitter.xml"/> </chapter> </part> diff --git a/docs/plugins/farsight2-plugins-sections.txt b/docs/plugins/farsight2-plugins-sections.txt index 3c3e1f37..ed8dd80a 100644 --- a/docs/plugins/farsight2-plugins-sections.txt +++ b/docs/plugins/farsight2-plugins-sections.txt @@ -206,3 +206,44 @@ FS_TYPE_RTP_PARTICIPANT FsRtpParticipantPrivate fs_rtp_participant_new </SECTION> + +<SECTION> +<FILE>fs-nice-transmitter</FILE> +<TITLE>FsNiceTransmitter</TITLE> +FsNiceTransmitter +<SUBSECTION Standard> +FsNiceTransmitterClass +FS_NICE_TRANSMITTER_CAST +FS_NICE_TRANSMITTER +FS_IS_NICE_TRANSMITTER +FS_TYPE_NICE_TRANSMITTER +fs_nice_transmitter_get_type +FS_NICE_TRANSMITTER_CLASS +FS_IS_NICE_TRANSMITTER_CLASS +FS_NICE_TRANSMITTER_GET_CLASS +<SUBSECTION Private> +FsNiceTransmitterPrivate +NiceGstStream +fs_nice_transmitter_add_gst_stream +fs_nice_transmitter_free_gst_stream +</SECTION> + + +<SECTION> +<FILE>fs-nice-stream-transmitter</FILE> +<TITLE>FsNiceStreamTransmitter</TITLE> +FsNiceStreamTransmitter +<SUBSECTION Standard> +FS_NICE_STREAM_TRANSMITTER_CAST +FsNiceStreamTransmitterPrivate +fs_nice_stream_transmitter_register_type +fs_nice_stream_transmitter_newv +FsNiceStreamTransmitterClass +FS_NICE_STREAM_TRANSMITTER +FS_IS_NICE_STREAM_TRANSMITTER +FS_TYPE_NICE_STREAM_TRANSMITTER +fs_nice_stream_transmitter_get_type +FS_NICE_STREAM_TRANSMITTER_CLASS +FS_IS_NICE_STREAM_TRANSMITTER_CLASS +FS_NICE_STREAM_TRANSMITTER_GET_CLASS +</SECTION> diff --git a/docs/plugins/farsight2-transmitters.types b/docs/plugins/farsight2-transmitters.types index fb96bfa6..52d6e0d3 100644 --- a/docs/plugins/farsight2-transmitters.types +++ b/docs/plugins/farsight2-transmitters.types @@ -1,3 +1,4 @@ #include <gst/farsight/fs-transmitter.h> rawudp multicast +nice |