diff options
author | Wouter Cloetens <wouter@mind.be> | 2008-01-31 08:57:16 +0000 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2008-01-31 08:57:16 +0000 |
commit | f745bf3dbea9a9762d561c2ae2df1cec900a120f (patch) | |
tree | fb12acd6ab715bb5aaeafc82298e59527a182986 | |
parent | 0b110774eaf5ee254eca1b9be5330e8e54931278 (diff) | |
download | gst-plugins-bad-f745bf3dbea9a9762d561c2ae2df1cec900a120f.tar.gz gst-plugins-bad-f745bf3dbea9a9762d561c2ae2df1cec900a120f.tar.bz2 gst-plugins-bad-f745bf3dbea9a9762d561c2ae2df1cec900a120f.zip |
Make coding style more consistent, including class renaming.
Original commit message from CVS:
Patch by: Wouter Cloetens <wouter at mind dot be>
* 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.
-rw-r--r-- | ChangeLog | 33 | ||||
-rw-r--r-- | docs/plugins/gst-plugins-bad-plugins-sections.txt | 18 | ||||
-rw-r--r-- | docs/plugins/gst-plugins-bad-plugins.args | 18 | ||||
-rw-r--r-- | docs/plugins/gst-plugins-bad-plugins.hierarchy | 2 | ||||
-rw-r--r-- | docs/plugins/gst-plugins-bad-plugins.interfaces | 2 | ||||
-rw-r--r-- | docs/plugins/inspect/plugin-soup.xml | 2 | ||||
-rw-r--r-- | ext/soup/gstsouphttpsrc.h | 101 |
7 files changed, 106 insertions, 70 deletions
@@ -1,3 +1,36 @@ +2008-01-31 Sebastian Dröge <slomo@circular-chaos.org> + + Patch by: Wouter Cloetens <wouter at mind dot be> + + * 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 <slomo@circular-chaos.org> * configure.ac: diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt index 295ea113..65f2d117 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 <SECTION> <FILE>element-souphttpsrc</FILE> <TITLE>souphttpsrc</TITLE> -GstSouphttpSrc -<SUBSECTION Standard> -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 +GstSoupHTTPSrc +<SUBSECTION Standard> +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 </SECTION> <SECTION> diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args index 5e2f135c..1af5b13b 100644 --- a/docs/plugins/gst-plugins-bad-plugins.args +++ b/docs/plugins/gst-plugins-bad-plugins.args @@ -18759,7 +18759,7 @@ </ARG> <ARG> -<NAME>GstSouphttpSrc::location</NAME> +<NAME>GstSoupHTTPSrc::location</NAME> <TYPE>gchar*</TYPE> <RANGE></RANGE> <FLAGS>rw</FLAGS> @@ -18769,7 +18769,7 @@ </ARG> <ARG> -<NAME>GstSouphttpSrc::iradio-genre</NAME> +<NAME>GstSoupHTTPSrc::iradio-genre</NAME> <TYPE>gchar*</TYPE> <RANGE></RANGE> <FLAGS>r</FLAGS> @@ -18779,7 +18779,7 @@ </ARG> <ARG> -<NAME>GstSouphttpSrc::iradio-mode</NAME> +<NAME>GstSoupHTTPSrc::iradio-mode</NAME> <TYPE>gboolean</TYPE> <RANGE></RANGE> <FLAGS>rw</FLAGS> @@ -18789,7 +18789,7 @@ </ARG> <ARG> -<NAME>GstSouphttpSrc::iradio-name</NAME> +<NAME>GstSoupHTTPSrc::iradio-name</NAME> <TYPE>gchar*</TYPE> <RANGE></RANGE> <FLAGS>r</FLAGS> @@ -18799,7 +18799,7 @@ </ARG> <ARG> -<NAME>GstSouphttpSrc::iradio-title</NAME> +<NAME>GstSoupHTTPSrc::iradio-title</NAME> <TYPE>gchar*</TYPE> <RANGE></RANGE> <FLAGS>r</FLAGS> @@ -18809,7 +18809,7 @@ </ARG> <ARG> -<NAME>GstSouphttpSrc::iradio-url</NAME> +<NAME>GstSoupHTTPSrc::iradio-url</NAME> <TYPE>gchar*</TYPE> <RANGE></RANGE> <FLAGS>r</FLAGS> @@ -18819,7 +18819,7 @@ </ARG> <ARG> -<NAME>GstSouphttpSrc::user-agent</NAME> +<NAME>GstSoupHTTPSrc::user-agent</NAME> <TYPE>gchar*</TYPE> <RANGE></RANGE> <FLAGS>rw</FLAGS> @@ -18829,7 +18829,7 @@ </ARG> <ARG> -<NAME>GstSouphttpSrc::automatic-redirect</NAME> +<NAME>GstSoupHTTPSrc::automatic-redirect</NAME> <TYPE>gboolean</TYPE> <RANGE></RANGE> <FLAGS>rw</FLAGS> @@ -18839,7 +18839,7 @@ </ARG> <ARG> -<NAME>GstSouphttpSrc::proxy</NAME> +<NAME>GstSoupHTTPSrc::proxy</NAME> <TYPE>gchar*</TYPE> <RANGE></RANGE> <FLAGS>rw</FLAGS> diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy index 5e79fb01..07b63c35 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 8b794718..7e670a3b 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 3cad63d4..25155819 100644 --- a/docs/plugins/inspect/plugin-soup.xml +++ b/docs/plugins/inspect/plugin-soup.xml @@ -1,6 +1,6 @@ <plugin> <name>soup</name> - <description>libsoup http client src</description> + <description>libsoup HTTP client src</description> <filename>../../ext/soup/.libs/libgstsouphttpsrc.so</filename> <basename>libgstsouphttpsrc.so</basename> <version>0.10.5.1</version> diff --git a/ext/soup/gstsouphttpsrc.h b/ext/soup/gstsouphttpsrc.h index 9c24382a..14891d90 100644 --- a/ext/soup/gstsouphttpsrc.h +++ b/ext/soup/gstsouphttpsrc.h @@ -1,5 +1,5 @@ /* GStreamer - * Copyright (C) <2007> Wouter Cloetens <wouter@mind.be> + * Copyright (C) 2007-2008 Wouter Cloetens <wouter@mind.be> * * 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 <gst/gst.h> #include <gst/base/gstpushsrc.h> @@ -23,66 +23,69 @@ G_BEGIN_DECLS #include <libsoup/soup.h> -#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)) - -typedef struct _GstSouphttpSrc GstSouphttpSrc; -typedef struct _GstSouphttpSrcClass GstSouphttpSrcClass; +#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 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(). */ - - 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. */ + 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. */ /* 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__ */ |