*.*: 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.

2 files changed, 11 insertions, 11 deletions

diff --git a/sys/oss/gstossdmabuffer.c b/sys/oss/gstossdmabuffer.c
index 58336c09..5db58465 100644
--- a/sys/oss/gstossdmabuffer.c
+++ b/sys/oss/gstossdmabuffer.c
@@ -128,12 +128,12 @@ gst_ossdmabuffer_func (GstRingBuffer * buf)
   struct count_info count;
   GstOssDMABuffer *obuf = (GstOssDMABuffer *) buf;
 
-  GST_LOCK (buf);
+  GST_OBJECT_LOCK (buf);
   while (obuf->running) {
     if (buf->state == GST_RINGBUFFER_STATE_PLAYING) {
       int segsize;
 
-      GST_UNLOCK (buf);
+      GST_OBJECT_UNLOCK (buf);
 
       segsize = buf->spec.segsize;
 
@@ -152,13 +152,13 @@ gst_ossdmabuffer_func (GstRingBuffer * buf)
 
       gst_ringbuffer_callback (buf, count.blocks);
 
-      GST_LOCK (buf);
+      GST_OBJECT_LOCK (buf);
     } else {
       GST_OSSDMABUFFER_SIGNAL (obuf);
       GST_OSSDMABUFFER_WAIT (obuf);
     }
   }
-  GST_UNLOCK (buf);
+  GST_OBJECT_UNLOCK (buf);
 }
 
 static gboolean
@@ -256,12 +256,12 @@ gst_ossdmabuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec)
     return FALSE;
   }
 
-  GST_LOCK (obuf);
+  GST_OBJECT_LOCK (obuf);
   obuf->running = TRUE;
   obuf->thread = g_thread_create ((GThreadFunc) gst_ossdmabuffer_func,
       buf, TRUE, NULL);
   GST_OSSDMABUFFER_WAIT (obuf);
-  GST_UNLOCK (obuf);
+  GST_OBJECT_UNLOCK (obuf);
 
   return TRUE;
 }
@@ -273,10 +273,10 @@ gst_ossdmabuffer_release (GstRingBuffer * buf)
 
   gst_buffer_unref (buf->data);
 
-  GST_LOCK (obuf);
+  GST_OBJECT_LOCK (obuf);
   obuf->running = FALSE;
   GST_OSSDMABUFFER_SIGNAL (obuf);
-  GST_UNLOCK (obuf);
+  GST_OBJECT_UNLOCK (obuf);
 
   g_thread_join (obuf->thread);
 
diff --git a/sys/oss/gstossdmabuffer.h b/sys/oss/gstossdmabuffer.h
index fef24923..27b62fab 100644
--- a/sys/oss/gstossdmabuffer.h
+++ b/sys/oss/gstossdmabuffer.h
@@ -46,11 +46,11 @@ typedef struct _GstOssDMABuffer GstOssDMABuffer;
 typedef struct _GstOssDMABufferClass GstOssDMABufferClass;
 
 #define GST_OSSDMABUFFER_THREAD(buf)   (GST_OSSDMABUFFER(buf)->thread)
-#define GST_OSSDMABUFFER_LOCK	       GST_LOCK
-#define GST_OSSDMABUFFER_UNLOCK	       GST_UNLOCK
+#define GST_OSSDMABUFFER_LOCK	       GST_OBJECT_LOCK
+#define GST_OSSDMABUFFER_UNLOCK	       GST_OBJECT_UNLOCK
 #define GST_OSSDMABUFFER_COND(buf)     (GST_OSSDMABUFFER(buf)->cond)
 #define GST_OSSDMABUFFER_SIGNAL(buf)   (g_cond_signal (GST_OSSDMABUFFER_COND (buf)))
-#define GST_OSSDMABUFFER_WAIT(buf)     (g_cond_wait (GST_OSSDMABUFFER_COND (buf), GST_GET_LOCK (buf)))
+#define GST_OSSDMABUFFER_WAIT(buf)     (g_cond_wait (GST_OSSDMABUFFER_COND (buf), GST_OBJECT_GET_LOCK (buf)))
 
 struct _GstOssDMABuffer {
   GstRingBuffer  buffer;