diff options
| author | Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com> | 2013-12-26 23:21:47 -0300 |
|---|---|---|
| committer | Reynaldo H. Verdejo Pinochet <r.verdejo@sisa.samsung.com> | 2013-12-27 01:31:33 -0300 |
| commit | 9dd6e22ba9563d6cac008d65d5e1c14edda66589 (patch) | |
| tree | d42a0b9e7dc2e54d473b00dc9b48cc575b077afc /ext/shout2 | |
| parent | 786f87ef30c0dfc852a63b6bb9cfb0e74ad6f598 (diff) | |
| download | gstreamer-plugins-good-9dd6e22ba9563d6cac008d65d5e1c14edda66589.tar.gz | |
shout2send: drop IP only requirement for _set_host()
libshout2 (we require > 2.0 at config time) supports
both IP and hostname for _set_host(). Dropped an
outdated FIXME regarding this limitation, adjusted
some comments and changed the param blurb to reflect
this too.
Diffstat (limited to 'ext/shout2')
| -rw-r--r-- | ext/shout2/gstshout2.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ext/shout2/gstshout2.c b/ext/shout2/gstshout2.c index d882bdfcf..045cfeb30 100644 --- a/ext/shout2/gstshout2.c +++ b/ext/shout2/gstshout2.c @@ -42,7 +42,7 @@ enum enum { ARG_0, - ARG_IP, /* the ip of the server */ + ARG_IP, /* the IP address or hostname of the server */ ARG_PORT, /* the encoder port number on the server */ ARG_PASSWORD, /* the encoder password on the server */ ARG_USERNAME, /* the encoder username on the server */ @@ -142,8 +142,9 @@ gst_shout2send_class_init (GstShout2sendClass * klass) gobject_class->get_property = gst_shout2send_get_property; gobject_class->finalize = (GObjectFinalizeFunc) gst_shout2send_finalize; + /* FIXME: 2.0 Should probably change this prop name to "server" */ g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_IP, - g_param_spec_string ("ip", "ip", "ip", DEFAULT_IP, + g_param_spec_string ("ip", "ip", "IP address or hostname", DEFAULT_IP, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PORT, g_param_spec_int ("port", "port", "port", 1, G_MAXUSHORT, DEFAULT_PORT, @@ -433,10 +434,8 @@ gst_shout2send_start (GstBaseSink * basesink) if (shout_set_protocol (sink->conn, proto) != SHOUTERR_SUCCESS) goto set_failed; - /* --- FIXME: shout requires an ip, and fails if it is given a host. */ - /* may want to put convert_to_ip(shout2send->ip) here */ cur_prop = "ip"; - GST_DEBUG_OBJECT (sink, "setting ip: %s", sink->ip); + GST_DEBUG_OBJECT (sink, "setting IP/hostname: %s", sink->ip); if (shout_set_host (sink->conn, sink->ip) != SHOUTERR_SUCCESS) goto set_failed; |