summaryrefslogtreecommitdiff
path: root/gst/rtsp-server/rtsp-media-factory.c
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2013-07-05 12:08:36 +0200
committerWim Taymans <wim.taymans@collabora.co.uk>2013-07-05 20:53:19 +0200
commit19cffc79996fc3b73e597fa72949b9ed3559a313 (patch)
tree331c277ee4b149796cda4437ef3e9310fe730047 /gst/rtsp-server/rtsp-media-factory.c
parent78bc979690210662067a8adada5c17122f37f9c7 (diff)
auth: remove auth from media and factory
Remove the auth object from media and factory. We want to have the RTSPClient authenticate and authorize resources, there is no need to place another auth manager on the media/factory.
Diffstat (limited to 'gst/rtsp-server/rtsp-media-factory.c')
-rw-r--r--gst/rtsp-server/rtsp-media-factory.c64
1 files changed, 0 insertions, 64 deletions
diff --git a/gst/rtsp-server/rtsp-media-factory.c b/gst/rtsp-server/rtsp-media-factory.c
index f448276..b6fa8c0 100644
--- a/gst/rtsp-server/rtsp-media-factory.c
+++ b/gst/rtsp-server/rtsp-media-factory.c
@@ -33,7 +33,6 @@ struct _GstRTSPMediaFactoryPrivate
gboolean shared;
gboolean eos_shutdown;
GstRTSPLowerTrans protocols;
- GstRTSPAuth *auth;
guint buffer_size;
GstRTSPAddressPool *pool;
@@ -194,8 +193,6 @@ gst_rtsp_media_factory_finalize (GObject * obj)
g_mutex_clear (&priv->medias_lock);
g_free (priv->launch);
g_mutex_clear (&priv->lock);
- if (priv->auth)
- g_object_unref (priv->auth);
if (priv->pool)
g_object_unref (priv->pool);
@@ -536,62 +533,6 @@ gst_rtsp_media_factory_get_address_pool (GstRTSPMediaFactory * factory)
}
/**
- * gst_rtsp_media_factory_set_auth:
- * @factory: a #GstRTSPMediaFactory
- * @auth: a #GstRTSPAuth
- *
- * configure @auth to be used as the authentication manager of @factory.
- */
-void
-gst_rtsp_media_factory_set_auth (GstRTSPMediaFactory * factory,
- GstRTSPAuth * auth)
-{
- GstRTSPMediaFactoryPrivate *priv;
- GstRTSPAuth *old;
-
- g_return_if_fail (GST_IS_RTSP_MEDIA_FACTORY (factory));
-
- priv = factory->priv;
-
- GST_RTSP_MEDIA_FACTORY_LOCK (factory);
- if ((old = priv->auth) != auth)
- priv->auth = auth ? g_object_ref (auth) : NULL;
- else
- old = NULL;
- GST_RTSP_MEDIA_FACTORY_UNLOCK (factory);
-
- if (old)
- g_object_unref (old);
-}
-
-/**
- * gst_rtsp_media_factory_get_auth:
- * @factory: a #GstRTSPMediaFactory
- *
- * Get the #GstRTSPAuth used as the authentication manager of @factory.
- *
- * Returns: (transfer full): the #GstRTSPAuth of @factory. g_object_unref() after
- * usage.
- */
-GstRTSPAuth *
-gst_rtsp_media_factory_get_auth (GstRTSPMediaFactory * factory)
-{
- GstRTSPMediaFactoryPrivate *priv;
- GstRTSPAuth *result;
-
- g_return_val_if_fail (GST_IS_RTSP_MEDIA_FACTORY (factory), NULL);
-
- priv = factory->priv;
-
- GST_RTSP_MEDIA_FACTORY_LOCK (factory);
- if ((result = priv->auth))
- g_object_ref (result);
- GST_RTSP_MEDIA_FACTORY_UNLOCK (factory);
-
- return result;
-}
-
-/**
* gst_rtsp_media_factory_set_protocols:
* @factory: a #GstRTSPMediaFactory
* @protocols: the new flags
@@ -896,7 +837,6 @@ default_configure (GstRTSPMediaFactory * factory, GstRTSPMedia * media)
GstRTSPMediaFactoryPrivate *priv = factory->priv;
gboolean shared, eos_shutdown;
guint size;
- GstRTSPAuth *auth;
GstRTSPLowerTrans protocols;
GstRTSPAddressPool *pool;
@@ -913,10 +853,6 @@ default_configure (GstRTSPMediaFactory * factory, GstRTSPMedia * media)
gst_rtsp_media_set_buffer_size (media, size);
gst_rtsp_media_set_protocols (media, protocols);
- if ((auth = gst_rtsp_media_factory_get_auth (factory))) {
- gst_rtsp_media_set_auth (media, auth);
- g_object_unref (auth);
- }
if ((pool = gst_rtsp_media_factory_get_address_pool (factory))) {
gst_rtsp_media_set_address_pool (media, pool);
g_object_unref (pool);