diff options
author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-11-26 12:34:05 +0100 |
---|---|---|
committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-11-26 12:37:55 +0100 |
commit | 1d53c46d23a251cd43495b04ab016a2ca6a4a93a (patch) | |
tree | 94319712a27fbce7477a6ccf3063b3f5149a0682 /docs | |
parent | d6ac48fcfd0e94164e64fe6b515e2a3bc5dfa158 (diff) |
MediaMapping -> MountPoints
Describes better what the object manages.
Diffstat (limited to 'docs')
-rw-r--r-- | docs/README | 22 | ||||
-rw-r--r-- | docs/libs/gst-rtsp-server-docs.sgml | 2 | ||||
-rw-r--r-- | docs/libs/gst-rtsp-server-sections.txt | 42 | ||||
-rw-r--r-- | docs/libs/gst-rtsp-server.types | 4 |
4 files changed, 35 insertions, 35 deletions
diff --git a/docs/README b/docs/README index bbf1343..943382e 100644 --- a/docs/README +++ b/docs/README @@ -94,7 +94,7 @@ can build simple server applications with it. } The server manages two other objects: GstRTSPSessionPool and - GstRTSPMediaMapping. + GstRTSPMountPoints. The GstRTSPSessionPool is an object that keeps track of all the active sessions in the server. A session will usually be kept for each client that performed a @@ -104,13 +104,13 @@ can build simple server applications with it. The default implementation of the session pool is usually sufficient but alternative implementation can be used by the server. - The GstRTSPMediaMapping object is more interesting and needs more configuration + The GstRTSPMountPoints object is more interesting and needs more configuration before the server object is useful. This object manages the mapping from a request URL to a specific stream and its configuration. We explain in the next topic how to configure this object. -* Making url mappings +* Making url mount points Next we need to define what media is attached to a particular URL. What we want to achieve is that when the user asks our server for a specific URL, say /test, @@ -141,19 +141,19 @@ can build simple server applications with it. "( videotestsrc ! x264enc ! rtph264pay pt=96 name=pay0 )"); Now that we have the media factory, we can attach it to a specific url. To do - this we get the default GstRTSPMediaMapping from our server and add the url to - factory mapping to it like this: + this we get the default GstRTSPMountPoints from our server and add the url to + factory mount points to it like this: - GstRTSPMediaMapping *mapping; + GstRTSPMountPoints *mounts; ...create server..create factory.. - /* get the default mapping from the server */ - mapping = gst_rtsp_server_get_media_mapping (server); + /* get the default mount points from the server */ + mounts = gst_rtsp_server_get_mount_points (server); /* attach the video test signal to the "/test" URL */ - gst_rtsp_media_mapping_add_factory (mapping, "/test", factory); - g_object_unref (mapping); + gst_rtsp_mount_points_add_factory (mounts, "/test", factory); + g_object_unref (mounts); When starting the server now and directing an RTP client to the URL (like with vlc, mplayer or gstreamer): @@ -387,7 +387,7 @@ GstRTSPAuth basic authentication. -GstRTSPMediaMapping +GstRTSPMountPoints - Maps a url to a GstRTSPMediaFactory implementation. The default implementation uses a simple hashtable to map a url to a factory. diff --git a/docs/libs/gst-rtsp-server-docs.sgml b/docs/libs/gst-rtsp-server-docs.sgml index 2311bd3..5e02299 100644 --- a/docs/libs/gst-rtsp-server-docs.sgml +++ b/docs/libs/gst-rtsp-server-docs.sgml @@ -17,7 +17,7 @@ <xi:include href="xml/rtsp-client.xml"/> <xi:include href="xml/rtsp-media-factory.xml"/> <xi:include href="xml/rtsp-media-factory-uri.xml"/> - <xi:include href="xml/rtsp-media-mapping.xml"/> + <xi:include href="xml/rtsp-mount-points.xml"/> <xi:include href="xml/rtsp-media.xml"/> <xi:include href="xml/rtsp-auth.xml"/> <xi:include href="xml/rtsp-params.xml"/> diff --git a/docs/libs/gst-rtsp-server-sections.txt b/docs/libs/gst-rtsp-server-sections.txt index fa46f30..86dce46 100644 --- a/docs/libs/gst-rtsp-server-sections.txt +++ b/docs/libs/gst-rtsp-server-sections.txt @@ -1,22 +1,22 @@ <SECTION> -<FILE>rtsp-media-mapping</FILE> -<TITLE>GstRTSPMediaMapping</TITLE> -GstRTSPMediaMapping -GstRTSPMediaMappingClass -gst_rtsp_media_mapping_new -gst_rtsp_media_mapping_find_factory -gst_rtsp_media_mapping_add_factory -gst_rtsp_media_mapping_remove_factory +<FILE>rtsp-mount-points</FILE> +<TITLE>GstRTSPMountPoints</TITLE> +GstRTSPMountPoints +GstRTSPMountPointsClass +gst_rtsp_mount_points_new +gst_rtsp_mount_points_find_factory +gst_rtsp_mount_points_add_factory +gst_rtsp_mount_points_remove_factory <SUBSECTION Standard> -GST_RTSP_MEDIA_MAPPING_CLASS -GST_RTSP_MEDIA_MAPPING_CAST -GST_RTSP_MEDIA_MAPPING_CLASS_CAST -GST_RTSP_MEDIA_MAPPING -GST_IS_RTSP_MEDIA_MAPPING -GST_TYPE_RTSP_MEDIA_MAPPING -gst_rtsp_media_mapping_get_type -GST_IS_RTSP_MEDIA_MAPPING_CLASS -GST_RTSP_MEDIA_MAPPING_GET_CLASS +GST_RTSP_MOUNT_POINTS_CLASS +GST_RTSP_MOUNT_POINTS_CAST +GST_RTSP_MOUNT_POINTS_CLASS_CAST +GST_RTSP_MOUNT_POINTS +GST_IS_RTSP_MOUNT_POINTS +GST_TYPE_RTSP_MOUNT_POINTS +gst_rtsp_mount_points_get_type +GST_IS_RTSP_MOUNT_POINTS_CLASS +GST_RTSP_MOUNT_POINTS_GET_CLASS </SECTION> <SECTION> @@ -135,8 +135,8 @@ gst_rtsp_server_set_backlog gst_rtsp_server_get_backlog gst_rtsp_server_set_session_pool gst_rtsp_server_get_session_pool -gst_rtsp_server_set_media_mapping -gst_rtsp_server_get_media_mapping +gst_rtsp_server_set_mount_points +gst_rtsp_server_get_mount_points gst_rtsp_server_get_auth gst_rtsp_server_set_auth gst_rtsp_server_transfer_connection @@ -272,8 +272,8 @@ gst_rtsp_client_set_server gst_rtsp_client_get_server gst_rtsp_client_set_session_pool gst_rtsp_client_get_session_pool -gst_rtsp_client_set_media_mapping -gst_rtsp_client_get_media_mapping +gst_rtsp_client_set_mount_points +gst_rtsp_client_get_mount_points gst_rtsp_client_set_use_client_settings gst_rtsp_client_get_use_client_settings gst_rtsp_client_set_auth diff --git a/docs/libs/gst-rtsp-server.types b/docs/libs/gst-rtsp-server.types index 3189f2a..f4476f2 100644 --- a/docs/libs/gst-rtsp-server.types +++ b/docs/libs/gst-rtsp-server.types @@ -3,8 +3,8 @@ #include <gst/rtsp-server/rtsp-auth.h> gst_rtsp_auth_get_type -#include <gst/rtsp-server/rtsp-media-mapping.h> -gst_rtsp_media_mapping_get_type +#include <gst/rtsp-server/rtsp-mount-points.h> +gst_rtsp_mount_points_get_type #include <gst/rtsp-server/rtsp-media-factory.h> gst_rtsp_media_factory_get_type |