From: <wt...@ke...> - 2008-02-29 11:01:20
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: wtay Date: Fri Feb 29 2008 11:01:25 UTC Log message: * docs/gst/gstreamer-sections.txt: * gst/gstpoll.c: (gst_poll_fd_init): * gst/gstpoll.h: Add INIT macro and _init method for initializing the GstPollFD. Modified files: . : ChangeLog docs/gst : gstreamer-sections.txt gst : gstpoll.c gstpoll.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.3688&r2=1.3689 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/docs/gst/gstreamer-sections.txt.diff?r1=1.324&r2=1.325 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpoll.c.diff?r1=1.1&r2=1.2 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstpoll.h.diff?r1=1.1&r2=1.2 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.3688 retrieving revision 1.3689 diff -u -d -r1.3688 -r1.3689 --- ChangeLog 28 Feb 2008 19:58:23 -0000 1.3688 +++ ChangeLog 29 Feb 2008 11:00:40 -0000 1.3689 @@ -1,3 +1,10 @@ +2008-02-29 Wim Taymans <wim...@co...> + + * docs/gst/gstreamer-sections.txt: + * gst/gstpoll.c: (gst_poll_fd_init): + * gst/gstpoll.h: + Add INIT macro and _init method for initializing the GstPollFD. 2008-02-28 Sebastian Dröge <sl...@ci...> * plugins/elements/gstfdsink.c: (gst_fd_sink_start), Index: gstreamer-sections.txt RCS file: /cvs/gstreamer/gstreamer/docs/gst/gstreamer-sections.txt,v retrieving revision 1.324 retrieving revision 1.325 diff -u -d -r1.324 -r1.325 --- gstreamer-sections.txt 27 Feb 2008 18:00:03 -0000 1.324 +++ gstreamer-sections.txt 29 Feb 2008 11:00:43 -0000 1.325 @@ -1610,6 +1610,7 @@ GstPoll GstPollFD GstPollMode +GST_POLL_FD_INIT gst_poll_add_fd gst_poll_fd_can_read gst_poll_fd_can_write @@ -1617,6 +1618,7 @@ gst_poll_fd_ctl_write gst_poll_fd_has_closed gst_poll_fd_has_error +gst_poll_fd_init gst_poll_free gst_poll_get_mode gst_poll_new Index: gstpoll.c RCS file: /cvs/gstreamer/gstreamer/gst/gstpoll.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gstpoll.c 27 Feb 2008 18:00:04 -0000 1.1 +++ gstpoll.c 29 Feb 2008 11:00:43 -0000 1.2 @@ -365,6 +365,22 @@ return mode; } +/** + * gst_poll_fd_init: + * @fd: a #GstPollFD + * + * Initializes @fd. Alternatively you can initialize it with + * #GST_POLL_FD_INIT. + */ +void +gst_poll_fd_init (GstPollFD * fd) +{ + g_return_if_fail (fd != NULL); + fd->fd = -1; + fd->idx = -1; +} static gboolean gst_poll_add_fd_unlocked (GstPoll * set, GstPollFD * fd) { Index: gstpoll.h RCS file: /cvs/gstreamer/gstreamer/gst/gstpoll.h,v --- gstpoll.h 27 Feb 2008 18:00:04 -0000 1.1 +++ gstpoll.h 29 Feb 2008 11:00:43 -0000 1.2 @@ -52,6 +52,16 @@ } GstPollFD; /** + * GST_POLL_FD_INIT: + * A #GstPollFD must be initialized with this macro, before it can be + * used. This macro can used be to initialize a variable, but it cannot + * be assigned to a variable. In that case you have to use + * gst_poll_fd_init(). +#define GST_POLL_FD_INIT { -1, -1 } * GstPollMode: * @GST_POLL_MODE_AUTO: choose method automatically * @GST_POLL_MODE_SELECT: use select() when waiting @@ -75,6 +85,8 @@ void gst_poll_set_mode (GstPoll *set, GstPollMode mode); GstPollMode gst_poll_get_mode (const GstPoll *set); +void gst_poll_fd_init (GstPollFD *fd); gboolean gst_poll_add_fd (GstPoll *set, GstPollFD *fd); gboolean gst_poll_remove_fd (GstPoll *set, GstPollFD *fd); |