diff -r 567bb019e3e3 -r 7e817e7e631c gst_plugins_base/gst/tcp/gsttcpclientsrc.c --- a/gst_plugins_base/gst/tcp/gsttcpclientsrc.c Tue Aug 31 15:30:33 2010 +0300 +++ b/gst_plugins_base/gst/tcp/gsttcpclientsrc.c Wed Sep 01 12:16:41 2010 +0100 @@ -18,26 +18,16 @@ * Boston, MA 02111-1307, USA. */ -/** - * SECTION:element-tcpclientsrc - * @see_also: #tcpclientsink - * - * - * Example launch line - * |[ - * # server: - * nc -l -p 3000 - * # client: - * gst-launch tcpclientsrc protocol=none port=3000 ! fdsink fd=2 - * ]| everything you type in the server is shown on the client - * - */ #ifdef HAVE_CONFIG_H #include "config.h" #endif +#ifdef __SYMBIAN32__ +#include "gst/gst-i18n-plugin.h" +#else #include +#endif #include "gsttcp.h" #include "gsttcpclientsrc.h" #include /* memset */ @@ -122,15 +112,13 @@ g_object_class_install_property (gobject_class, PROP_HOST, g_param_spec_string ("host", "Host", "The host IP address to receive packets from", TCP_DEFAULT_HOST, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_PORT, g_param_spec_int ("port", "Port", "The port to receive packets from", 0, - TCP_HIGHEST_PORT, TCP_DEFAULT_PORT, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + TCP_HIGHEST_PORT, TCP_DEFAULT_PORT, G_PARAM_READWRITE)); g_object_class_install_property (gobject_class, PROP_PROTOCOL, g_param_spec_enum ("protocol", "Protocol", "The protocol to wrap data in", - GST_TYPE_TCP_PROTOCOL, GST_TCP_PROTOCOL_NONE, - G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + GST_TYPE_TCP_PROTOCOL, GST_TCP_PROTOCOL_NONE, G_PARAM_READWRITE)); gstbasesrc_class->get_caps = gst_tcp_client_src_getcaps; gstbasesrc_class->start = gst_tcp_client_src_start; @@ -152,6 +140,8 @@ this->protocol = GST_TCP_PROTOCOL_NONE; this->caps = NULL; + gst_base_src_set_live (GST_BASE_SRC (this), TRUE); + GST_OBJECT_FLAG_UNSET (this, GST_TCP_CLIENT_SRC_OPEN); } @@ -346,12 +336,23 @@ GST_DEBUG_OBJECT (src, "connecting to server"); ret = connect (src->sock_fd.fd, (struct sockaddr *) &src->server_sin, sizeof (src->server_sin)); - if (ret) - goto connect_failed; - /* add the socket to the poll */ - gst_poll_add_fd (src->fdset, &src->sock_fd); - gst_poll_fd_ctl_read (src->fdset, &src->sock_fd, TRUE); + if (ret) { + gst_tcp_client_src_stop (GST_BASE_SRC (src)); + switch (errno) { + case ECONNREFUSED: + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, + (_("Connection to %s:%d refused."), src->host, src->port), (NULL)); + return FALSE; + break; + default: + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL), + ("connect to %s:%d failed: %s", src->host, src->port, + g_strerror (errno))); + return FALSE; + break; + } + } return TRUE; @@ -371,22 +372,6 @@ gst_tcp_client_src_stop (GST_BASE_SRC (src)); return FALSE; } -connect_failed: - { - gst_tcp_client_src_stop (GST_BASE_SRC (src)); - switch (errno) { - case ECONNREFUSED: - GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, - (_("Connection to %s:%d refused."), src->host, src->port), (NULL)); - break; - default: - GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL), - ("connect to %s:%d failed: %s", src->host, src->port, - g_strerror (errno))); - break; - } - return FALSE; - } } /* close the socket and associated resources