diff options
| author | Andy Wingo <wingo@pobox.com> | 2005-10-07 15:24:24 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2005-10-07 15:24:24 +0000 |
| commit | aeb4ab082e7a7e5b28650706424be5e72ec1eb8f (patch) | |
| tree | 51a7da63e34dddfe4b1e395b7701c61be6c70f09 /ext/raw1394/gstdv1394src.h | |
| parent | 19712f28f6409666ed290a57776f953ba81a43da (diff) | |
ext/raw1394/gstdv1394src.c: Make interruptible, so it won't block forever in a read().
Original commit message from CVS:
2005-10-07 Andy Wingo <wingo@pobox.com>
* ext/raw1394/gstdv1394src.c: Make interruptible, so it won't
block forever in a read().
Diffstat (limited to 'ext/raw1394/gstdv1394src.h')
| -rw-r--r-- | ext/raw1394/gstdv1394src.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/ext/raw1394/gstdv1394src.h b/ext/raw1394/gstdv1394src.h index 23fc65bb..7f90d484 100644 --- a/ext/raw1394/gstdv1394src.h +++ b/ext/raw1394/gstdv1394src.h @@ -43,10 +43,6 @@ G_BEGIN_DECLS typedef struct _GstDV1394Src GstDV1394Src; typedef struct _GstDV1394SrcClass GstDV1394SrcClass; -#define GST_DV_GET_LOCK(dv) (GST_DV1394SRC (dv)->dv_lock) -#define GST_DV_LOCK(dv) g_mutex_lock(GST_DV_GET_LOCK (dv)) -#define GST_DV_UNLOCK(dv) g_mutex_unlock(GST_DV_GET_LOCK (dv)) - struct _GstDV1394Src { GstPushSrc element; @@ -55,8 +51,6 @@ struct _GstDV1394Src { gint skip; gboolean drop_incomplete; - GMutex *dv_lock; - gint num_ports; gint port; gint channel; @@ -75,7 +69,7 @@ struct _GstDV1394Src { guint bytes_in_frame; guint frame_sequence; - gboolean negotiated; + int control_sock[2]; gchar *uri; }; |