mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 19:55:32 +00:00
Code Issues 1 Projects Releases Wiki Activity

fdsrc: cleanup parameter initialisation and add comemnt+logging

Browse source 
Initialize new_fd with DEFAULT_FD and fd with -1. Setting the property will set
new_fd and in _update_fd() we cehck fd against -1. Also add a coment about the
warning we get in the log from gst_poll_remove_fd(). We could get rid of the
warning if we want by tracking if fd has been added to fdset.
This commit is contained in:
Stefan Kost 2010-02-17 11:31:07 +02:00
parent a12fc26461
commit 3c2abf5581
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/elements/gstfdsrc.c
View file

@ -204,9 +204,9 @@ gst_fd_src_class_init (GstFdSrcClass * klass)
static void static void
gst_fd_src_init (GstFdSrc * fdsrc, GstFdSrcClass * klass) gst_fd_src_init (GstFdSrc * fdsrc, GstFdSrcClass * klass)
{ {
fdsrc->new_fd = 0; fdsrc->new_fd = DEFAULT_FD;
fdsrc->seekable_fd = FALSE; fdsrc->seekable_fd = FALSE;
fdsrc->fd = DEFAULT_FD; fdsrc->fd = -1;
fdsrc->timeout = DEFAULT_TIMEOUT; fdsrc->timeout = DEFAULT_TIMEOUT;
fdsrc->uri = g_strdup_printf ("fd://0"); fdsrc->uri = g_strdup_printf ("fd://0");
fdsrc->curoffset = 0; fdsrc->curoffset = 0;
@ -228,6 +228,9 @@ gst_fd_src_update_fd (GstFdSrc * src)
{ {
struct stat stat_results; struct stat stat_results;
GST_DEBUG_OBJECT (src, "fdset %p, old_fd %d, new_fd %d", src->fdset, src->fd,
src->new_fd);
/* we need to always update the fdset since it may not have existed when /* we need to always update the fdset since it may not have existed when
* gst_fd_src_update_fd () was called earlier */ * gst_fd_src_update_fd () was called earlier */
if (src->fdset != NULL) { if (src->fdset != NULL) {
@ -235,6 +238,7 @@ gst_fd_src_update_fd (GstFdSrc * src)
if (src->fd >= 0) { if (src->fd >= 0) {
fd.fd = src->fd; fd.fd = src->fd;
/* this will log a harmless warning, if it was never added */
gst_poll_remove_fd (src->fdset, &fd); gst_poll_remove_fd (src->fdset, &fd);
} }