*.*: Ran scripts/update-macros. Oh yes.

Original commit message from CVS:
2005-11-21  Andy Wingo  <wingo@pobox.com>

* *.h:
* *.c: Ran scripts/update-macros. Oh yes.

4 files changed, 36 insertions, 36 deletions

diff --git a/gst/debug/breakmydata.c b/gst/debug/breakmydata.c
index f9e3be2a..724ac4fd 100644
--- a/gst/debug/breakmydata.c
+++ b/gst/debug/breakmydata.c
@@ -163,7 +163,7 @@ gst_break_my_data_set_property (GObject * object, guint prop_id,
 {
   GstBreakMyData *bmd = GST_BREAK_MY_DATA (object);
 
-  GST_LOCK (bmd);
+  GST_OBJECT_LOCK (bmd);
 
   switch (prop_id) {
     case ARG_SEED:
@@ -183,7 +183,7 @@ gst_break_my_data_set_property (GObject * object, guint prop_id,
       break;
   }
 
-  GST_UNLOCK (bmd);
+  GST_OBJECT_UNLOCK (bmd);
 }
 
 static void
@@ -192,7 +192,7 @@ gst_break_my_data_get_property (GObject * object, guint prop_id, GValue * value,
 {
   GstBreakMyData *bmd = GST_BREAK_MY_DATA (object);
 
-  GST_LOCK (bmd);
+  GST_OBJECT_LOCK (bmd);
 
   switch (prop_id) {
     case ARG_SEED:
@@ -212,7 +212,7 @@ gst_break_my_data_get_property (GObject * object, guint prop_id, GValue * value,
       break;
   }
 
-  GST_UNLOCK (bmd);
+  GST_OBJECT_UNLOCK (bmd);
 }
 
 static GstFlowReturn
@@ -223,7 +223,7 @@ gst_break_my_data_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
 
   g_return_val_if_fail (gst_buffer_is_writable (buf), GST_FLOW_ERROR);
 
-  GST_LOCK (bmd);
+  GST_OBJECT_LOCK (bmd);
 
   if (bmd->skipped < bmd->skip) {
     i = bmd->skip - bmd->skipped;
@@ -256,7 +256,7 @@ gst_break_my_data_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
   /* don't overflow */
   bmd->skipped += MIN (G_MAXUINT - bmd->skipped, GST_BUFFER_SIZE (buf));
 
-  GST_UNLOCK (bmd);
+  GST_OBJECT_UNLOCK (bmd);
 
   return GST_FLOW_OK;
 }
@@ -266,10 +266,10 @@ gst_break_my_data_start (GstBaseTransform * trans)
 {
   GstBreakMyData *bmd = GST_BREAK_MY_DATA (trans);
 
-  GST_LOCK (bmd);
+  GST_OBJECT_LOCK (bmd);
   bmd->rand = g_rand_new_with_seed (bmd->seed);
   bmd->skipped = 0;
-  GST_UNLOCK (bmd);
+  GST_OBJECT_UNLOCK (bmd);
 
   return TRUE;
 }
@@ -279,10 +279,10 @@ gst_break_my_data_stop (GstBaseTransform * trans)
 {
   GstBreakMyData *bmd = GST_BREAK_MY_DATA (trans);
 
-  GST_LOCK (bmd);
+  GST_OBJECT_LOCK (bmd);
   g_rand_free (bmd->rand);
   bmd->rand = NULL;
-  GST_UNLOCK (bmd);
+  GST_OBJECT_UNLOCK (bmd);
 
   return TRUE;
 }
diff --git a/gst/debug/gstnavseek.c b/gst/debug/gstnavseek.c
index fc1e7430..ac642cda 100644
--- a/gst/debug/gstnavseek.c
+++ b/gst/debug/gstnavseek.c
@@ -254,9 +254,9 @@ gst_navseek_set_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case ARG_SEEKOFFSET:
-      GST_LOCK (navseek);
+      GST_OBJECT_LOCK (navseek);
       navseek->seek_offset = g_value_get_double (value);
-      GST_UNLOCK (navseek);
+      GST_OBJECT_UNLOCK (navseek);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -272,9 +272,9 @@ gst_navseek_get_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case ARG_SEEKOFFSET:
-      GST_LOCK (navseek);
+      GST_OBJECT_LOCK (navseek);
       g_value_set_double (value, navseek->seek_offset);
-      GST_UNLOCK (navseek);
+      GST_OBJECT_UNLOCK (navseek);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -289,10 +289,10 @@ gst_navseek_event (GstBaseTransform * trans, GstEvent * event)
 
   switch (GST_EVENT_TYPE (event)) {
     case GST_EVENT_EOS:
-      GST_LOCK (navseek);
+      GST_OBJECT_LOCK (navseek);
       if (navseek->loop)
         gst_navseek_segseek (navseek);
-      GST_UNLOCK (navseek);
+      GST_OBJECT_UNLOCK (navseek);
       break;
     default:
       break;
@@ -305,7 +305,7 @@ gst_navseek_transform_ip (GstBaseTransform * basetrans, GstBuffer * buf)
 {
   GstNavSeek *navseek = GST_NAVSEEK (basetrans);
 
-  GST_LOCK (navseek);
+  GST_OBJECT_LOCK (navseek);
 
   if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
     if (navseek->grab_seg_start) {
@@ -321,7 +321,7 @@ gst_navseek_transform_ip (GstBaseTransform * basetrans, GstBuffer * buf)
     }
   }
 
-  GST_UNLOCK (navseek);
+  GST_OBJECT_UNLOCK (navseek);
 
   return GST_FLOW_OK;
 }
diff --git a/gst/debug/progressreport.c b/gst/debug/progressreport.c
index d60579b2..09e015c7 100644
--- a/gst/debug/progressreport.c
+++ b/gst/debug/progressreport.c
@@ -167,7 +167,7 @@ gst_progress_report_report (GstProgressReport * filter, GTimeVal cur_time)
   gint hh, mm, ss, i;
   glong run_time;
 
-  GST_LOCK (filter);
+  GST_OBJECT_LOCK (filter);
   run_time = cur_time.tv_sec - filter->start_time.tv_sec;
 
   hh = (run_time / 3600) % 100;
@@ -252,7 +252,7 @@ gst_progress_report_report (GstProgressReport * filter, GTimeVal cur_time)
         GST_OBJECT_NAME (filter), hh, mm, ss);
   }
 
-  GST_UNLOCK (filter);
+  GST_OBJECT_UNLOCK (filter);
 
   gst_object_unref (peer_pad);
 }
@@ -285,16 +285,16 @@ gst_progress_report_transform_ip (GstBaseTransform * trans, GstBuffer * buf)
   filter = GST_PROGRESS_REPORT (trans);
 
   /* Check if update_freq seconds have passed since the last update */
-  GST_LOCK (filter);
+  GST_OBJECT_LOCK (filter);
   need_update =
       ((cur_time.tv_sec - filter->last_report.tv_sec) >= filter->update_freq);
-  GST_UNLOCK (filter);
+  GST_OBJECT_UNLOCK (filter);
 
   if (need_update) {
     gst_progress_report_report (filter, cur_time);
-    GST_LOCK (filter);
+    GST_OBJECT_LOCK (filter);
     filter->last_report = cur_time;
-    GST_UNLOCK (filter);
+    GST_OBJECT_UNLOCK (filter);
   }
 
   return GST_FLOW_OK;
@@ -330,14 +330,14 @@ gst_progress_report_set_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case ARG_UPDATE_FREQ:
-      GST_LOCK (filter);
+      GST_OBJECT_LOCK (filter);
       filter->update_freq = g_value_get_int (value);
-      GST_UNLOCK (filter);
+      GST_OBJECT_UNLOCK (filter);
       break;
     case ARG_SILENT:
-      GST_LOCK (filter);
+      GST_OBJECT_LOCK (filter);
       filter->silent = g_value_get_boolean (value);
-      GST_UNLOCK (filter);
+      GST_OBJECT_UNLOCK (filter);
       break;
     default:
       break;
@@ -354,14 +354,14 @@ gst_progress_report_get_property (GObject * object, guint prop_id,
 
   switch (prop_id) {
     case ARG_UPDATE_FREQ:
-      GST_LOCK (filter);
+      GST_OBJECT_LOCK (filter);
       g_value_set_int (value, filter->update_freq);
-      GST_UNLOCK (filter);
+      GST_OBJECT_UNLOCK (filter);
       break;
     case ARG_SILENT:
-      GST_LOCK (filter);
+      GST_OBJECT_LOCK (filter);
       g_value_set_boolean (value, filter->silent);
-      GST_UNLOCK (filter);
+      GST_OBJECT_UNLOCK (filter);
       break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
diff --git a/gst/debug/testplugin.c b/gst/debug/testplugin.c
index e5ad0db1..d176e09c 100644
--- a/gst/debug/testplugin.c
+++ b/gst/debug/testplugin.c
@@ -263,9 +263,9 @@ gst_test_set_property (GObject * object, guint prop_id,
     G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
   } else {
     /* expected values */
-    GST_LOCK (test);
+    GST_OBJECT_LOCK (test);
     g_value_copy (value, &test->values[prop_id / 2 - 1]);
-    GST_UNLOCK (test);
+    GST_OBJECT_UNLOCK (test);
   }
 }
 
@@ -281,7 +281,7 @@ gst_test_get_property (GObject * object, guint prop_id, GValue * value,
     return;
   }
 
-  GST_LOCK (test);
+  GST_OBJECT_LOCK (test);
 
   if (prop_id % 2) {
     /* real values */
@@ -291,7 +291,7 @@ gst_test_get_property (GObject * object, guint prop_id, GValue * value,
     g_value_copy (&test->values[id], value);
   }
 
-  GST_UNLOCK (test);
+  GST_OBJECT_UNLOCK (test);
 }
 
 gboolean