diff options
| author | Olivier Crête <olivier.crete@collabora.com> | 2011-05-13 17:35:17 -0400 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2011-10-11 15:46:10 -0400 |
| commit | 4f5d87bc48fd2d595427b2deda307db3fd66215e (patch) | |
| tree | 234282e7ac68afd2a1f1713aae9e3b09d807955f /docs | |
| parent | 942c16ae7de74774e9d3466b82a60d9bf109d2cc (diff) | |
| download | farstream-4f5d87bc48fd2d595427b2deda307db3fd66215e.tar.gz | |
conference: Remove BaseConference
Merge the FsConference interface and FsBaseConference
All the plugins will use the base class
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/libs/farsight2-libs-docs.sgml | 9 | ||||
| -rw-r--r-- | docs/libs/farsight2-libs-sections.txt | 22 | ||||
| -rw-r--r-- | docs/libs/farsight2-libs.types | 4 |
3 files changed, 7 insertions, 28 deletions
diff --git a/docs/libs/farsight2-libs-docs.sgml b/docs/libs/farsight2-libs-docs.sgml index 233275b8..fe7d119a 100644 --- a/docs/libs/farsight2-libs-docs.sgml +++ b/docs/libs/farsight2-libs-docs.sgml @@ -19,11 +19,8 @@ <part> <title>User-oriented classes, interfaces and functions</title> <chapter> - <title>Farsight GStreamer Interfaces</title> - <xi:include href="xml/fs-conference.xml"/> - </chapter> - <chapter> <title>Farsight Core Library</title> + <xi:include href="xml/fs-conference.xml"/> <xi:include href="xml/fs-participant.xml"/> <xi:include href="xml/fs-session.xml"/> <xi:include href="xml/fs-stream.xml"/> @@ -43,10 +40,6 @@ <part> <title>Classes used to implement Farsight plugins</title> <chapter> - <title>Farsight Classes Base Implementations</title> - <xi:include href="xml/fs-base-conference.xml"/> - </chapter> - <chapter> <title>Farsight Transmitter Classes</title> <xi:include href="xml/fs-transmitter.xml"/> <xi:include href="xml/fs-stream-transmitter.xml"/> diff --git a/docs/libs/farsight2-libs-sections.txt b/docs/libs/farsight2-libs-sections.txt index 69e987bc..3f261a76 100644 --- a/docs/libs/farsight2-libs-sections.txt +++ b/docs/libs/farsight2-libs-sections.txt @@ -73,6 +73,10 @@ FS_SESSION_CLASS FS_IS_SESSION_CLASS FS_SESSION_GET_CLASS FsSessionPrivate +FS_CONFERENCE_CAST +FS_CONFERENCE_CLASS +FS_CONFERENCE_GET_CLASS +FS_IS_CONFERENCE_CLASS </SECTION> <SECTION> @@ -151,24 +155,6 @@ fs_codec_list_get_type </SECTION> <SECTION> -<FILE>fs-base-conference</FILE> -<TITLE>FsBaseConference</TITLE> -<INCLUDE>gst/farsight/fs-base-conference.h</INCLUDE> -FsBaseConference -FsBaseConferenceClass -<SUBSECTION Standard> -FS_BASE_CONFERENCE -FS_BASE_CONFERENCE_CAST -FS_BASE_CONFERENCE_CLASS -FS_BASE_CONFERENCE_GET_CLASS -FS_TYPE_BASE_CONFERENCE -FS_IS_BASE_CONFERENCE -FS_IS_BASE_CONFERENCE_CLASS -fs_base_conference_get_type -FsBaseConferencePrivate -</SECTION> - -<SECTION> <FILE>fs-transmitter</FILE> <TITLE>FsTransmitter</TITLE> <INCLUDE>gst/farsight/fs-transmitter.h</INCLUDE> diff --git a/docs/libs/farsight2-libs.types b/docs/libs/farsight2-libs.types index e092b683..cd867146 100644 --- a/docs/libs/farsight2-libs.types +++ b/docs/libs/farsight2-libs.types @@ -9,7 +9,7 @@ #include "../../gst-libs/gst/farsight/fs-participant.h" #include "../../gst-libs/gst/farsight/fs-session.h" #include "../../gst-libs/gst/farsight/fs-stream.h" -#include "../../gst-libs/gst/farsight/fs-base-conference.h" +#include "../../gst-libs/gst/farsight/fs-conference.h" #include "../../gst-libs/gst/farsight/fs-transmitter.h" #include "../../gst-libs/gst/farsight/fs-stream-transmitter.h" #include "../../gst-libs/gst/farsight/fs-element-added-notifier.h" @@ -17,7 +17,7 @@ fs_participant_get_type fs_session_get_type fs_stream_get_type -fs_base_conference_get_type +fs_conference_get_type fs_transmitter_get_type fs_stream_transmitter_get_type fs_element_added_notifier_get_type |