Merge branch 'master' into 0.11

[platform/upstream/gstreamer.git] / gst / gstpoll.h

diff --git a/gst/gstpoll.h b/gst/gstpoll.h
index 78a9f39..741a79b 100644 (file)
--- a/gst/gstpoll.h
+++ b/gst/gstpoll.h
@@ -64,8 +64,11 @@ typedef struct {
 #define GST_POLL_FD_INIT  { -1, -1 }
 
 GstPoll*        gst_poll_new              (gboolean controllable);
+GstPoll*        gst_poll_new_timer        (void);
 void            gst_poll_free             (GstPoll *set);
 
+void            gst_poll_get_read_gpollfd (GstPoll *set, GPollFD *fd);
+
 void            gst_poll_fd_init          (GstPollFD *fd);
 
 gboolean        gst_poll_add_fd           (GstPoll *set, GstPollFD *fd);
@@ -86,6 +89,9 @@ gboolean        gst_poll_set_controllable (GstPoll *set, gboolean controllable);
 void            gst_poll_restart          (GstPoll *set);
 void            gst_poll_set_flushing     (GstPoll *set, gboolean flushing);
 
+gboolean        gst_poll_write_control    (GstPoll *set);
+gboolean        gst_poll_read_control     (GstPoll *set);
+
 G_END_DECLS
 
 #endif /* __GST_POLL_H__ */