Trivial cleanup; rename client_data field

util (aka GOmx) needs to be further integrated.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>

21 files changed, 22 insertions, 22 deletions

diff --git a/omx/gstomx_aacdec.c b/omx/gstomx_aacdec.c
index dd1d417..2ec2b4d 100644
--- a/omx/gstomx_aacdec.c
+++ b/omx/gstomx_aacdec.c
@@ -137,7 +137,7 @@ settings_changed_cb (GOmxCore *core)
     guint rate;
     guint channels;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
 
diff --git a/omx/gstomx_adpcmenc.c b/omx/gstomx_adpcmenc.c
index 16edd67..967ebf9 100644
--- a/omx/gstomx_adpcmenc.c
+++ b/omx/gstomx_adpcmenc.c
@@ -110,7 +110,7 @@ settings_changed_cb (GOmxCore *core)
     GstOmxBaseFilter *omx_base;
     guint rate;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
 
diff --git a/omx/gstomx_amrnbdec.c b/omx/gstomx_amrnbdec.c
index a1f70f4..bdacb06 100644
--- a/omx/gstomx_amrnbdec.c
+++ b/omx/gstomx_amrnbdec.c
@@ -110,7 +110,7 @@ settings_changed_cb (GOmxCore *core)
     guint rate;
     guint channels;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
 
diff --git a/omx/gstomx_amrnbenc.c b/omx/gstomx_amrnbenc.c
index e2f6549..d8b921b 100644
--- a/omx/gstomx_amrnbenc.c
+++ b/omx/gstomx_amrnbenc.c
@@ -175,7 +175,7 @@ settings_changed_cb (GOmxCore *core)
     GstOmxBaseFilter *omx_base;
     guint channels;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
 
diff --git a/omx/gstomx_amrwbdec.c b/omx/gstomx_amrwbdec.c
index f9ef17e..0914f84 100644
--- a/omx/gstomx_amrwbdec.c
+++ b/omx/gstomx_amrwbdec.c
@@ -110,7 +110,7 @@ settings_changed_cb (GOmxCore *core)
     guint rate;
     guint channels;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
 
diff --git a/omx/gstomx_amrwbenc.c b/omx/gstomx_amrwbenc.c
index 99a139a..176ccb3 100644
--- a/omx/gstomx_amrwbenc.c
+++ b/omx/gstomx_amrwbenc.c
@@ -175,7 +175,7 @@ settings_changed_cb (GOmxCore *core)
     GstOmxBaseFilter *omx_base;
     guint channels;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
 
diff --git a/omx/gstomx_base_filter.c b/omx/gstomx_base_filter.c
index 8d1ade2..1c80589 100644
--- a/omx/gstomx_base_filter.c
+++ b/omx/gstomx_base_filter.c
@@ -877,7 +877,7 @@ type_instance_init (GTypeInstance *instance,
     {
         GOmxCore *gomx;
         self->gomx = gomx = g_omx_core_new ();
-        gomx->client_data = self;
+        gomx->object = self;
     }
 
     self->ready_lock = g_mutex_new ();
diff --git a/omx/gstomx_base_sink.c b/omx/gstomx_base_sink.c
index 6f6499f..086473d 100644
--- a/omx/gstomx_base_sink.c
+++ b/omx/gstomx_base_sink.c
@@ -463,7 +463,7 @@ type_instance_init (GTypeInstance *instance,
     {
         GOmxCore *gomx;
         self->gomx = gomx = g_omx_core_new ();
-        gomx->client_data = self;
+        gomx->object = self;
     }
 
     {
diff --git a/omx/gstomx_base_src.c b/omx/gstomx_base_src.c
index 2f5cb4d..e88772e 100644
--- a/omx/gstomx_base_src.c
+++ b/omx/gstomx_base_src.c
@@ -455,7 +455,7 @@ type_instance_init (GTypeInstance *instance,
     {
         GOmxCore *gomx;
         self->gomx = gomx = g_omx_core_new ();
-        gomx->client_data = self;
+        gomx->object = self;
     }
 
     {
diff --git a/omx/gstomx_base_videodec.c b/omx/gstomx_base_videodec.c
index a217ad3..e085100 100644
--- a/omx/gstomx_base_videodec.c
+++ b/omx/gstomx_base_videodec.c
@@ -103,7 +103,7 @@ settings_changed_cb (GOmxCore *core)
     guint height;
     guint32 format = 0;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
     self = GST_OMX_BASE_VIDEODEC (omx_base);
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
diff --git a/omx/gstomx_filereadersrc.c b/omx/gstomx_filereadersrc.c
index f634fa2..cea5ca9 100644
--- a/omx/gstomx_filereadersrc.c
+++ b/omx/gstomx_filereadersrc.c
@@ -90,7 +90,7 @@ settings_changed_cb (GOmxCore *core)
 {
     GstOmxBaseSrc *omx_base;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
 
diff --git a/omx/gstomx_g729dec.c b/omx/gstomx_g729dec.c
index 1b19818..1aefa60 100644
--- a/omx/gstomx_g729dec.c
+++ b/omx/gstomx_g729dec.c
@@ -111,7 +111,7 @@ settings_changed_cb (GOmxCore *core)
 {
     GstOmxBaseFilter *omx_base;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
 
diff --git a/omx/gstomx_h263enc.c b/omx/gstomx_h263enc.c
index 6fd3fdc..90237e4 100644
--- a/omx/gstomx_h263enc.c
+++ b/omx/gstomx_h263enc.c
@@ -85,7 +85,7 @@ settings_changed_cb (GOmxCore *core)
     guint width;
     guint height;
 
-    omx_base_filter = core->client_data;
+    omx_base_filter = core->object;
     omx_base = GST_OMX_BASE_VIDEOENC (omx_base_filter);
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
diff --git a/omx/gstomx_h264enc.c b/omx/gstomx_h264enc.c
index 8f8437a..3dbf245 100644
--- a/omx/gstomx_h264enc.c
+++ b/omx/gstomx_h264enc.c
@@ -84,7 +84,7 @@ settings_changed_cb (GOmxCore *core)
     guint width;
     guint height;
 
-    omx_base_filter = core->client_data;
+    omx_base_filter = core->object;
     omx_base = GST_OMX_BASE_VIDEOENC (omx_base_filter);
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
diff --git a/omx/gstomx_jpegenc.c b/omx/gstomx_jpegenc.c
index 2b23a3d..b6983ec 100644
--- a/omx/gstomx_jpegenc.c
+++ b/omx/gstomx_jpegenc.c
@@ -199,7 +199,7 @@ settings_changed_cb (GOmxCore *core)
     guint width;
     guint height;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
     self = GST_OMX_JPEGENC (omx_base);
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
diff --git a/omx/gstomx_mp2dec.c b/omx/gstomx_mp2dec.c
index 9cd016a..90dcb7f 100644
--- a/omx/gstomx_mp2dec.c
+++ b/omx/gstomx_mp2dec.c
@@ -113,7 +113,7 @@ settings_changed_cb (GOmxCore *core)
     guint rate;
     guint channels;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
 
diff --git a/omx/gstomx_mp3dec.c b/omx/gstomx_mp3dec.c
index 93bf112..ad53d29 100644
--- a/omx/gstomx_mp3dec.c
+++ b/omx/gstomx_mp3dec.c
@@ -113,7 +113,7 @@ settings_changed_cb (GOmxCore *core)
     guint rate;
     guint channels;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
 
diff --git a/omx/gstomx_mpeg4enc.c b/omx/gstomx_mpeg4enc.c
index ba98b6e..8f40da1 100644
--- a/omx/gstomx_mpeg4enc.c
+++ b/omx/gstomx_mpeg4enc.c
@@ -86,7 +86,7 @@ settings_changed_cb (GOmxCore *core)
     guint width;
     guint height;
 
-    omx_base_filter = core->client_data;
+    omx_base_filter = core->object;
     omx_base = GST_OMX_BASE_VIDEOENC (omx_base_filter);
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
diff --git a/omx/gstomx_util.h b/omx/gstomx_util.h
index 4e8a957..0e6ab76 100644
--- a/omx/gstomx_util.h
+++ b/omx/gstomx_util.h
@@ -72,6 +72,8 @@ struct GOmxImp
 
 struct GOmxCore
 {
+    gpointer object; /**< GStreamer element. */
+
     OMX_HANDLETYPE omx_handle;
     OMX_ERRORTYPE omx_error;
 
@@ -81,8 +83,6 @@ struct GOmxCore
 
     GPtrArray *ports;
 
-    gpointer client_data; /**< Placeholder for the client data. */
-
     GSem *done_sem;
     GSem *flush_sem;
     GSem *port_sem;
diff --git a/omx/gstomx_volume.c b/omx/gstomx_volume.c
index d57029f..3fbc4e9 100644
--- a/omx/gstomx_volume.c
+++ b/omx/gstomx_volume.c
@@ -115,7 +115,7 @@ settings_changed_cb (GOmxCore *core)
     guint rate;
     guint channels;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");
 
diff --git a/omx/gstomx_vorbisdec.c b/omx/gstomx_vorbisdec.c
index 982fe0c..437dc90 100644
--- a/omx/gstomx_vorbisdec.c
+++ b/omx/gstomx_vorbisdec.c
@@ -108,7 +108,7 @@ settings_changed_cb (GOmxCore *core)
     guint rate;
     guint channels;
 
-    omx_base = core->client_data;
+    omx_base = core->object;
 
     GST_DEBUG_OBJECT (omx_base, "settings changed");