auto-video-sink: rename to avoid GType name conflict with 2.0 version

2 files changed, 20 insertions, 21 deletions

diff --git a/clutter-gst/clutter-gst-auto-video-sink.c b/clutter-gst/clutter-gst-auto-video-sink.c
index a993bd6..e8c9454 100644
--- a/clutter-gst/clutter-gst-auto-video-sink.c
+++ b/clutter-gst/clutter-gst-auto-video-sink.c
@@ -42,8 +42,8 @@ enum
 static GstStateChangeReturn
 clutter_gst_auto_video_sink_change_state (GstElement     *element,
                                           GstStateChange  transition);
-static void clutter_gst_auto_video_sink_dispose (ClutterGstAutoVideoSink *sink);
-static void clutter_gst_auto_video_sink_clear_kid (ClutterGstAutoVideoSink *sink);
+static void clutter_gst_auto_video_sink_dispose (ClutterGstAutoVideoSink3 *sink);
+static void clutter_gst_auto_video_sink_clear_kid (ClutterGstAutoVideoSink3 *sink);
 
 static void clutter_gst_auto_video_sink_set_property (GObject      *object,
                                                       guint         prop_id,
@@ -55,7 +55,7 @@ static void clutter_gst_auto_video_sink_get_property (GObject    *object,
                                                       GParamSpec *pspec);
 
 #define clutter_gst_auto_video_sink_parent_class parent_class
-G_DEFINE_TYPE (ClutterGstAutoVideoSink,
+G_DEFINE_TYPE (ClutterGstAutoVideoSink3,
                clutter_gst_auto_video_sink,
                GST_TYPE_BIN)
 
@@ -77,7 +77,7 @@ _clutter_init (void)
 }
 
 static void
-clutter_gst_auto_video_sink_class_init (ClutterGstAutoVideoSinkClass *klass)
+clutter_gst_auto_video_sink_class_init (ClutterGstAutoVideoSink3Class *klass)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
   GstElementClass *eklass = GST_ELEMENT_CLASS (klass);
@@ -124,7 +124,7 @@ clutter_gst_auto_video_sink_class_init (ClutterGstAutoVideoSinkClass *klass)
 }
 
 static void
-clutter_gst_auto_video_sink_dispose (ClutterGstAutoVideoSink *sink)
+clutter_gst_auto_video_sink_dispose (ClutterGstAutoVideoSink3 *sink)
 {
   clutter_gst_auto_video_sink_clear_kid (sink);
 
@@ -132,7 +132,7 @@ clutter_gst_auto_video_sink_dispose (ClutterGstAutoVideoSink *sink)
 }
 
 static void
