diff --git a/ChangeLog b/ChangeLog index 63d71dc959..d6185f0d9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,36 @@ +2008-01-31 Sebastian Dröge + + Patch by: Wouter Cloetens + + * docs/plugins/gst-plugins-bad-plugins-sections.txt: + * docs/plugins/gst-plugins-bad-plugins.args: + * docs/plugins/gst-plugins-bad-plugins.hierarchy: + * docs/plugins/gst-plugins-bad-plugins.interfaces: + * docs/plugins/inspect/plugin-soup.xml: + (gst_soup_http_src_base_init), (gst_soup_http_src_class_init), + (gst_soup_http_src_init), (gst_soup_http_src_dispose), + (gst_soup_http_src_set_property), (gst_soup_http_src_get_property), + (gst_soup_http_src_unicodify), (gst_soup_http_src_cancel_message), + (gst_soup_http_src_queue_message), + (gst_soup_http_src_add_range_header), + (gst_soup_http_src_session_unpause_message), + (gst_soup_http_src_session_pause_message), + (gst_soup_http_src_session_close), + (gst_soup_http_src_got_headers_cb), + (gst_soup_http_src_got_body_cb), (gst_soup_http_src_finished_cb), + (gst_soup_http_src_got_chunk_cb), (gst_soup_http_src_response_cb), + (gst_soup_http_src_parse_status), (gst_soup_http_src_create), + (gst_soup_http_src_start), (gst_soup_http_src_stop), + (gst_soup_http_src_unlock), (gst_soup_http_src_unlock_stop), + (gst_soup_http_src_get_size), (gst_soup_http_src_is_seekable), + (gst_soup_http_src_do_seek), (gst_soup_http_src_set_location), + (gst_soup_http_src_set_proxy), (gst_soup_http_src_uri_get_type), + (gst_soup_http_src_uri_get_protocols), + (gst_soup_http_src_uri_get_uri), (gst_soup_http_src_uri_set_uri), + (gst_soup_http_src_uri_handler_init), (plugin_init): + * ext/soup/gstsouphttpsrc.h: + Make coding style more consistent, including class renaming. + 2008-01-30 Sebastian Dröge * configure.ac: diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt index 295ea113b8..65f2d1177d 100644 --- a/docs/plugins/gst-plugins-bad-plugins-sections.txt +++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt @@ -269,15 +269,15 @@ gst_gio_stream_src_get_type
element-souphttpsrc souphttpsrc -GstSouphttpSrc +GstSoupHTTPSrc -GstSouphttpSrcClass -GST_SOUPHTTP_SRC -GST_SOUPHTTP_SRC_CLASS -GST_IS_SOUPHTTP_SRC -GST_IS_SOUPHTTP_SRC_CLASS -GST_TYPE_SOUPHTTP_SRC -gst_souphttp_src_get_type +GstSoupHTTPSrcClass +GST_SOUP_HTTP_SRC +GST_SOUP_HTTP_SRC_CLASS +GST_IS_SOUP_HTTP_SRC +GST_IS_SOUP_HTTP_SRC_CLASS +GST_TYPE_SOUP_HTTP_SRC +gst_soup_http_src_get_type
diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args index 5e2f135c09..1af5b13b73 100644 --- a/docs/plugins/gst-plugins-bad-plugins.args +++ b/docs/plugins/gst-plugins-bad-plugins.args @@ -18759,7 +18759,7 @@ -GstSouphttpSrc::location +GstSoupHTTPSrc::location gchar* rw @@ -18769,7 +18769,7 @@ -GstSouphttpSrc::iradio-genre +GstSoupHTTPSrc::iradio-genre gchar* r @@ -18779,7 +18779,7 @@ -GstSouphttpSrc::iradio-mode +GstSoupHTTPSrc::iradio-mode gboolean rw @@ -18789,7 +18789,7 @@ -GstSouphttpSrc::iradio-name +GstSoupHTTPSrc::iradio-name gchar* r @@ -18799,7 +18799,7 @@ -GstSouphttpSrc::iradio-title +GstSoupHTTPSrc::iradio-title gchar* r @@ -18809,7 +18809,7 @@ -GstSouphttpSrc::iradio-url +GstSoupHTTPSrc::iradio-url gchar* r @@ -18819,7 +18819,7 @@ -GstSouphttpSrc::user-agent +GstSoupHTTPSrc::user-agent gchar* rw @@ -18829,7 +18829,7 @@ -GstSouphttpSrc::automatic-redirect +GstSoupHTTPSrc::automatic-redirect gboolean rw @@ -18839,7 +18839,7 @@ -GstSouphttpSrc::proxy +GstSoupHTTPSrc::proxy gchar* rw diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy index 5e79fb018f..07b63c3542 100644 --- a/docs/plugins/gst-plugins-bad-plugins.hierarchy +++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy @@ -19,7 +19,7 @@ GObject GstPushSrc GstNeonhttpSrc GstMMS - GstSouphttpSrc + GstSoupHTTPSrc GstGLTestSrc GstDvbSrc GstVCDSrc diff --git a/docs/plugins/gst-plugins-bad-plugins.interfaces b/docs/plugins/gst-plugins-bad-plugins.interfaces index 8b79471832..7e670a3bda 100644 --- a/docs/plugins/gst-plugins-bad-plugins.interfaces +++ b/docs/plugins/gst-plugins-bad-plugins.interfaces @@ -7,7 +7,7 @@ GstRtpBin GstChildProxy GstRtpClient GstChildProxy GstNeonhttpSrc GstURIHandler GstMMS GstURIHandler -GstSouphttpSrc GstURIHandler +GstSoupHTTPSrc GstURIHandler GstVCDSrc GstURIHandler GstGioSrc GstURIHandler GstDfbVideoSink GstImplementsInterface GstNavigation GstColorBalance diff --git a/docs/plugins/inspect/plugin-soup.xml b/docs/plugins/inspect/plugin-soup.xml index 3cad63d4ab..2515581956 100644 --- a/docs/plugins/inspect/plugin-soup.xml +++ b/docs/plugins/inspect/plugin-soup.xml @@ -1,6 +1,6 @@ soup - libsoup http client src + libsoup HTTP client src ../../ext/soup/.libs/libgstsouphttpsrc.so libgstsouphttpsrc.so 0.10.5.1 diff --git a/ext/soup/gstsouphttpsrc.h b/ext/soup/gstsouphttpsrc.h index 9c24382aac..14891d9099 100644 --- a/ext/soup/gstsouphttpsrc.h +++ b/ext/soup/gstsouphttpsrc.h @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wouter Cloetens + * Copyright (C) 2007-2008 Wouter Cloetens * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -12,8 +12,8 @@ * Library General Public License for more */ -#ifndef __GST_SOUPHTTP_SRC_H__ -#define __GST_SOUPHTTP_SRC_H__ +#ifndef __GST_SOUP_HTTP_SRC_H__ +#define __GST_SOUP_HTTP_SRC_H__ #include #include @@ -23,66 +23,69 @@ G_BEGIN_DECLS #include -#define GST_TYPE_SOUPHTTP_SRC \ - (gst_souphttp_src_get_type()) -#define GST_SOUPHTTP_SRC(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SOUPHTTP_SRC,GstSouphttpSrc)) -#define GST_SOUPHTTP_SRC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SOUPHTTP_SRC,GstSouphttpSrcClass)) -#define GST_IS_SOUPHTTP_SRC(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SOUPHTTP_SRC)) -#define GST_IS_SOUPHTTP_SRC_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SOUPHTTP_SRC)) +#define GST_TYPE_SOUP_HTTP_SRC \ + (gst_soup_http_src_get_type()) +#define GST_SOUP_HTTP_SRC(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SOUP_HTTP_SRC,GstSoupHTTPSrc)) +#define GST_SOUP_HTTP_SRC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass), \ + GST_TYPE_SOUP_HTTP_SRC,GstSoupHTTPSrcClass)) +#define GST_IS_SOUP_HTTP_SRC(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SOUP_HTTP_SRC)) +#define GST_IS_SOUP_HTTP_SRC_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SOUP_HTTP_SRC)) -typedef struct _GstSouphttpSrc GstSouphttpSrc; -typedef struct _GstSouphttpSrcClass GstSouphttpSrcClass; +typedef struct _GstSoupHTTPSrc GstSoupHTTPSrc; +typedef struct _GstSoupHTTPSrcClass GstSoupHTTPSrcClass; typedef enum { - GST_SOUPHTTP_SRC_SESSION_IO_STATUS_IDLE, - GST_SOUPHTTP_SRC_SESSION_IO_STATUS_QUEUED, - GST_SOUPHTTP_SRC_SESSION_IO_STATUS_RUNNING, - GST_SOUPHTTP_SRC_SESSION_IO_STATUS_FINISHED, -} GstSouphttpSrcSessionIOStatus; + GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_IDLE, + GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_QUEUED, + GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING, + GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_FINISHED, +} GstSoupHTTPSrcSessionIOStatus; -struct _GstSouphttpSrc { +struct _GstSoupHTTPSrc { GstPushSrc element; - gchar * location; /* Full URI. */ - gchar * user_agent; /* User-Agent HTTP header. */ - gboolean automatic_redirect; /* Follow redirects. */ - SoupURI * proxy; /* HTTP proxy URI. */ - GMainContext * context; /* I/O context. */ - GMainLoop * loop; /* Event loop. */ - SoupSession * session; /* Async context. */ - GstSouphttpSrcSessionIOStatus session_io_status; - /* Async I/O status. */ - SoupMessage * msg; /* Request message. */ - GstFlowReturn ret; /* Return code from callback. */ - GstBuffer ** outbuf; /* Return buffer allocated by callback. */ - gboolean interrupted; /* Signal unlock(). */ + gchar *location; /* Full URI. */ + gchar *user_agent; /* User-Agent HTTP header. */ + gboolean automatic_redirect; /* Follow redirects. */ + SoupURI *proxy; /* HTTP proxy URI. */ + GMainContext *context; /* I/O context. */ + GMainLoop *loop; /* Event loop. */ + SoupSession *session; /* Async context. */ + GstSoupHTTPSrcSessionIOStatus session_io_status; + /* Async I/O status. */ + SoupMessage *msg; /* Request message. */ + GstFlowReturn ret; /* Return code from callback. */ + GstBuffer **outbuf; /* Return buffer allocated by callback. */ + gboolean interrupted; /* Signal unlock(). */ - gboolean have_size; /* Received and parsed Content-Length header. */ - guint64 content_size; /* Value of Content-Length header. */ - guint64 read_position; /* Current position. */ - gboolean seekable; /* FALSE if the server does not support Range. */ - guint64 request_position; /* Seek to this position. */ + gboolean have_size; /* Received and parsed Content-Length + header. */ + guint64 content_size; /* Value of Content-Length header. */ + guint64 read_position; /* Current position. */ + gboolean seekable; /* FALSE if the server does not support + Range. */ + guint64 request_position; /* Seek to this position. */ /* Shoutcast/icecast metadata extraction handling. */ gboolean iradio_mode; - GstCaps * icy_caps; - gchar * iradio_name; - gchar * iradio_genre; - gchar * iradio_url; - gchar * iradio_title; + GstCaps *icy_caps; + gchar *iradio_name; + gchar *iradio_genre; + gchar *iradio_url; + gchar *iradio_title; }; -struct _GstSouphttpSrcClass { +struct _GstSoupHTTPSrcClass { GstPushSrcClass parent_class; }; -GType gst_souphttp_src_get_type (void); +GType gst_soup_http_src_get_type (void); G_END_DECLS -#endif /* __GST_SOUPHTTP_SRC_H__ */ +#endif /* __GST_SOUP_HTTP_SRC_H__ */