mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-09-09 05:38:58 +00:00
ext/neon/gstneonhttpsrc.c: Now that we require libneon >= 0.26 remove the neon 0.25 backward compatibility stuff. Als...
Original commit message from CVS: * ext/neon/gstneonhttpsrc.c: (gst_neonhttp_src_set_proxy), (gst_neonhttp_src_send_request_and_redirect): Now that we require libneon >= 0.26 remove the neon 0.25 backward compatibility stuff. Also fix the default location.
This commit is contained in:
parent
e9bedf4926
commit
3864c6112a
2 changed files with 8 additions and 12 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
2007-09-28 Sebastian Dröge <slomo@circular-chaos.org>
|
||||||
|
|
||||||
|
* ext/neon/gstneonhttpsrc.c: (gst_neonhttp_src_set_proxy),
|
||||||
|
(gst_neonhttp_src_send_request_and_redirect):
|
||||||
|
Now that we require libneon >= 0.26 remove the neon 0.25 backward
|
||||||
|
compatibility stuff. Also fix the default location.
|
||||||
|
|
||||||
2007-09-28 Wim Taymans <wim.taymans@gmail.com>
|
2007-09-28 Wim Taymans <wim.taymans@gmail.com>
|
||||||
|
|
||||||
* configure.ac:
|
* configure.ac:
|
||||||
|
|
|
@ -25,10 +25,6 @@
|
||||||
|
|
||||||
#include <ne_redirect.h>
|
#include <ne_redirect.h>
|
||||||
|
|
||||||
#ifndef NE_FREE
|
|
||||||
#define NEON_026_OR_LATER 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
GST_DEBUG_CATEGORY_STATIC (neonhttpsrc_debug);
|
GST_DEBUG_CATEGORY_STATIC (neonhttpsrc_debug);
|
||||||
#define GST_CAT_DEFAULT neonhttpsrc_debug
|
#define GST_CAT_DEFAULT neonhttpsrc_debug
|
||||||
|
|
||||||
|
@ -57,7 +53,7 @@ static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src",
|
||||||
#define HTTP_DEFAULT_HOST "localhost"
|
#define HTTP_DEFAULT_HOST "localhost"
|
||||||
|
|
||||||
/* default properties */
|
/* default properties */
|
||||||
#define DEFAULT_LOCATION "http://"HTTP_DEFAULT_HOST"/"G_STRINGIFY(HTTP_DEFAULT_PORT)
|
#define DEFAULT_LOCATION "http://"HTTP_DEFAULT_HOST":"G_STRINGIFY(HTTP_DEFAULT_PORT)
|
||||||
#define DEFAULT_PROXY ""
|
#define DEFAULT_PROXY ""
|
||||||
#define DEFAULT_USER_AGENT "GStreamer neonhttpsrc"
|
#define DEFAULT_USER_AGENT "GStreamer neonhttpsrc"
|
||||||
#define DEFAULT_IRADIO_MODE FALSE
|
#define DEFAULT_IRADIO_MODE FALSE
|
||||||
|
@ -773,13 +769,8 @@ gst_neonhttp_src_set_proxy (GstNeonhttpSrc * src, const char *uri)
|
||||||
if (src->proxy.host && !src->proxy.port)
|
if (src->proxy.host && !src->proxy.port)
|
||||||
goto error;
|
goto error;
|
||||||
|
|
||||||
#ifdef NEON_026_OR_LATER
|
|
||||||
if (!src->proxy.path || src->proxy.userinfo)
|
if (!src->proxy.path || src->proxy.userinfo)
|
||||||
goto error;
|
goto error;
|
||||||
#else
|
|
||||||
if (!src->proxy.path || src->proxy.authinfo)
|
|
||||||
goto error;
|
|
||||||
#endif
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
|
||||||
/* ERRORS */
|
/* ERRORS */
|
||||||
|
@ -816,9 +807,7 @@ gst_neonhttp_src_send_request_and_redirect (GstNeonhttpSrc * src,
|
||||||
ne_session_create (src->uri.scheme, src->uri.host, src->uri.port);
|
ne_session_create (src->uri.scheme, src->uri.host, src->uri.port);
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef NEON_026_OR_LATER
|
|
||||||
ne_set_session_flag (session, NE_SESSFLAG_ICYPROTO, 1);
|
ne_set_session_flag (session, NE_SESSFLAG_ICYPROTO, 1);
|
||||||
#endif
|
|
||||||
|
|
||||||
request = ne_request_create (session, "GET", src->query_string);
|
request = ne_request_create (session, "GET", src->query_string);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue