#define RANGE_IS_SINGLE(r) (memcmp ((r)->min.bytes, (r)->max.bytes, (r)->min.size) == 0)
#define gst_rtsp_address_pool_parent_class parent_class
-G_DEFINE_TYPE (GstRTSPAddressPool, gst_rtsp_address_pool, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPAddressPool, gst_rtsp_address_pool,
+ G_TYPE_OBJECT);
static void gst_rtsp_address_pool_finalize (GObject * obj);
gobject_class->finalize = gst_rtsp_address_pool_finalize;
- g_type_class_add_private (klass, sizeof (GstRTSPAddressPoolPrivate));
-
GST_DEBUG_CATEGORY_INIT (rtsp_address_pool_debug, "rtspaddresspool", 0,
"GstRTSPAddressPool");
}
static void
gst_rtsp_address_pool_init (GstRTSPAddressPool * pool)
{
- pool->priv = GST_RTSP_ADDRESS_POOL_GET_PRIVATE (pool);
+ pool->priv = gst_rtsp_address_pool_get_instance_private (pool);
g_mutex_init (&pool->priv->lock);
}
#include "rtsp-auth.h"
-#define GST_RTSP_AUTH_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_AUTH, GstRTSPAuthPrivate))
-
struct _GstRTSPAuthPrivate
{
GMutex lock;
GstRTSPContext * ctx);
-G_DEFINE_TYPE (GstRTSPAuth, gst_rtsp_auth, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPAuth, gst_rtsp_auth, G_TYPE_OBJECT);
static void
gst_rtsp_auth_class_init (GstRTSPAuthClass * klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (GstRTSPAuthPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = gst_rtsp_auth_get_property;
{
GstRTSPAuthPrivate *priv;
- auth->priv = priv = GST_RTSP_AUTH_GET_PRIVATE (auth);
+ auth->priv = priv = gst_rtsp_auth_get_instance_private (auth);
g_mutex_init (&priv->lock);
#include "rtsp-sdp.h"
#include "rtsp-params.h"
-#define GST_RTSP_CLIENT_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_CLIENT, GstRTSPClientPrivate))
-
typedef enum
{
TUNNEL_STATE_UNKNOWN,
static gboolean pre_signal_accumulator (GSignalInvocationHint * ihint,
GValue * return_accu, const GValue * handler_return, gpointer data);
-G_DEFINE_TYPE (GstRTSPClient, gst_rtsp_client, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPClient, gst_rtsp_client, G_TYPE_OBJECT);
static void
gst_rtsp_client_class_init (GstRTSPClientClass * klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (GstRTSPClientPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = gst_rtsp_client_get_property;
static void
gst_rtsp_client_init (GstRTSPClient * client)
{
- GstRTSPClientPrivate *priv = GST_RTSP_CLIENT_GET_PRIVATE (client);
+ GstRTSPClientPrivate *priv = gst_rtsp_client_get_instance_private (client);
client->priv = priv;
#include "rtsp-media-factory-uri.h"
-#define GST_RTSP_MEDIA_FACTORY_URI_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_MEDIA_FACTORY_URI, GstRTSPMediaFactoryURIPrivate))
-
struct _GstRTSPMediaFactoryURIPrivate
{
GMutex lock;
static GstElement *rtsp_media_factory_uri_create_element (GstRTSPMediaFactory *
factory, const GstRTSPUrl * url);
-G_DEFINE_TYPE (GstRTSPMediaFactoryURI, gst_rtsp_media_factory_uri,
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPMediaFactoryURI, gst_rtsp_media_factory_uri,
GST_TYPE_RTSP_MEDIA_FACTORY);
static void
GObjectClass *gobject_class;
GstRTSPMediaFactoryClass *mediafactory_class;
- g_type_class_add_private (klass, sizeof (GstRTSPMediaFactoryURIPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
mediafactory_class = GST_RTSP_MEDIA_FACTORY_CLASS (klass);
gst_rtsp_media_factory_uri_init (GstRTSPMediaFactoryURI * factory)
{
GstRTSPMediaFactoryURIPrivate *priv =
- GST_RTSP_MEDIA_FACTORY_URI_GET_PRIVATE (factory);
+ gst_rtsp_media_factory_uri_get_instance_private (factory);
FilterData data = { NULL, NULL, NULL };
GST_DEBUG_OBJECT (factory, "new");
#include "rtsp-media-factory.h"
-#define GST_RTSP_MEDIA_FACTORY_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_MEDIA_FACTORY, GstRTSPMediaFactoryPrivate))
-
#define GST_RTSP_MEDIA_FACTORY_GET_LOCK(f) (&(GST_RTSP_MEDIA_FACTORY_CAST(f)->priv->lock))
#define GST_RTSP_MEDIA_FACTORY_LOCK(f) (g_mutex_lock(GST_RTSP_MEDIA_FACTORY_GET_LOCK(f)))
#define GST_RTSP_MEDIA_FACTORY_UNLOCK(f) (g_mutex_unlock(GST_RTSP_MEDIA_FACTORY_GET_LOCK(f)))
static GstElement *default_create_pipeline (GstRTSPMediaFactory * factory,
GstRTSPMedia * media);
-G_DEFINE_TYPE (GstRTSPMediaFactory, gst_rtsp_media_factory, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPMediaFactory, gst_rtsp_media_factory,
+ G_TYPE_OBJECT);
static void
gst_rtsp_media_factory_class_init (GstRTSPMediaFactoryClass * klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (GstRTSPMediaFactoryPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = gst_rtsp_media_factory_get_property;
gst_rtsp_media_factory_init (GstRTSPMediaFactory * factory)
{
GstRTSPMediaFactoryPrivate *priv =
- GST_RTSP_MEDIA_FACTORY_GET_PRIVATE (factory);
+ gst_rtsp_media_factory_get_instance_private (factory);
factory->priv = priv;
priv->launch = g_strdup (DEFAULT_LAUNCH);
#include "rtsp-media.h"
-#define GST_RTSP_MEDIA_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_MEDIA, GstRTSPMediaPrivate))
-
struct _GstRTSPMediaPrivate
{
GMutex lock;
return (GType) id;
}
-G_DEFINE_TYPE (GstRTSPMedia, gst_rtsp_media, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPMedia, gst_rtsp_media, G_TYPE_OBJECT);
static void
gst_rtsp_media_class_init (GstRTSPMediaClass * klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (GstRTSPMediaPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = gst_rtsp_media_get_property;
static void
gst_rtsp_media_init (GstRTSPMedia * media)
{
- GstRTSPMediaPrivate *priv = GST_RTSP_MEDIA_GET_PRIVATE (media);
+ GstRTSPMediaPrivate *priv = gst_rtsp_media_get_instance_private (media);
media->priv = priv;
#include "rtsp-mount-points.h"
-#define GST_RTSP_MOUNT_POINTS_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_MOUNT_POINTS, GstRTSPMountPointsPrivate))
-
typedef struct
{
gchar *path;
gboolean dirty;
};
-G_DEFINE_TYPE (GstRTSPMountPoints, gst_rtsp_mount_points, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPMountPoints, gst_rtsp_mount_points,
+ G_TYPE_OBJECT);
GST_DEBUG_CATEGORY_STATIC (rtsp_media_debug);
#define GST_CAT_DEFAULT rtsp_media_debug
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (GstRTSPMountPointsPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gst_rtsp_mount_points_finalize;
static void
gst_rtsp_mount_points_init (GstRTSPMountPoints * mounts)
{
- GstRTSPMountPointsPrivate *priv = GST_RTSP_MOUNT_POINTS_GET_PRIVATE (mounts);
+ GstRTSPMountPointsPrivate *priv;
GST_DEBUG_OBJECT (mounts, "created");
- mounts->priv = priv;
+ mounts->priv = priv = gst_rtsp_mount_points_get_instance_private (mounts);
g_mutex_init (&priv->lock);
priv->mounts = g_sequence_new (data_item_free);
#include "rtsp-server.h"
#include "rtsp-client.h"
-#define GST_RTSP_SERVER_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_SERVER, GstRTSPServerPrivate))
-
#define GST_RTSP_SERVER_GET_LOCK(server) (&(GST_RTSP_SERVER_CAST(server)->priv->lock))
#define GST_RTSP_SERVER_LOCK(server) (g_mutex_lock(GST_RTSP_SERVER_GET_LOCK(server)))
#define GST_RTSP_SERVER_UNLOCK(server) (g_mutex_unlock(GST_RTSP_SERVER_GET_LOCK(server)))
SIGNAL_LAST
};
-G_DEFINE_TYPE (GstRTSPServer, gst_rtsp_server, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPServer, gst_rtsp_server, G_TYPE_OBJECT);
GST_DEBUG_CATEGORY_STATIC (rtsp_server_debug);
#define GST_CAT_DEFAULT rtsp_server_debug
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (GstRTSPServerPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = gst_rtsp_server_get_property;
static void
gst_rtsp_server_init (GstRTSPServer * server)
{
- GstRTSPServerPrivate *priv = GST_RTSP_SERVER_GET_PRIVATE (server);
+ GstRTSPServerPrivate *priv = gst_rtsp_server_get_instance_private (server);
server->priv = priv;
#include "rtsp-session.h"
-#define GST_RTSP_SESSION_MEDIA_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_SESSION_MEDIA, GstRTSPSessionMediaPrivate))
-
struct _GstRTSPSessionMediaPrivate
{
GMutex lock;
static void gst_rtsp_session_media_finalize (GObject * obj);
-G_DEFINE_TYPE (GstRTSPSessionMedia, gst_rtsp_session_media, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPSessionMedia, gst_rtsp_session_media,
+ G_TYPE_OBJECT);
static void
gst_rtsp_session_media_class_init (GstRTSPSessionMediaClass * klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (GstRTSPSessionMediaPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gst_rtsp_session_media_finalize;
static void
gst_rtsp_session_media_init (GstRTSPSessionMedia * media)
{
- GstRTSPSessionMediaPrivate *priv = GST_RTSP_SESSION_MEDIA_GET_PRIVATE (media);
+ GstRTSPSessionMediaPrivate *priv;
- media->priv = priv;
+ media->priv = priv = gst_rtsp_session_media_get_instance_private (media);
g_mutex_init (&priv->lock);
priv->state = GST_RTSP_STATE_INIT;
#include "rtsp-session-pool.h"
-#define GST_RTSP_SESSION_POOL_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_SESSION_POOL, GstRTSPSessionPoolPrivate))
-
struct _GstRTSPSessionPoolPrivate
{
GMutex lock; /* protects everything in this struct */
static GstRTSPSession *create_session (GstRTSPSessionPool * pool,
const gchar * id);
-G_DEFINE_TYPE (GstRTSPSessionPool, gst_rtsp_session_pool, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPSessionPool, gst_rtsp_session_pool,
+ G_TYPE_OBJECT);
static void
gst_rtsp_session_pool_class_init (GstRTSPSessionPoolClass * klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (GstRTSPSessionPoolPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = gst_rtsp_session_pool_get_property;
static void
gst_rtsp_session_pool_init (GstRTSPSessionPool * pool)
{
- GstRTSPSessionPoolPrivate *priv = GST_RTSP_SESSION_POOL_GET_PRIVATE (pool);
+ GstRTSPSessionPoolPrivate *priv;
- pool->priv = priv;
+ pool->priv = priv = gst_rtsp_session_pool_get_instance_private (pool);
g_mutex_init (&priv->lock);
priv->sessions = g_hash_table_new_full (g_str_hash, g_str_equal,
#include "rtsp-session.h"
-#define GST_RTSP_SESSION_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_SESSION, GstRTSPSessionPrivate))
-
struct _GstRTSPSessionPrivate
{
GMutex lock; /* protects everything but sessionid and create_time */
const GValue * value, GParamSpec * pspec);
static void gst_rtsp_session_finalize (GObject * obj);
-G_DEFINE_TYPE (GstRTSPSession, gst_rtsp_session, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPSession, gst_rtsp_session, G_TYPE_OBJECT);
static void
gst_rtsp_session_class_init (GstRTSPSessionClass * klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (GstRTSPSessionPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = gst_rtsp_session_get_property;
static void
gst_rtsp_session_init (GstRTSPSession * session)
{
- GstRTSPSessionPrivate *priv = GST_RTSP_SESSION_GET_PRIVATE (session);
+ GstRTSPSessionPrivate *priv;
- session->priv = priv;
+ session->priv = priv = gst_rtsp_session_get_instance_private (session);
GST_INFO ("init session %p", session);
#include "rtsp-stream-transport.h"
-#define GST_RTSP_STREAM_TRANSPORT_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_STREAM_TRANSPORT, GstRTSPStreamTransportPrivate))
-
struct _GstRTSPStreamTransportPrivate
{
GstRTSPStream *stream;
static void gst_rtsp_stream_transport_finalize (GObject * obj);
-G_DEFINE_TYPE (GstRTSPStreamTransport, gst_rtsp_stream_transport,
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPStreamTransport, gst_rtsp_stream_transport,
G_TYPE_OBJECT);
static void
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (GstRTSPStreamTransportPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->finalize = gst_rtsp_stream_transport_finalize;
static void
gst_rtsp_stream_transport_init (GstRTSPStreamTransport * trans)
{
- GstRTSPStreamTransportPrivate *priv =
- GST_RTSP_STREAM_TRANSPORT_GET_PRIVATE (trans);
-
- trans->priv = priv;
+ trans->priv = gst_rtsp_stream_transport_get_instance_private (trans);
}
static void
#include "rtsp-stream.h"
-#define GST_RTSP_STREAM_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_STREAM, GstRTSPStreamPrivate))
-
struct _GstRTSPStreamPrivate
{
GMutex lock;
static guint gst_rtsp_stream_signals[SIGNAL_LAST] = { 0 };
-G_DEFINE_TYPE (GstRTSPStream, gst_rtsp_stream, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPStream, gst_rtsp_stream, G_TYPE_OBJECT);
static void
gst_rtsp_stream_class_init (GstRTSPStreamClass * klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (GstRTSPStreamPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = gst_rtsp_stream_get_property;
static void
gst_rtsp_stream_init (GstRTSPStream * stream)
{
- GstRTSPStreamPrivate *priv = GST_RTSP_STREAM_GET_PRIVATE (stream);
+ GstRTSPStreamPrivate *priv = gst_rtsp_stream_get_instance_private (stream);
GST_DEBUG ("new stream %p", stream);
GSocket *
gst_rtsp_stream_get_rtp_socket (GstRTSPStream * stream, GSocketFamily family)
{
- GstRTSPStreamPrivate *priv = GST_RTSP_STREAM_GET_PRIVATE (stream);
+ GstRTSPStreamPrivate *priv = stream->priv;
GSocket *socket;
const gchar *name;
GSocket *
gst_rtsp_stream_get_rtcp_socket (GstRTSPStream * stream, GSocketFamily family)
{
- GstRTSPStreamPrivate *priv = GST_RTSP_STREAM_GET_PRIVATE (stream);
+ GstRTSPStreamPrivate *priv = gst_rtsp_stream_get_instance_private (stream);
GSocket *socket;
const gchar *name;
gst_rtsp_stream_get_rtp_multicast_socket (GstRTSPStream * stream,
GSocketFamily family)
{
- GstRTSPStreamPrivate *priv = GST_RTSP_STREAM_GET_PRIVATE (stream);
+ GstRTSPStreamPrivate *priv = gst_rtsp_stream_get_instance_private (stream);
GSocket *socket;
const gchar *name;
gst_rtsp_stream_get_rtcp_multicast_socket (GstRTSPStream * stream,
GSocketFamily family)
{
- GstRTSPStreamPrivate *priv = GST_RTSP_STREAM_GET_PRIVATE (stream);
+ GstRTSPStreamPrivate *priv = gst_rtsp_stream_get_instance_private (stream);
GSocket *socket;
const gchar *name;
gst_rtsp_thread_unref (thread);
}
-#define GST_RTSP_THREAD_POOL_GET_PRIVATE(obj) \
- (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_RTSP_THREAD_POOL, GstRTSPThreadPoolPrivate))
-
struct _GstRTSPThreadPoolPrivate
{
GMutex lock;
static GstRTSPThread *default_get_thread (GstRTSPThreadPool * pool,
GstRTSPThreadType type, GstRTSPContext * ctx);
-G_DEFINE_TYPE (GstRTSPThreadPool, gst_rtsp_thread_pool, G_TYPE_OBJECT);
+G_DEFINE_TYPE_WITH_PRIVATE (GstRTSPThreadPool, gst_rtsp_thread_pool,
+ G_TYPE_OBJECT);
static void
gst_rtsp_thread_pool_class_init (GstRTSPThreadPoolClass * klass)
{
GObjectClass *gobject_class;
- g_type_class_add_private (klass, sizeof (GstRTSPThreadPoolPrivate));
-
gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = gst_rtsp_thread_pool_get_property;
{
GstRTSPThreadPoolPrivate *priv;
- pool->priv = priv = GST_RTSP_THREAD_POOL_GET_PRIVATE (pool);
+ pool->priv = priv = gst_rtsp_thread_pool_get_instance_private (pool);
g_mutex_init (&priv->lock);
priv->max_threads = DEFAULT_MAX_THREADS;