[farsight2/master] lib: Cleanup parent_class/dispose/finalize
Olivier Crête
olivier.crete at collabora.co.uk
Sat Jul 25 15:07:50 PDT 2009
Remove a bunch of useless stuff
---
gst-libs/gst/farsight/fs-base-conference.c | 1 -
gst-libs/gst/farsight/fs-element-added-notifier.c | 3 --
gst-libs/gst/farsight/fs-participant.c | 25 +-------------
gst-libs/gst/farsight/fs-plugin.c | 36 -------------------
gst-libs/gst/farsight/fs-session.c | 2 -
gst-libs/gst/farsight/fs-stream-transmitter.c | 31 ----------------
gst-libs/gst/farsight/fs-stream.c | 2 -
gst-libs/gst/farsight/fs-transmitter.c | 39 ++------------------
8 files changed, 5 insertions(+), 134 deletions(-)
diff --git a/gst-libs/gst/farsight/fs-base-conference.c b/gst-libs/gst/farsight/fs-base-conference.c
index 197f012..d0310da 100644
--- a/gst-libs/gst/farsight/fs-base-conference.c
+++ b/gst-libs/gst/farsight/fs-base-conference.c
@@ -96,7 +96,6 @@ fs_base_conference_base_init (gpointer g_class)
static void
fs_base_conference_class_init (FsBaseConferenceClass * klass)
{
- parent_class = g_type_class_peek_parent (klass);
}
static void
diff --git a/gst-libs/gst/farsight/fs-element-added-notifier.c b/gst-libs/gst/farsight/fs-element-added-notifier.c
index 6f698cb..06fbf7c 100644
--- a/gst-libs/gst/farsight/fs-element-added-notifier.c
+++ b/gst-libs/gst/farsight/fs-element-added-notifier.c
@@ -67,15 +67,12 @@ G_DEFINE_TYPE(FsElementAddedNotifier, fs_element_added_notifier, G_TYPE_OBJECT);
static guint signals[LAST_SIGNAL] = { 0 };
-static GObjectClass *parent_class = NULL;
-
static void
fs_element_added_notifier_class_init (FsElementAddedNotifierClass *klass)
{
GObjectClass *gobject_class;
gobject_class = (GObjectClass *) klass;
- parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = fs_element_added_notifier_finalize;
diff --git a/gst-libs/gst/farsight/fs-participant.c b/gst-libs/gst/farsight/fs-participant.c
index 801b62f..195d80f 100644
--- a/gst-libs/gst/farsight/fs-participant.c
+++ b/gst-libs/gst/farsight/fs-participant.c
@@ -56,8 +56,6 @@ enum
struct _FsParticipantPrivate
{
- gboolean disposed;
-
gchar *cname;
};
@@ -67,7 +65,6 @@ G_DEFINE_ABSTRACT_TYPE(FsParticipant, fs_participant, G_TYPE_OBJECT);
(G_TYPE_INSTANCE_GET_PRIVATE ((o), FS_TYPE_PARTICIPANT, \
FsParticipantPrivate))
-static void fs_participant_dispose (GObject *object);
static void fs_participant_finalize (GObject *object);
static void fs_participant_get_property (GObject *object,
@@ -79,7 +76,6 @@ static void fs_participant_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec);
-static GObjectClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
static void
@@ -88,7 +84,6 @@ fs_participant_class_init (FsParticipantClass *klass)
GObjectClass *gobject_class;
gobject_class = (GObjectClass *) klass;
- parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = fs_participant_set_property;
gobject_class->get_property = fs_participant_get_property;
@@ -128,7 +123,6 @@ fs_participant_class_init (FsParticipantClass *klass)
G_TYPE_NONE, 4, G_TYPE_OBJECT, FS_TYPE_ERROR, G_TYPE_STRING,
G_TYPE_STRING);
- gobject_class->dispose = fs_participant_dispose;
gobject_class->finalize = fs_participant_finalize;
g_type_class_add_private (klass, sizeof (FsParticipantPrivate));
@@ -139,28 +133,11 @@ fs_participant_init (FsParticipant *self)
{
/* member init */
self->priv = FS_PARTICIPANT_GET_PRIVATE (self);
- self->priv->disposed = FALSE;
self->mutex = g_mutex_new ();
}
static void
-fs_participant_dispose (GObject *object)
-{
- FsParticipant *self = FS_PARTICIPANT (object);
-
- if (self->priv->disposed) {
- /* If dispose did already run, return. */
- return;
- }
-
- /* Make sure dispose does not run twice. */
- self->priv->disposed = TRUE;
-
- parent_class->dispose (object);
-}
-
-static void
fs_participant_finalize (GObject *object)
{
FsParticipant *self = FS_PARTICIPANT (object);
@@ -172,7 +149,7 @@ fs_participant_finalize (GObject *object)
g_mutex_free (self->mutex);
- parent_class->finalize (object);
+ G_OBJECT_CLASS (fs_participant_parent_class)->finalize (object);
}
static void
diff --git a/gst-libs/gst/farsight/fs-plugin.c b/gst-libs/gst/farsight/fs-plugin.c
index 0fe2e75..ad33d07 100644
--- a/gst-libs/gst/farsight/fs-plugin.c
+++ b/gst-libs/gst/farsight/fs-plugin.c
@@ -56,19 +56,13 @@ static gchar **search_paths = NULL;
static GList *plugins = NULL;
-static GObjectClass *parent_class = NULL;
-
struct _FsPluginPrivate
{
GModule *handle;
- gboolean disposed;
};
G_DEFINE_TYPE(FsPlugin, fs_plugin, G_TYPE_TYPE_MODULE);
-static void fs_plugin_dispose (GObject * object);
-static void fs_plugin_finalize (GObject * object);
-
static void
fs_plugin_search_path_init (void)
{
@@ -99,14 +93,8 @@ fs_plugin_search_path_init (void)
static void
fs_plugin_class_init (FsPluginClass * klass)
{
- GObjectClass *gobject_class = G_OBJECT_CLASS(klass);
GTypeModuleClass *module_class = G_TYPE_MODULE_CLASS (klass);
- gobject_class->dispose = fs_plugin_dispose;
- gobject_class->finalize = fs_plugin_finalize;
-
- parent_class = g_type_class_peek_parent (klass);
-
module_class->load = fs_plugin_load;
g_type_class_add_private (klass, sizeof (FsPluginPrivate));
@@ -123,30 +111,6 @@ fs_plugin_init (FsPlugin * plugin)
/* member init */
plugin->priv = FS_PLUGIN_GET_PRIVATE (plugin);
plugin->priv->handle = NULL;
- plugin->priv->disposed = FALSE;
-}
-
-
-static void
-fs_plugin_dispose (GObject * object)
-{
- FsPlugin *plugin = FS_PLUGIN (object);
-
- if (plugin->priv->disposed) {
- /* If dispose did already run, return. */
- return;
- }
-
- /* Make sure dispose does not run twice. */
- plugin->priv->disposed = TRUE;
-
- parent_class->dispose (object);
-}
-
-static void
-fs_plugin_finalize (GObject * object)
-{
- parent_class->finalize (object);
}
static gboolean fs_plugin_load (GTypeModule *module)
diff --git a/gst-libs/gst/farsight/fs-session.c b/gst-libs/gst/farsight/fs-session.c
index a9450b0..8a0163e 100644
--- a/gst-libs/gst/farsight/fs-session.c
+++ b/gst-libs/gst/farsight/fs-session.c
@@ -125,7 +125,6 @@ static void fs_session_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec);
-static GObjectClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
static void
@@ -134,7 +133,6 @@ fs_session_class_init (FsSessionClass *klass)
GObjectClass *gobject_class;
gobject_class = (GObjectClass *) klass;
- parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = fs_session_set_property;
gobject_class->get_property = fs_session_get_property;
diff --git a/gst-libs/gst/farsight/fs-stream-transmitter.c b/gst-libs/gst/farsight/fs-stream-transmitter.c
index 09cdefb..a340df5 100644
--- a/gst-libs/gst/farsight/fs-stream-transmitter.c
+++ b/gst-libs/gst/farsight/fs-stream-transmitter.c
@@ -82,9 +82,6 @@ G_DEFINE_ABSTRACT_TYPE(FsStreamTransmitter, fs_stream_transmitter,
(G_TYPE_INSTANCE_GET_PRIVATE ((o), FS_TYPE_STREAM_TRANSMITTER, \
FsStreamTransmitterPrivate))
-static void fs_stream_transmitter_dispose (GObject *object);
-static void fs_stream_transmitter_finalize (GObject *object);
-
static void fs_stream_transmitter_get_property (GObject *object,
guint prop_id,
GValue *value,
@@ -94,7 +91,6 @@ static void fs_stream_transmitter_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec);
-static GObjectClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
static void
@@ -103,13 +99,11 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
GObjectClass *gobject_class;
gobject_class = (GObjectClass *) klass;
- parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = fs_stream_transmitter_set_property;
gobject_class->get_property = fs_stream_transmitter_get_property;
-
/**
* FsStreamTransmitter:sending:
*
@@ -273,9 +267,6 @@ fs_stream_transmitter_class_init (FsStreamTransmitterClass *klass)
G_TYPE_NONE, 2, G_TYPE_UINT, FS_TYPE_STREAM_STATE);
- gobject_class->dispose = fs_stream_transmitter_dispose;
- gobject_class->finalize = fs_stream_transmitter_finalize;
-
g_type_class_add_private (klass, sizeof (FsStreamTransmitterPrivate));
}
@@ -288,28 +279,6 @@ fs_stream_transmitter_init (FsStreamTransmitter *self)
}
static void
-fs_stream_transmitter_dispose (GObject *object)
-{
- FsStreamTransmitter *self = FS_STREAM_TRANSMITTER (object);
-
- if (self->priv->disposed) {
- /* If dispose did already run, return. */
- return;
- }
-
- /* Make sure dispose does not run twice. */
- self->priv->disposed = TRUE;
-
- parent_class->dispose (object);
-}
-
-static void
-fs_stream_transmitter_finalize (GObject *object)
-{
- parent_class->finalize (object);
-}
-
-static void
fs_stream_transmitter_get_property (GObject *object,
guint prop_id,
GValue *value,
diff --git a/gst-libs/gst/farsight/fs-stream.c b/gst-libs/gst/farsight/fs-stream.c
index d895634..c7f5393 100644
--- a/gst-libs/gst/farsight/fs-stream.c
+++ b/gst-libs/gst/farsight/fs-stream.c
@@ -156,7 +156,6 @@ static void fs_stream_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec);
-static GObjectClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
static void
@@ -165,7 +164,6 @@ fs_stream_class_init (FsStreamClass *klass)
GObjectClass *gobject_class;
gobject_class = (GObjectClass *) klass;
- parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = fs_stream_set_property;
gobject_class->get_property = fs_stream_get_property;
diff --git a/gst-libs/gst/farsight/fs-transmitter.c b/gst-libs/gst/farsight/fs-transmitter.c
index 6520204..69eebd3 100644
--- a/gst-libs/gst/farsight/fs-transmitter.c
+++ b/gst-libs/gst/farsight/fs-transmitter.c
@@ -65,19 +65,17 @@ enum
PROP_COMPONENTS
};
+/*
struct _FsTransmitterPrivate
{
- gboolean disposed;
};
+*/
G_DEFINE_ABSTRACT_TYPE(FsTransmitter, fs_transmitter, G_TYPE_OBJECT);
#define FS_TRANSMITTER_GET_PRIVATE(o) \
(G_TYPE_INSTANCE_GET_PRIVATE ((o), FS_TYPE_TRANSMITTER, FsTransmitterPrivate))
-static void fs_transmitter_dispose (GObject *object);
-static void fs_transmitter_finalize (GObject *object);
-
static void fs_transmitter_get_property (GObject *object,
guint prop_id,
GValue *value,
@@ -87,7 +85,6 @@ static void fs_transmitter_set_property (GObject *object,
const GValue *value,
GParamSpec *pspec);
-static GObjectClass *parent_class = NULL;
static guint signals[LAST_SIGNAL] = { 0 };
@@ -99,7 +96,6 @@ fs_transmitter_class_init (FsTransmitterClass *klass)
fs_base_conference_init_debug ();
gobject_class = (GObjectClass *) klass;
- parent_class = g_type_class_peek_parent (klass);
gobject_class->set_property = fs_transmitter_set_property;
gobject_class->get_property = fs_transmitter_get_property;
@@ -200,40 +196,13 @@ fs_transmitter_class_init (FsTransmitterClass *klass)
GST_TYPE_ELEMENT, 1, G_TYPE_UINT);
- gobject_class->dispose = fs_transmitter_dispose;
- gobject_class->finalize = fs_transmitter_finalize;
-
- g_type_class_add_private (klass, sizeof (FsTransmitterPrivate));
+ //g_type_class_add_private (klass, sizeof (FsTransmitterPrivate));
}
static void
fs_transmitter_init (FsTransmitter *self)
{
- /* member init */
- self->priv = FS_TRANSMITTER_GET_PRIVATE (self);
- self->priv->disposed = FALSE;
-}
-
-static void
-fs_transmitter_dispose (GObject *object)
-{
- FsTransmitter *self = FS_TRANSMITTER (object);
-
- if (self->priv->disposed) {
- /* If dispose did already run, return. */
- return;
- }
-
- /* Make sure dispose does not run twice. */
- self->priv->disposed = TRUE;
-
- parent_class->dispose (object);
-}
-
-static void
-fs_transmitter_finalize (GObject *object)
-{
- parent_class->finalize (object);
+ // self->priv = FS_TRANSMITTER_GET_PRIVATE (self);
}
static void
--
1.5.6.5
More information about the farsight-commits
mailing list