TrackTextOverlay: Move private variables to instance private

Add getter methods to get those variables

Add/Fixup documentation

diff --git a/docs/libs/ges-sections.txt b/docs/libs/ges-sections.txt
index fa9525e..390e758 100644 (file)
--- a/docs/libs/ges-sections.txt
+++ b/docs/libs/ges-sections.txt
@@ -591,6 +591,10 @@ ges_track_text_overlay_set_font_desc
 ges_track_text_overlay_set_halignment
 ges_track_text_overlay_set_text
 ges_track_text_overlay_set_valignment
+ges_track_text_overlay_get_font_desc
+ges_track_text_overlay_get_halignment
+ges_track_text_overlay_get_text
+ges_track_text_overlay_get_valignment
 <SUBSECTION Standard>
 GESTrackTextOverlayClass
 GESTrackTextOverlayPrivate

diff --git a/ges/ges-track-text-overlay.c b/ges/ges-track-text-overlay.c
index f75d00c..0aac9e1 100644 (file)
--- a/ges/ges-track-text-overlay.c
+++ b/ges/ges-track-text-overlay.c
@@ -35,8 +35,11 @@ G_DEFINE_TYPE (GESTrackTextOverlay, ges_track_text_overlay,
 
 struct _GESTrackTextOverlayPrivate
 {
-  /*  Dummy variable */
-  void *nothing;
+  gchar *text;
+  gchar *font_desc;
+  GESTextHAlign halign;
+  GESTextVAlign valign;
+  GstElement *text_el;
 };
 
 enum
@@ -79,28 +82,28 @@ ges_track_text_overlay_init (GESTrackTextOverlay * self)
   self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
       GES_TYPE_TRACK_TEXT_OVERLAY, GESTrackTextOverlayPrivate);
 
