diff options
| author | Stefan Kost <ensonic@users.sf.net> | 2010-02-17 11:31:07 +0200 |
|---|---|---|
| committer | Stefan Kost <ensonic@users.sf.net> | 2010-02-17 11:31:07 +0200 |
| commit | 3c2abf55819441e0f65ec9f44e06b4dd7cb61217 (patch) | |
| tree | 8748aba533a34eaa34bd8318b14b130111d2de32 /plugins | |
| parent | a12fc2646141eb9832631be485be4b95306beb7c (diff) | |
fdsrc: cleanup parameter initialisation and add comemnt+logging
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.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/elements/gstfdsrc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/plugins/elements/gstfdsrc.c b/plugins/elements/gstfdsrc.c index fee690141b..0683a2c6ae 100644 --- a/plugins/elements/gstfdsrc.c +++ b/plugins/elements/gstfdsrc.c @@ -204,9 +204,9 @@ gst_fd_src_class_init (GstFdSrcClass * klass) static void gst_fd_src_init (GstFdSrc * fdsrc, GstFdSrcClass * klass) { - fdsrc->new_fd = 0; + fdsrc->new_fd = DEFAULT_FD; fdsrc->seekable_fd = FALSE; - fdsrc->fd = DEFAULT_FD; + fdsrc->fd = -1; fdsrc->timeout = DEFAULT_TIMEOUT; fdsrc->uri = g_strdup_printf ("fd://0"); fdsrc->curoffset = 0; @@ -228,6 +228,9 @@ gst_fd_src_update_fd (GstFdSrc * src) { 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 * gst_fd_src_update_fd () was called earlier */ if (src->fdset != NULL) { @@ -235,6 +238,7 @@ gst_fd_src_update_fd (GstFdSrc * src) if (src->fd >= 0) { fd.fd = src->fd; + /* this will log a harmless warning, if it was never added */ gst_poll_remove_fd (src->fdset, &fd); } |