Post a message when the cable is unplugged.

Original commit message from CVS:
(gst_dv1394src_bus_reset): Post a message when the cable is
unplugged.
(gst_dv1394src_create, gst_dv1394src_unlock): Remove some prints.
This commit is contained in:
Andy Wingo 2005-10-07 16:22:59 +00:00
parent aeb4ab082e
commit cf60bb696e
2 changed files with 27 additions and 12 deletions

View file

@ -2,6 +2,9 @@
* ext/raw1394/gstdv1394src.c: Make interruptible, so it won't * ext/raw1394/gstdv1394src.c: Make interruptible, so it won't
block forever in a read(). block forever in a read().
(gst_dv1394src_bus_reset): Post a message when the cable is
unplugged.
(gst_dv1394src_create, gst_dv1394src_unlock): Remove some prints.
* ext/raw1394/gstdv1394src.c: Clean up for style before doing some * ext/raw1394/gstdv1394src.c: Clean up for style before doing some
hacking. The only change should be that the state change stuff was hacking. The only change should be that the state change stuff was

View file

@ -73,13 +73,13 @@ enum
LAST_SIGNAL LAST_SIGNAL
}; };
#define DEFAULT_PORT -1 #define DEFAULT_PORT -1
#define DEFAULT_CHANNEL 63 #define DEFAULT_CHANNEL 63
#define DEFAULT_CONSECUTIVE 1 #define DEFAULT_CONSECUTIVE 1
#define DEFAULT_SKIP 0 #define DEFAULT_SKIP 0
#define DEFAULT_DROP_INCOMPLETE TRUE #define DEFAULT_DROP_INCOMPLETE TRUE
#define DEFAULT_USE_AVC TRUE #define DEFAULT_USE_AVC TRUE
#define DEFAULT_GUID 0 #define DEFAULT_GUID 0
enum enum
{ {
@ -437,8 +437,23 @@ gst_dv1394src_iso_receive (raw1394handle_t handle, int channel, size_t len,
static int static int
gst_dv1394src_bus_reset (raw1394handle_t handle, unsigned int generation) gst_dv1394src_bus_reset (raw1394handle_t handle, unsigned int generation)
{ {
GST_INFO_OBJECT (GST_DV1394SRC (raw1394_get_userdata (handle)), GstDV1394Src *src;
"have bus reset"); gint nodecount;
GstMessage *message;
GstStructure *structure;
src = GST_DV1394SRC (raw1394_get_userdata (handle));
GST_INFO_OBJECT (src, "have bus reset");
nodecount = raw1394_get_nodecount (handle);
structure = gst_structure_new ("ieee1394-bus-reset", "nodecount", G_TYPE_INT,
nodecount, NULL);
message = gst_message_new_element (GST_OBJECT (src), structure);
gst_element_post_message (GST_ELEMENT (src), message);
gst_message_unref (message);
return 0; return 0;
} }
@ -473,8 +488,6 @@ gst_dv1394src_create (GstPushSrc * psrc, GstBuffer ** buf)
if (pollfds[1].revents) { if (pollfds[1].revents) {
char command; char command;
g_print ("told to stop!\n");
if (pollfds[1].revents & POLLIN) if (pollfds[1].revents & POLLIN)
READ_COMMAND (dv1394src, command, res); READ_COMMAND (dv1394src, command, res);
@ -694,7 +707,6 @@ gst_dv1394src_unlock (GstBaseSrc * bsrc)
{ {
GstDV1394Src *src = GST_DV1394SRC (bsrc); GstDV1394Src *src = GST_DV1394SRC (bsrc);
g_print ("sending command!\n");
SEND_COMMAND (src, CONTROL_STOP); SEND_COMMAND (src, CONTROL_STOP);
return TRUE; return TRUE;