-  self->text = NULL;
-  self->font_desc = NULL;
-  self->text_el = NULL;
-  self->halign = DEFAULT_HALIGNMENT;
-  self->valign = DEFAULT_VALIGNMENT;
+  self->priv->text = NULL;
+  self->priv->font_desc = NULL;
+  self->priv->text_el = NULL;
+  self->priv->halign = DEFAULT_HALIGNMENT;
+  self->priv->valign = DEFAULT_VALIGNMENT;
 }
 
 static void
 ges_track_text_overlay_dispose (GObject * object)
 {
   GESTrackTextOverlay *self = GES_TRACK_TEXT_OVERLAY (object);
-  if (self->text) {
-    g_free (self->text);
+  if (self->priv->text) {
+    g_free (self->priv->text);
   }
 
-  if (self->font_desc) {
-    g_free (self->font_desc);
+  if (self->priv->font_desc) {
+    g_free (self->priv->font_desc);
   }
 
-  if (self->text_el) {
-    g_object_unref (self->text_el);
-    self->text_el = NULL;
+  if (self->priv->text_el) {
+    g_object_unref (self->priv->text_el);
+    self->priv->text_el = NULL;
   }
 
   G_OBJECT_CLASS (ges_track_text_overlay_parent_class)->dispose (object);
@@ -143,16 +146,16 @@ ges_track_text_overlay_create_element (GESTrackObject * object)
   text = gst_element_factory_make ("textoverlay", NULL);
   iconv = gst_element_factory_make ("ffmpegcolorspace", NULL);
   oconv = gst_element_factory_make ("ffmpegcolorspace", NULL);
-  self->text_el = text;
+  self->priv->text_el = text;
   g_object_ref (text);
 
-  if (self->text)
-    g_object_set (text, "text", (gchar *) self->text, NULL);
-  if (self->font_desc)
-    g_object_set (text, "font-desc", (gchar *) self->font_desc, NULL);
+  if (self->priv->text)
+    g_object_set (text, "text", (gchar *) self->priv->text, NULL);
+  if (self->priv->font_desc)
+    g_object_set (text, "font-desc", (gchar *) self->priv->font_desc, NULL);
 
-  g_object_set (text, "halignment", (gint) self->halign, "valignment",
-      (gint) self->valign, NULL);
+  g_object_set (text, "halignment", (gint) self->priv->halign, "valignment",
+      (gint) self->priv->valign, NULL);
 
   ret = gst_bin_new ("overlay-bin");
   gst_bin_add_many (GST_BIN (ret), text, iconv, oconv, NULL);
@@ -177,7 +180,7 @@ ges_track_text_overlay_create_element (GESTrackObject * object)
  * @self: the #GESTrackTextOverlay* to set text on
  * @text: the text to render. an internal copy of this text will be
  * made.
- * 
+ *
  * Sets the text this track object will render.
  *
  */
@@ -185,19 +188,19 @@ ges_track_text_overlay_create_element (GESTrackObject * object)
 void
 ges_track_text_overlay_set_text (GESTrackTextOverlay * self, const gchar * text)
 {
-  if (self->text)
-    g_free (self->text);
+  if (self->priv->text)
+    g_free (self->priv->text);
 
-  self->text = g_strdup (text);
-  if (self->text_el)
-    g_object_set (self->text_el, "text", text, NULL);
+  self->priv->text = g_strdup (text);
+  if (self->priv->text_el)
+    g_object_set (self->priv->text_el, "text", text, NULL);
 }
 
 /**
  * ges_track_text_overlay_set_font_desc:
  * @self: the #GESTrackTextOverlay
  * @font_desc: the pango font description
- * 
+ *
  * Sets the text this track object will render.
  *
  */
@@ -206,13 +209,13 @@ void
 ges_track_text_overlay_set_font_desc (GESTrackTextOverlay * self,
     const gchar * font_desc)
 {
-  if (self->font_desc)
-    g_free (self->font_desc);
+  if (self->priv->font_desc)
+    g_free (self->priv->font_desc);
 
-  self->font_desc = g_strdup (font_desc);
+  self->priv->font_desc = g_strdup (font_desc);
   GST_LOG ("setting font-desc to '%s'", font_desc);
-  if (self->text_el)
-    g_object_set (self->text_el, "font-desc", font_desc, NULL);
+  if (self->priv->text_el)
+    g_object_set (self->priv->text_el, "font-desc", font_desc, NULL);
 }
 
 /**
@@ -226,10 +229,10 @@ void
 ges_track_text_overlay_set_valignment (GESTrackTextOverlay * self,
     GESTextVAlign valign)
 {
-  self->valign = valign;
+  self->priv->valign = valign;
   GST_LOG ("set valignment to: %d", valign);
-  if (self->text_el)
-    g_object_set (self->text_el, "valignment", valign, NULL);
+  if (self->priv->text_el)
+    g_object_set (self->priv->text_el, "valignment", valign, NULL);
 }
 
 /**
@@ -243,10 +246,58 @@ void
 ges_track_text_overlay_set_halignment (GESTrackTextOverlay * self,
     GESTextHAlign halign)
 {
-  self->halign = halign;
+  self->priv->halign = halign;
   GST_LOG ("set halignment to: %d", halign);
-  if (self->text_el)
-    g_object_set (self->text_el, "halignment", halign, NULL);
+  if (self->priv->text_el)
+    g_object_set (self->priv->text_el, "halignment", halign, NULL);
+}
+
+/**
+ * ges_track_text_overlay_get_text:
+ * @self: a GESTrackTextOverlay
+ *
+ * Returns: The text currently set on the @source.
+ * */
+const gchar *
+ges_track_text_overlay_get_text (GESTrackTextOverlay * self)
+{
+  return self->priv->text;
+}
+
+/**
+ * ges_track_text_overlay_get_font_desc:
+ * @self: a GESTrackTextOverlay
+ *
+ * Returns: The pango font description used by the @source.
+ */
+const char *
+ges_track_text_overlay_get_font_desc (GESTrackTextOverlay * self)
+{
+  return self->priv->font_desc;
+}
+
+/**
+ * ges_track_text_overlay_get_halignment:
+ * @self: a GESTrackTextOverlay
+ *
+ * Returns: The horizontal aligment used by this @source.
+ */
+GESTextHAlign
+ges_track_text_overlay_get_halignment (GESTrackTextOverlay * self)
+{
+  return self->priv->halign;
+}
+
+/**
+ * ges_track_text_overlay_get_valignment:
+ * @self: a GESTrackTextOverlay
+ *
+ * Returns: The vertical aligment used by this @source.
+ */
+GESTextVAlign
+ges_track_text_overlay_get_valignment (GESTrackTextOverlay * self)
+{
+  return self->priv->valign;
 }
 
 GESTrackTextOverlay *

diff --git a/ges/ges-track-text-overlay.h b/ges/ges-track-text-overlay.h
index cc9c170..baa79ff 100644 (file)
--- a/ges/ges-track-text-overlay.h
+++ b/ges/ges-track-text-overlay.h
@@ -51,15 +51,9 @@ typedef struct _GESTrackTextOverlayPrivate GESTrackTextOverlayPrivate;
  * GESTrackTextOverlay:
  */
 struct _GESTrackTextOverlay {
-  /*< private >*/
   GESTrackOperation parent;
 
-  gchar         *text;
-  gchar         *font_desc;
-  GESTextHAlign halign;
-  GESTextVAlign valign;
-  GstElement    *text_el;
-
+  /*< private >*/
   GESTrackTextOverlayPrivate *priv;
 
   /* Padding for API extension */
@@ -77,21 +71,24 @@ struct _GESTrackTextOverlayClass {
 
 GType ges_track_text_overlay_get_type (void);
 
-void ges_track_text_overlay_set_text(GESTrackTextOverlay *self, const
-    gchar *text);
-
+void ges_track_text_overlay_set_text(GESTrackTextOverlay *self,
+                                     const gchar *text);
 void ges_track_text_overlay_set_font_desc(GESTrackTextOverlay *self,
-    const gchar *font_desc);
+                                          const gchar *font_desc);
+
+void ges_track_text_overlay_set_halignment(GESTrackTextOverlay *self,
+                                           GESTextHAlign halgn);
 
-void ges_track_text_overlay_set_halignment(GESTrackTextOverlay
-    *self, GESTextHAlign halgn);
+void ges_track_text_overlay_set_valignment(GESTrackTextOverlay *self,
+                                           GESTextVAlign valign);
 
-void ges_track_text_overlay_set_valignment(GESTrackTextOverlay
-    *self, GESTextVAlign valign);
+const gchar *ges_track_text_overlay_get_text(GESTrackTextOverlay *self);
+const char *ges_track_text_overlay_get_font_desc(GESTrackTextOverlay *self);
+GESTextHAlign ges_track_text_overlay_get_halignment(GESTrackTextOverlay *self);
+GESTextVAlign ges_track_text_overlay_get_valignment(GESTrackTextOverlay *self);
 
 GESTrackTextOverlay* ges_track_text_overlay_new (void);
 
 G_END_DECLS
 
 #endif /* _GES_TRACK_TEXT_OVERLAY */
-

diff --git a/tests/check/ges/overlays.c b/tests/check/ges/overlays.c
index 79a300e..4d6df7c 100644 (file)
--- a/tests/check/ges/overlays.c
+++ b/tests/check/ges/overlays.c
@@ -147,8 +147,8 @@ GST_START_TEST (test_overlay_in_layer)
   assert_equals_string ("sans 72", text);
   g_free (text);
 
-  text = ((GESTrackTextOverlay *) trobj)->font_desc;
-  assert_equals_string ("sans 72", text);
+  assert_equals_string ("sans 72",
+      ges_track_text_overlay_get_font_desc (GES_TRACK_TEXT_OVERLAY (trobj)));
 
   /* test halign and valign */
   g_object_set (source, "halignment", (gint)
@@ -157,8 +157,10 @@ GST_START_TEST (test_overlay_in_layer)
   assert_equals_int (halign, GES_TEXT_HALIGN_LEFT);
   assert_equals_int (valign, GES_TEXT_VALIGN_TOP);
 
-  halign = ((GESTrackTextOverlay *) trobj)->halign;
-  valign = ((GESTrackTextOverlay *) trobj)->valign;
+  halign =
+      ges_track_text_overlay_get_halignment (GES_TRACK_TEXT_OVERLAY (trobj));
+  valign =
+      ges_track_text_overlay_get_valignment (GES_TRACK_TEXT_OVERLAY (trobj));
   assert_equals_int (halign, GES_TEXT_HALIGN_LEFT);
   assert_equals_int (valign, GES_TEXT_VALIGN_TOP);
 

diff --git a/tests/check/ges/text_properties.c b/tests/check/ges/text_properties.c
index 7f36895..3dd20b5 100644 (file)
--- a/tests/check/ges/text_properties.c
+++ b/tests/check/ges/text_properties.c
@@ -82,8 +82,8 @@ GST_START_TEST (test_text_properties_in_layer)
   assert_equals_string ("sans 72", text);
   g_free (text);
 
-  text = ((GESTrackTextOverlay *) trobj)->font_desc;
-  assert_equals_string ("sans 72", text);
+  assert_equals_string ("sans 72",
+      ges_track_text_overlay_get_font_desc (GES_TRACK_TEXT_OVERLAY (trobj)));
 
   g_object_set (source, "text", (gchar *) NULL, NULL);
   assert_equals_int (trobj->active, FALSE);
@@ -95,8 +95,10 @@ GST_START_TEST (test_text_properties_in_layer)
   assert_equals_int (halign, GES_TEXT_HALIGN_LEFT);
   assert_equals_int (valign, GES_TEXT_VALIGN_TOP);
 
-  halign = ((GESTrackTextOverlay *) trobj)->halign;
-  valign = ((GESTrackTextOverlay *) trobj)->valign;
+  halign =
+      ges_track_text_overlay_get_halignment (GES_TRACK_TEXT_OVERLAY (trobj));
+  valign =
+      ges_track_text_overlay_get_valignment (GES_TRACK_TEXT_OVERLAY (trobj));
   assert_equals_int (halign, GES_TEXT_HALIGN_LEFT);
   assert_equals_int (valign, GES_TEXT_VALIGN_TOP);