-clutter_gst_auto_video_sink_clear_kid (ClutterGstAutoVideoSink *sink)
+clutter_gst_auto_video_sink_clear_kid (ClutterGstAutoVideoSink3 *sink)
 {
   if (sink->kid)
     {
@@ -150,7 +150,7 @@ clutter_gst_auto_video_sink_clear_kid (ClutterGstAutoVideoSink *sink)
  */
 
 static void
-clutter_gst_auto_video_sink_reset (ClutterGstAutoVideoSink *sink)
+clutter_gst_auto_video_sink_reset (ClutterGstAutoVideoSink3 *sink)
 {
   GstPad *targetpad;
 
@@ -169,7 +169,7 @@ clutter_gst_auto_video_sink_reset (ClutterGstAutoVideoSink *sink)
 }
 
 static void
-clutter_gst_auto_video_sink_init (ClutterGstAutoVideoSink *sink)
+clutter_gst_auto_video_sink_init (ClutterGstAutoVideoSink3 *sink)
 {
   sink->ts_offset = DEFAULT_TS_OFFSET;
 
@@ -190,7 +190,7 @@ clutter_gst_auto_video_sink_set_property (GObject      *object,
                                           const GValue *value,
                                           GParamSpec   *pspec)
 {
-  ClutterGstAutoVideoSink *sink = CLUTTER_GST_AUTO_VIDEO_SINK (object);
+  ClutterGstAutoVideoSink3 *sink = CLUTTER_GST_AUTO_VIDEO_SINK (object);
 
   switch (prop_id)
     {
@@ -200,8 +200,7 @@ clutter_gst_auto_video_sink_set_property (GObject      *object,
         g_object_set_property (G_OBJECT (sink->kid), pspec->name, value);
       break;
     case PROP_CONTENT:
-      if (sink->content != NULL)
-        g_clear_object (&sink->content);
+      g_clear_object (&sink->content);
       sink->content = g_value_get_object (value);
       break;
     default:
@@ -216,7 +215,7 @@ clutter_gst_auto_video_sink_get_property (GObject    *object,
                                           GValue     *value,
                                           GParamSpec *pspec)
 {
-  ClutterGstAutoVideoSink *sink = CLUTTER_GST_AUTO_VIDEO_SINK (object);
+  ClutterGstAutoVideoSink3 *sink = CLUTTER_GST_AUTO_VIDEO_SINK (object);
 
   switch (prop_id)
     {
@@ -237,7 +236,7 @@ clutter_gst_auto_video_sink_change_state (GstElement     *element,
                                           GstStateChange  transition)
 {
   GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
-  ClutterGstAutoVideoSink *sink = CLUTTER_GST_AUTO_VIDEO_SINK (element);
+  ClutterGstAutoVideoSink3 *sink = CLUTTER_GST_AUTO_VIDEO_SINK (element);
 
   switch (transition) {
   case GST_STATE_CHANGE_NULL_TO_READY:
diff --git a/clutter-gst/clutter-gst-auto-video-sink.h b/clutter-gst/clutter-gst-auto-video-sink.h
index 7c0f396..f0b58a9 100644
--- a/clutter-gst/clutter-gst-auto-video-sink.h
+++ b/clutter-gst/clutter-gst-auto-video-sink.h
@@ -38,20 +38,20 @@ G_BEGIN_DECLS
 #define CLUTTER_GST_AUTO_VIDEO_SINK(obj) \
   (G_TYPE_CHECK_INSTANCE_CAST((obj), \
                               CLUTTER_GST_TYPE_AUTO_VIDEO_SINK, \
-                              ClutterGstAutoVideoSink))
+                              ClutterGstAutoVideoSink3))
 
 #define CLUTTER_GST_AUTO_VIDEO_SINK_CAST(obj) \
-  ((ClutterGstAutoVideoSink *)(obj))
+  ((ClutterGstAutoVideoSink3 *)(obj))
 
 #define CLUTTER_GST_AUTO_VIDEO_SINK_CLASS(klass) \
   (G_TYPE_CHECK_CLASS_CAST((klass), \
                            CLUTTER_GST_TYPE_AUTO_VIDEO_SINK, \
-                           ClutterGstAutoVideoSinkClass))
+                           ClutterGstAutoVideoSink3Class))
 
 #define CLUTTER_GST_AUTO_VIDEO_SINK_GET_CLASS(obj) \
   (G_TYPE_INSTANCE_GET_CLASS ((obj), \
                               CLUTTER_GST_TYPE_AUTO_VIDEO_SINK, \
-                              ClutterGstAutoVideoSinkClass))
+                              ClutterGstAutoVideoSink3Class))
 
 #define CLUTTER_GST_IS_AUTO_VIDEO_SINK(obj) \
   (G_TYPE_CHECK_INSTANCE_TYPE((obj), \
@@ -78,10 +78,10 @@ G_BEGIN_DECLS
     g_mutex_unlock (&CLUTTER_GST_AUTO_VIDEO_SINK(obj)->lock);            \
 } G_STMT_END
 
-typedef struct _ClutterGstAutoVideoSink ClutterGstAutoVideoSink;
-typedef struct _ClutterGstAutoVideoSinkClass ClutterGstAutoVideoSinkClass;
+typedef struct _ClutterGstAutoVideoSink3 ClutterGstAutoVideoSink3;
+typedef struct _ClutterGstAutoVideoSink3Class ClutterGstAutoVideoSink3Class;
 
-struct _ClutterGstAutoVideoSink
+struct _ClutterGstAutoVideoSink3
 {
   GstBin parent;
 
@@ -92,7 +92,7 @@ struct _ClutterGstAutoVideoSink
   ClutterContent *content;
 };
 
-struct _ClutterGstAutoVideoSinkClass
+struct _ClutterGstAutoVideoSink3Class
 {
   GstBinClass parent_class;
 };