diff options
author | Andy Wingo <wingo@pobox.com> | 2005-11-21 16:36:05 +0000 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2005-11-21 16:36:05 +0000 |
commit | 0d470f58ca30d7b488e1f1cce1d7bf27bd3239b2 (patch) | |
tree | 30fe63cecf438125f1d50d3e290c367c5855a95f /sys/oss/gstossdmabuffer.c | |
parent | bba99aa3da1aa594d6908d9d74f3679a8515aecd (diff) |
*.*: 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.
Diffstat (limited to 'sys/oss/gstossdmabuffer.c')
-rw-r--r-- | sys/oss/gstossdmabuffer.c | 16 |
1 files changed, 8 insertions, 8 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); |