Index: docs/plugins/gst-plugins-bad-plugins-sections.txt
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/docs/plugins/gst-plugins-bad-plugins-sections.txt,v
retrieving revision 1.44
diff -u -p -r1.44 gst-plugins-bad-plugins-sections.txt
--- docs/plugins/gst-plugins-bad-plugins-sections.txt	30 Jan 2008 13:06:00 -0000	1.44
+++ docs/plugins/gst-plugins-bad-plugins-sections.txt	30 Jan 2008 21:02:31 -0000
@@ -269,15 +269,15 @@ gst_gio_stream_src_get_type
 <SECTION>
 <FILE>element-souphttpsrc</FILE>
 <TITLE>souphttpsrc</TITLE>
-GstSouphttpSrc
+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
+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>
Index: docs/plugins/gst-plugins-bad-plugins.args
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/docs/plugins/gst-plugins-bad-plugins.args,v
retrieving revision 1.29
diff -u -p -r1.29 gst-plugins-bad-plugins.args
--- docs/plugins/gst-plugins-bad-plugins.args	30 Jan 2008 15:40:37 -0000	1.29
+++ docs/plugins/gst-plugins-bad-plugins.args	30 Jan 2008 21:02:38 -0000
@@ -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>
Index: docs/plugins/gst-plugins-bad-plugins.hierarchy
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/docs/plugins/gst-plugins-bad-plugins.hierarchy,v
retrieving revision 1.17
diff -u -p -r1.17 gst-plugins-bad-plugins.hierarchy
--- docs/plugins/gst-plugins-bad-plugins.hierarchy	30 Jan 2008 15:40:39 -0000	1.17
+++ docs/plugins/gst-plugins-bad-plugins.hierarchy	30 Jan 2008 21:02:38 -0000
@@ -19,7 +19,7 @@ GObject
         GstPushSrc
           GstNeonhttpSrc
           GstMMS
-          GstSouphttpSrc
+          GstSoupHTTPSrc
           GstGLTestSrc
           GstDvbSrc
           GstVCDSrc
Index: docs/plugins/gst-plugins-bad-plugins.interfaces
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/docs/plugins/gst-plugins-bad-plugins.interfaces,v
retrieving revision 1.9
diff -u -p -r1.9 gst-plugins-bad-plugins.interfaces
--- docs/plugins/gst-plugins-bad-plugins.interfaces	30 Jan 2008 15:40:41 -0000	1.9
+++ docs/plugins/gst-plugins-bad-plugins.interfaces	30 Jan 2008 21:02:38 -0000
@@ -7,7 +7,7 @@ GstRtpBin GstChildProxy
 GstRtpClient GstChildProxy
 GstNeonhttpSrc GstURIHandler
 GstMMS GstURIHandler
-GstSouphttpSrc GstURIHandler
+GstSoupHTTPSrc GstURIHandler
 GstVCDSrc GstURIHandler
 GstGioSrc GstURIHandler
 GstDfbVideoSink GstImplementsInterface GstNavigation GstColorBalance
Index: docs/plugins/inspect/plugin-soup.xml
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/docs/plugins/inspect/plugin-soup.xml,v
retrieving revision 1.2
diff -u -p -r1.2 plugin-soup.xml
--- docs/plugins/inspect/plugin-soup.xml	30 Jan 2008 15:40:43 -0000	1.2
+++ docs/plugins/inspect/plugin-soup.xml	30 Jan 2008 21:02:38 -0000
@@ -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>
Index: ext/soup/gstsouphttpsrc.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ext/soup/gstsouphttpsrc.c,v
retrieving revision 1.11
diff -u -p -r1.11 gstsouphttpsrc.c
--- ext/soup/gstsouphttpsrc.c	30 Jan 2008 15:40:36 -0000	1.11
+++ ext/soup/gstsouphttpsrc.c	30 Jan 2008 21:02:39 -0000
@@ -66,7 +66,7 @@
  * Yet another example pipeline:
  * <programlisting>
  * gst-launch -v souphttpsrc location=http://10.11.12.13/mjpeg
- * do-timestamp=true ! multipartdemux
+ *     do-timestamp=true ! multipartdemux
  *     ! image/jpeg,width=640,height=480 ! matroskamux
  *     ! filesink location=mjpeg.mkv
  * </programlisting>
@@ -99,7 +99,7 @@
 GST_DEBUG_CATEGORY_STATIC (souphttpsrc_debug);
 #define GST_CAT_DEFAULT souphttpsrc_debug
 
-static const GstElementDetails gst_souphttp_src_details =
+static const GstElementDetails gst_soup_http_src_details =
 GST_ELEMENT_DETAILS ("HTTP client source",
     "Source/Network",
     "Receive data as a client over the network via HTTP using SOUP",
@@ -126,60 +126,60 @@ enum
 
 #define DEFAULT_USER_AGENT           "GStreamer souphttpsrc"
 
-static void gst_souphttp_src_uri_handler_init (gpointer g_iface,
+static void gst_soup_http_src_uri_handler_init (gpointer g_iface,
     gpointer iface_data);
-static void gst_souphttp_src_init (GstSouphttpSrc * src,
-    GstSouphttpSrcClass * g_class);
-static void gst_souphttp_src_dispose (GObject * gobject);
-static void gst_souphttp_src_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_souphttp_src_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
-static GstFlowReturn gst_souphttp_src_create (GstPushSrc * psrc,
-    GstBuffer ** outbuf);
-static gboolean gst_souphttp_src_start (GstBaseSrc * bsrc);
-static gboolean gst_souphttp_src_stop (GstBaseSrc * bsrc);
-static gboolean gst_souphttp_src_get_size (GstBaseSrc * bsrc, guint64 * size);
-static gboolean gst_souphttp_src_is_seekable (GstBaseSrc * bsrc);
-static gboolean gst_souphttp_src_do_seek (GstBaseSrc * bsrc,
-    GstSegment * segment);
-static gboolean gst_souphttp_src_unlock (GstBaseSrc * bsrc);
-static gboolean gst_souphttp_src_unlock_stop (GstBaseSrc * bsrc);
-
-static gboolean gst_souphttp_src_set_location (GstSouphttpSrc * src,
-    const gchar * uri);
-static gboolean gst_souphttp_src_set_proxy (GstSouphttpSrc * src,
-    const gchar * uri);
-
-static char *gst_souphttp_src_unicodify (const char *str);
-
-static void gst_souphttp_src_cancel_message (GstSouphttpSrc * src);
-static void gst_souphttp_src_queue_message (GstSouphttpSrc * src);
-static gboolean gst_souphttp_src_add_range_header (GstSouphttpSrc * src,
+static void gst_soup_http_src_init (GstSoupHTTPSrc *src,
+    GstSoupHTTPSrcClass *g_class);
+static void gst_soup_http_src_dispose (GObject *gobject);
+static void gst_soup_http_src_set_property (GObject *object, guint prop_id,
+    const GValue *value, GParamSpec *pspec);
+static void gst_soup_http_src_get_property (GObject *object, guint prop_id,
+    GValue *value, GParamSpec *pspec);
+
+static GstFlowReturn gst_soup_http_src_create (GstPushSrc *psrc,
+    GstBuffer **outbuf);
+static gboolean gst_soup_http_src_start (GstBaseSrc *bsrc);
+static gboolean gst_soup_http_src_stop (GstBaseSrc *bsrc);
+static gboolean gst_soup_http_src_get_size (GstBaseSrc *bsrc, guint64 *size);
+static gboolean gst_soup_http_src_is_seekable (GstBaseSrc *bsrc);
+static gboolean gst_soup_http_src_do_seek (GstBaseSrc *bsrc,
+    GstSegment *segment);
+static gboolean gst_soup_http_src_unlock (GstBaseSrc *bsrc);
+static gboolean gst_soup_http_src_unlock_stop (GstBaseSrc *bsrc);
+
+static gboolean gst_soup_http_src_set_location (GstSoupHTTPSrc *src,
+    const gchar *uri);
+static gboolean gst_soup_http_src_set_proxy (GstSoupHTTPSrc *src,
+    const gchar *uri);
+
+static char *gst_soup_http_src_unicodify (const char *str);
+
+static void gst_soup_http_src_cancel_message (GstSoupHTTPSrc *src);
+static void gst_soup_http_src_queue_message (GstSoupHTTPSrc *src);
+static gboolean gst_soup_http_src_add_range_header (GstSoupHTTPSrc *src,
     guint64 offset);
-static void gst_souphttp_src_session_unpause_message (GstSouphttpSrc * src);
-static void gst_souphttp_src_session_pause_message (GstSouphttpSrc * src);
-static void gst_souphttp_src_session_close (GstSouphttpSrc * src);
-static void gst_souphttp_src_parse_status (SoupMessage * msg,
-    GstSouphttpSrc * src);
-static void gst_souphttp_src_got_chunk_cb (SoupMessage * msg,
-    SoupBuffer * chunk, GstSouphttpSrc * src);
-static void gst_souphttp_src_response_cb (SoupSession * session,
-    SoupMessage * msg, GstSouphttpSrc * src);
-static void gst_souphttp_src_got_headers_cb (SoupMessage * msg,
-    GstSouphttpSrc * src);
-static void gst_souphttp_src_got_body_cb (SoupMessage * msg,
-    GstSouphttpSrc * src);
-static void gst_souphttp_src_finished_cb (SoupMessage * msg,
-    GstSouphttpSrc * src);
+static void gst_soup_http_src_session_unpause_message (GstSoupHTTPSrc *src);
+static void gst_soup_http_src_session_pause_message (GstSoupHTTPSrc *src);
+static void gst_soup_http_src_session_close (GstSoupHTTPSrc *src);
+static void gst_soup_http_src_parse_status (SoupMessage *msg,
+    GstSoupHTTPSrc *src);
+static void gst_soup_http_src_got_chunk_cb (SoupMessage *msg,
+    SoupBuffer *chunk, GstSoupHTTPSrc *src);
+static void gst_soup_http_src_response_cb (SoupSession *session,
+    SoupMessage *msg, GstSoupHTTPSrc *src);
+static void gst_soup_http_src_got_headers_cb (SoupMessage *msg,
+    GstSoupHTTPSrc *src);
+static void gst_soup_http_src_got_body_cb (SoupMessage *msg,
+    GstSoupHTTPSrc *src);
+static void gst_soup_http_src_finished_cb (SoupMessage *msg,
+    GstSoupHTTPSrc *src);
 
 
 static void
 _do_init (GType type)
 {
   static const GInterfaceInfo urihandler_info = {
-    gst_souphttp_src_uri_handler_init,
+    gst_soup_http_src_uri_handler_init,
     NULL,
     NULL
   };
@@ -190,22 +190,22 @@ _do_init (GType type)
       "SOUP HTTP src");
 }
 
-GST_BOILERPLATE_FULL (GstSouphttpSrc, gst_souphttp_src, GstPushSrc,
+GST_BOILERPLATE_FULL (GstSoupHTTPSrc, gst_soup_http_src, GstPushSrc,
     GST_TYPE_PUSH_SRC, _do_init);
 
 static void
-gst_souphttp_src_base_init (gpointer g_class)
+gst_soup_http_src_base_init (gpointer g_class)
 {
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&srctemplate));
 
-  gst_element_class_set_details (element_class, &gst_souphttp_src_details);
+  gst_element_class_set_details (element_class, &gst_soup_http_src_details);
 }
 
 static void
-gst_souphttp_src_class_init (GstSouphttpSrcClass * klass)
+gst_soup_http_src_class_init (GstSoupHTTPSrcClass *klass)
 {
   GObjectClass *gobject_class;
   GstBaseSrcClass *gstbasesrc_class;
@@ -215,9 +215,9 @@ gst_souphttp_src_class_init (GstSouphttp
   gstbasesrc_class = (GstBaseSrcClass *) klass;
   gstpushsrc_class = (GstPushSrcClass *) klass;
 
-  gobject_class->set_property = gst_souphttp_src_set_property;
-  gobject_class->get_property = gst_souphttp_src_get_property;
-  gobject_class->dispose = gst_souphttp_src_dispose;
+  gobject_class->set_property = gst_soup_http_src_set_property;
+  gobject_class->get_property = gst_soup_http_src_get_property;
+  gobject_class->dispose = gst_soup_http_src_dispose;
 
   g_object_class_install_property (gobject_class,
       PROP_LOCATION,
@@ -264,24 +264,24 @@ gst_souphttp_src_class_init (GstSouphttp
           "iradio-title",
           "Name of currently playing song", NULL, G_PARAM_READABLE));
 
-  gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_souphttp_src_start);
-  gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_souphttp_src_stop);
-  gstbasesrc_class->unlock = GST_DEBUG_FUNCPTR (gst_souphttp_src_unlock);
+  gstbasesrc_class->start = GST_DEBUG_FUNCPTR (gst_soup_http_src_start);
+  gstbasesrc_class->stop = GST_DEBUG_FUNCPTR (gst_soup_http_src_stop);
+  gstbasesrc_class->unlock = GST_DEBUG_FUNCPTR (gst_soup_http_src_unlock);
   gstbasesrc_class->unlock_stop =
-      GST_DEBUG_FUNCPTR (gst_souphttp_src_unlock_stop);
-  gstbasesrc_class->get_size = GST_DEBUG_FUNCPTR (gst_souphttp_src_get_size);
+      GST_DEBUG_FUNCPTR (gst_soup_http_src_unlock_stop);
+  gstbasesrc_class->get_size = GST_DEBUG_FUNCPTR (gst_soup_http_src_get_size);
   gstbasesrc_class->is_seekable =
-      GST_DEBUG_FUNCPTR (gst_souphttp_src_is_seekable);
-  gstbasesrc_class->do_seek = GST_DEBUG_FUNCPTR (gst_souphttp_src_do_seek);
+      GST_DEBUG_FUNCPTR (gst_soup_http_src_is_seekable);
+  gstbasesrc_class->do_seek = GST_DEBUG_FUNCPTR (gst_soup_http_src_do_seek);
 
-  gstpushsrc_class->create = GST_DEBUG_FUNCPTR (gst_souphttp_src_create);
+  gstpushsrc_class->create = GST_DEBUG_FUNCPTR (gst_soup_http_src_create);
 
   GST_DEBUG_CATEGORY_INIT (souphttpsrc_debug, "souphttpsrc", 0,
       "SOUP HTTP Client Source");
 }
 
 static void
-gst_souphttp_src_init (GstSouphttpSrc * src, GstSouphttpSrcClass * g_class)
+gst_soup_http_src_init (GstSoupHTTPSrc *src, GstSoupHTTPSrcClass *g_class)
 {
   const gchar *proxy;
 
@@ -304,7 +304,7 @@ gst_souphttp_src_init (GstSouphttpSrc * 
   src->read_position = 0;
   src->request_position = 0;
   proxy = g_getenv ("http_proxy");
-  if (proxy && !gst_souphttp_src_set_proxy (src, proxy)) {
+  if (proxy && !gst_soup_http_src_set_proxy (src, proxy)) {
     GST_WARNING_OBJECT (src,
         "The proxy in the http_proxy env var (\"%s\") cannot be parsed.",
         proxy);
@@ -312,9 +312,9 @@ gst_souphttp_src_init (GstSouphttpSrc * 
 }
 
 static void
-gst_souphttp_src_dispose (GObject * gobject)
+gst_soup_http_src_dispose (GObject *gobject)
 {
-  GstSouphttpSrc *src = GST_SOUPHTTP_SRC (gobject);
+  GstSoupHTTPSrc *src = GST_SOUP_HTTP_SRC (gobject);
 
   GST_DEBUG_OBJECT (src, "dispose");
   g_free (src->location);
@@ -342,10 +342,10 @@ gst_souphttp_src_dispose (GObject * gobj
 }
 
 static void
-gst_souphttp_src_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec)
+gst_soup_http_src_set_property (GObject *object, guint prop_id,
+    const GValue *value, GParamSpec *pspec)
 {
-  GstSouphttpSrc *src = GST_SOUPHTTP_SRC (object);
+  GstSoupHTTPSrc *src = GST_SOUP_HTTP_SRC (object);
 
   switch (prop_id) {
     case PROP_LOCATION:
@@ -358,7 +358,7 @@ gst_souphttp_src_set_property (GObject *
         GST_WARNING ("location property cannot be NULL");
         goto done;
       }
-      if (!gst_souphttp_src_set_location (src, location)) {
+      if (!gst_soup_http_src_set_location (src, location)) {
         GST_WARNING ("badly formatted location");
         goto done;
       }
@@ -388,7 +388,7 @@ gst_souphttp_src_set_property (GObject *
         GST_WARNING ("proxy property cannot be NULL");
         goto done;
       }
-      if (!gst_souphttp_src_set_proxy (src, proxy)) {
+      if (!gst_soup_http_src_set_proxy (src, proxy)) {
         GST_WARNING ("badly formatted proxy URI");
         goto done;
       }
@@ -400,10 +400,10 @@ done:
 }
 
 static void
-gst_souphttp_src_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec)
+gst_soup_http_src_get_property (GObject *object, guint prop_id,
+    GValue *value, GParamSpec *pspec)
 {
-  GstSouphttpSrc *src = GST_SOUPHTTP_SRC (object);
+  GstSoupHTTPSrc *src = GST_SOUP_HTTP_SRC (object);
 
   switch (prop_id) {
     case PROP_LOCATION:
@@ -447,7 +447,7 @@ gst_souphttp_src_get_property (GObject *
 }
 
 static gchar *
-gst_souphttp_src_unicodify (const gchar * str)
+gst_soup_http_src_unicodify (const gchar *str)
 {
   const gchar *env_vars[] = { "GST_ICY_TAG_ENCODING",
     "GST_TAG_ENCODING", NULL
@@ -457,30 +457,31 @@ gst_souphttp_src_unicodify (const gchar 
 }
 
 static void
-gst_souphttp_src_cancel_message (GstSouphttpSrc * src)
+gst_soup_http_src_cancel_message (GstSoupHTTPSrc *src)
 {
   soup_session_cancel_message (src->session, src->msg, SOUP_STATUS_CANCELLED);
-  src->session_io_status = GST_SOUPHTTP_SRC_SESSION_IO_STATUS_IDLE;
+  src->session_io_status = GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_IDLE;
   src->msg = NULL;
 }
 
 static void
-gst_souphttp_src_queue_message (GstSouphttpSrc * src)
+gst_soup_http_src_queue_message (GstSoupHTTPSrc *src)
 {
   soup_session_queue_message (src->session, src->msg,
-      (SoupSessionCallback) gst_souphttp_src_response_cb, src);
-  src->session_io_status = GST_SOUPHTTP_SRC_SESSION_IO_STATUS_QUEUED;
+      (SoupSessionCallback) gst_soup_http_src_response_cb, src);
+  src->session_io_status = GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_QUEUED;
 }
 
 static gboolean
-gst_souphttp_src_add_range_header (GstSouphttpSrc * src, guint64 offset)
+gst_soup_http_src_add_range_header (GstSoupHTTPSrc *src, guint64 offset)
 {
   gchar buf[64];
   gint rc;
 
   soup_message_headers_remove (src->msg->request_headers, "Range");
   if (offset) {
-    rc = g_snprintf (buf, sizeof (buf), "bytes=%" G_GUINT64_FORMAT "-", offset);
+    rc = g_snprintf (buf, sizeof (buf), "bytes=%" G_GUINT64_FORMAT "-",
+        offset);
     if (rc > sizeof (buf) || rc < 0)
       return FALSE;
     soup_message_headers_append (src->msg->request_headers, "Range", buf);
@@ -490,19 +491,19 @@ gst_souphttp_src_add_range_header (GstSo
 }
 
 static void
-gst_souphttp_src_session_unpause_message (GstSouphttpSrc * src)
+gst_soup_http_src_session_unpause_message (GstSoupHTTPSrc *src)
 {
   soup_session_unpause_message (src->session, src->msg);
 }
 
 static void
-gst_souphttp_src_session_pause_message (GstSouphttpSrc * src)
+gst_soup_http_src_session_pause_message (GstSoupHTTPSrc *src)
 {
   soup_session_pause_message (src->session, src->msg);
 }
 
 static void
-gst_souphttp_src_session_close (GstSouphttpSrc * src)
+gst_soup_http_src_session_close (GstSoupHTTPSrc *src)
 {
   if (src->session) {
     soup_session_abort (src->session);  /* This unrefs the message. */
@@ -513,7 +514,7 @@ gst_souphttp_src_session_close (GstSouph
 }
 
 static void
-gst_souphttp_src_got_headers_cb (SoupMessage * msg, GstSouphttpSrc * src)
+gst_soup_http_src_got_headers_cb (SoupMessage *msg, GstSoupHTTPSrc *src)
 {
   const char *value;
   GstTagList *tag_list;
@@ -522,13 +523,14 @@ gst_souphttp_src_got_headers_cb (SoupMes
 
   GST_DEBUG_OBJECT (src, "got headers");
 
-  if (src->automatic_redirect && SOUP_STATUS_IS_REDIRECTION (msg->status_code)) {
+  if (src->automatic_redirect &&
+      SOUP_STATUS_IS_REDIRECTION (msg->status_code)) {
     GST_DEBUG_OBJECT (src, "%u redirect to \"%s\"", msg->status_code,
         soup_message_headers_get (msg->response_headers, "Location"));
     return;
   }
 
-  src->session_io_status = GST_SOUPHTTP_SRC_SESSION_IO_STATUS_RUNNING;
+  src->session_io_status = GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING;
 
   /* Parse Content-Length. */
   if (soup_message_headers_get_encoding (msg->response_headers) ==
@@ -567,7 +569,7 @@ gst_souphttp_src_got_headers_cb (SoupMes
           soup_message_headers_get (msg->response_headers,
               "icy-name")) != NULL) {
     g_free (src->iradio_name);
-    src->iradio_name = gst_souphttp_src_unicodify (value);
+    src->iradio_name = gst_soup_http_src_unicodify (value);
     if (src->iradio_name) {
       g_object_notify (G_OBJECT (src), "iradio-name");
       gst_tag_list_add (tag_list, GST_TAG_MERGE_REPLACE, GST_TAG_ORGANIZATION,
@@ -578,7 +580,7 @@ gst_souphttp_src_got_headers_cb (SoupMes
           soup_message_headers_get (msg->response_headers,
               "icy-genre")) != NULL) {
     g_free (src->iradio_genre);
-    src->iradio_genre = gst_souphttp_src_unicodify (value);
+    src->iradio_genre = gst_soup_http_src_unicodify (value);
     if (src->iradio_genre) {
       g_object_notify (G_OBJECT (src), "iradio-genre");
       gst_tag_list_add (tag_list, GST_TAG_MERGE_REPLACE, GST_TAG_GENRE,
@@ -588,7 +590,7 @@ gst_souphttp_src_got_headers_cb (SoupMes
   if ((value = soup_message_headers_get (msg->response_headers, "icy-url"))
       != NULL) {
     g_free (src->iradio_url);
-    src->iradio_url = gst_souphttp_src_unicodify (value);
+    src->iradio_url = gst_soup_http_src_unicodify (value);
     if (src->iradio_url) {
       g_object_notify (G_OBJECT (src), "iradio-url");
       gst_tag_list_add (tag_list, GST_TAG_MERGE_REPLACE, GST_TAG_LOCATION,
@@ -604,7 +606,7 @@ gst_souphttp_src_got_headers_cb (SoupMes
   }
 
   /* Handle HTTP errors. */
-  gst_souphttp_src_parse_status (msg, src);
+  gst_soup_http_src_parse_status (msg, src);
 
   /* Check if Range header was respected. */
   if (src->ret == GST_FLOW_CUSTOM_ERROR &&
@@ -619,14 +621,14 @@ gst_souphttp_src_got_headers_cb (SoupMes
 
 /* Have body. Signal EOS. */
 static void
-gst_souphttp_src_got_body_cb (SoupMessage * msg, GstSouphttpSrc * src)
+gst_soup_http_src_got_body_cb (SoupMessage *msg, GstSoupHTTPSrc *src)
 {
   if (G_UNLIKELY (msg != src->msg)) {
     GST_DEBUG_OBJECT (src, "got body, but not for current message");
     return;
   }
   if (G_UNLIKELY (src->session_io_status !=
-          GST_SOUPHTTP_SRC_SESSION_IO_STATUS_RUNNING)) {
+          GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING)) {
     /* Probably a redirect. */
     return;
   }
@@ -634,19 +636,19 @@ gst_souphttp_src_got_body_cb (SoupMessag
   src->ret = GST_FLOW_UNEXPECTED;
   if (src->loop)
     g_main_loop_quit (src->loop);
-  gst_souphttp_src_session_pause_message (src);
+  gst_soup_http_src_session_pause_message (src);
 }
 
 /* Finished. Signal EOS. */
 static void
-gst_souphttp_src_finished_cb (SoupMessage * msg, GstSouphttpSrc * src)
+gst_soup_http_src_finished_cb (SoupMessage *msg, GstSoupHTTPSrc *src)
 {
   if (G_UNLIKELY (msg != src->msg)) {
     GST_DEBUG_OBJECT (src, "finished, but not for current message");
     return;
   }
   if (G_UNLIKELY (src->session_io_status !=
-          GST_SOUPHTTP_SRC_SESSION_IO_STATUS_RUNNING)) {
+          GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING)) {
     /* Probably a redirect. */
     return;
   }
@@ -657,8 +659,8 @@ gst_souphttp_src_finished_cb (SoupMessag
 }
 
 static void
-gst_souphttp_src_got_chunk_cb (SoupMessage * msg, SoupBuffer * chunk,
-    GstSouphttpSrc * src)
+gst_soup_http_src_got_chunk_cb (SoupMessage *msg, SoupBuffer *chunk,
+    GstSoupHTTPSrc *src)
 {
   GstBaseSrc *basesrc;
   guint64 new_position;
@@ -670,7 +672,7 @@ gst_souphttp_src_got_chunk_cb (SoupMessa
     return;
   }
   if (G_UNLIKELY (src->session_io_status !=
-          GST_SOUPHTTP_SRC_SESSION_IO_STATUS_RUNNING)) {
+          GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING)) {
     /* Probably a redirect. */
     return;
   }
@@ -692,12 +694,12 @@ gst_souphttp_src_got_chunk_cb (SoupMessa
   }
 
   g_main_loop_quit (src->loop);
-  gst_souphttp_src_session_pause_message (src);
+  gst_soup_http_src_session_pause_message (src);
 }
 
 static void
-gst_souphttp_src_response_cb (SoupSession * session, SoupMessage * msg,
-    GstSouphttpSrc * src)
+gst_soup_http_src_response_cb (SoupSession *session, SoupMessage *msg,
+    GstSoupHTTPSrc *src)
 {
   if (G_UNLIKELY (msg != src->msg)) {
     GST_DEBUG_OBJECT (src, "got response %d: %s, but not for current message",
@@ -705,18 +707,18 @@ gst_souphttp_src_response_cb (SoupSessio
     return;
   }
   if (G_UNLIKELY (src->session_io_status !=
-          GST_SOUPHTTP_SRC_SESSION_IO_STATUS_RUNNING)) {
+          GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING)) {
     /* Probably a redirect. */
     return;
   }
   GST_DEBUG_OBJECT (src, "got response %d: %s", msg->status_code,
       msg->reason_phrase);
-  gst_souphttp_src_parse_status (msg, src);
+  gst_soup_http_src_parse_status (msg, src);
   g_main_loop_quit (src->loop);
 }
 
 static void
-gst_souphttp_src_parse_status (SoupMessage * msg, GstSouphttpSrc * src)
+gst_soup_http_src_parse_status (SoupMessage *msg, GstSoupHTTPSrc *src)
 {
   if (SOUP_STATUS_IS_TRANSPORT_ERROR (msg->status_code)) {
     switch (msg->status_code) {
@@ -763,20 +765,20 @@ gst_souphttp_src_parse_status (SoupMessa
 }
 
 static GstFlowReturn
-gst_souphttp_src_create (GstPushSrc * psrc, GstBuffer ** outbuf)
+gst_soup_http_src_create (GstPushSrc *psrc, GstBuffer **outbuf)
 {
-  GstSouphttpSrc *src;
+  GstSoupHTTPSrc *src;
 
-  src = GST_SOUPHTTP_SRC (psrc);
+  src = GST_SOUP_HTTP_SRC (psrc);
 
   if (src->msg && (src->request_position != src->read_position)) {
-    if (src->session_io_status == GST_SOUPHTTP_SRC_SESSION_IO_STATUS_IDLE) {
-      gst_souphttp_src_add_range_header (src, src->request_position);
+    if (src->session_io_status == GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_IDLE) {
+      gst_soup_http_src_add_range_header (src, src->request_position);
     } else {
       GST_DEBUG_OBJECT (src, "Seek from position %" G_GUINT64_FORMAT
           " to %" G_GUINT64_FORMAT ": requeueing connection request",
           src->read_position, src->request_position);
-      gst_souphttp_src_cancel_message (src);
+      gst_soup_http_src_cancel_message (src);
     }
   }
   if (!src->msg) {
@@ -786,7 +788,7 @@ gst_souphttp_src_create (GstPushSrc * ps
           (NULL), ("Error parsing URL \"%s\"", src->location));
       return GST_FLOW_ERROR;
     }
-    src->session_io_status = GST_SOUPHTTP_SRC_SESSION_IO_STATUS_IDLE;
+    src->session_io_status = GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_IDLE;
     soup_message_headers_append (src->msg->request_headers, "Connection",
         "close");
     if (src->user_agent) {
@@ -799,23 +801,23 @@ gst_souphttp_src_create (GstPushSrc * ps
     }
 
     g_signal_connect (src->msg, "got_headers",
-        G_CALLBACK (gst_souphttp_src_got_headers_cb), src);
+        G_CALLBACK (gst_soup_http_src_got_headers_cb), src);
     g_signal_connect (src->msg, "got_body",
-        G_CALLBACK (gst_souphttp_src_got_body_cb), src);
+        G_CALLBACK (gst_soup_http_src_got_body_cb), src);
     g_signal_connect (src->msg, "finished",
-        G_CALLBACK (gst_souphttp_src_finished_cb), src);
+        G_CALLBACK (gst_soup_http_src_finished_cb), src);
     g_signal_connect (src->msg, "got_chunk",
-        G_CALLBACK (gst_souphttp_src_got_chunk_cb), src);
+        G_CALLBACK (gst_soup_http_src_got_chunk_cb), src);
     soup_message_set_flags (src->msg, SOUP_MESSAGE_OVERWRITE_CHUNKS |
         src->automatic_redirect ? 0 : SOUP_MESSAGE_NO_REDIRECT);
-    gst_souphttp_src_add_range_header (src, src->request_position);
+    gst_soup_http_src_add_range_header (src, src->request_position);
   }
 
   src->ret = GST_FLOW_CUSTOM_ERROR;
   src->outbuf = outbuf;
   do {
     if (src->interrupted) {
-      gst_souphttp_src_cancel_message (src);
+      gst_soup_http_src_cancel_message (src);
       break;
     }
     if (!src->msg) {
@@ -824,18 +826,18 @@ gst_souphttp_src_create (GstPushSrc * ps
     }
 
     switch (src->session_io_status) {
-      case GST_SOUPHTTP_SRC_SESSION_IO_STATUS_IDLE:
+      case GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_IDLE:
         GST_DEBUG_OBJECT (src, "Queueing connection request");
-        gst_souphttp_src_queue_message (src);
+        gst_soup_http_src_queue_message (src);
         break;
-      case GST_SOUPHTTP_SRC_SESSION_IO_STATUS_FINISHED:
+      case GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_FINISHED:
         GST_DEBUG_OBJECT (src, "Connection closed");
-        gst_souphttp_src_cancel_message (src);
+        gst_soup_http_src_cancel_message (src);
         break;
-      case GST_SOUPHTTP_SRC_SESSION_IO_STATUS_QUEUED:
+      case GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_QUEUED:
         break;
-      case GST_SOUPHTTP_SRC_SESSION_IO_STATUS_RUNNING:
-        gst_souphttp_src_session_unpause_message (src);
+      case GST_SOUP_HTTP_SRC_SESSION_IO_STATUS_RUNNING:
+        gst_soup_http_src_session_unpause_message (src);
         break;
     }
 
@@ -849,9 +851,9 @@ gst_souphttp_src_create (GstPushSrc * ps
 }
 
 static gboolean
-gst_souphttp_src_start (GstBaseSrc * bsrc)
+gst_soup_http_src_start (GstBaseSrc *bsrc)
 {
-  GstSouphttpSrc *src = GST_SOUPHTTP_SRC (bsrc);
+  GstSoupHTTPSrc *src = GST_SOUP_HTTP_SRC (bsrc);
 
   GST_DEBUG_OBJECT (src, "start(\"%s\")", src->location);
 
@@ -888,16 +890,14 @@ gst_souphttp_src_start (GstBaseSrc * bsr
   return TRUE;
 }
 
-/* Close the socket and associated resources
- * used both to recover from errors and go to NULL state. */
 static gboolean
-gst_souphttp_src_stop (GstBaseSrc * bsrc)
+gst_soup_http_src_stop (GstBaseSrc *bsrc)
 {
-  GstSouphttpSrc *src;
+  GstSoupHTTPSrc *src;
 
-  src = GST_SOUPHTTP_SRC (bsrc);
+  src = GST_SOUP_HTTP_SRC (bsrc);
   GST_DEBUG_OBJECT (src, "stop()");
-  gst_souphttp_src_session_close (src);
+  gst_soup_http_src_session_close (src);
   if (src->loop) {
     g_main_loop_unref (src->loop);
     g_main_context_unref (src->context);
@@ -910,11 +910,11 @@ gst_souphttp_src_stop (GstBaseSrc * bsrc
 
 /* Interrupt a blocking request. */
 static gboolean
-gst_souphttp_src_unlock (GstBaseSrc * bsrc)
+gst_soup_http_src_unlock (GstBaseSrc *bsrc)
 {
-  GstSouphttpSrc *src;
+  GstSoupHTTPSrc *src;
 
-  src = GST_SOUPHTTP_SRC (bsrc);
+  src = GST_SOUP_HTTP_SRC (bsrc);
   GST_DEBUG_OBJECT (src, "unlock()");
 
   src->interrupted = TRUE;
@@ -925,11 +925,11 @@ gst_souphttp_src_unlock (GstBaseSrc * bs
 
 /* Interrupt interrupt. */
 static gboolean
-gst_souphttp_src_unlock_stop (GstBaseSrc * bsrc)
+gst_soup_http_src_unlock_stop (GstBaseSrc *bsrc)
 {
-  GstSouphttpSrc *src;
+  GstSoupHTTPSrc *src;
 
-  src = GST_SOUPHTTP_SRC (bsrc);
+  src = GST_SOUP_HTTP_SRC (bsrc);
   GST_DEBUG_OBJECT (src, "unlock_stop()");
 
   src->interrupted = FALSE;
@@ -937,11 +937,11 @@ gst_souphttp_src_unlock_stop (GstBaseSrc
 }
 
 static gboolean
-gst_souphttp_src_get_size (GstBaseSrc * bsrc, guint64 * size)
+gst_soup_http_src_get_size (GstBaseSrc *bsrc, guint64 *size)
 {
-  GstSouphttpSrc *src;
+  GstSoupHTTPSrc *src;
 
-  src = GST_SOUPHTTP_SRC (bsrc);
+  src = GST_SOUP_HTTP_SRC (bsrc);
 
   if (src->have_size) {
     GST_DEBUG_OBJECT (src, "get_size() = %" G_GUINT64_FORMAT,
@@ -954,17 +954,17 @@ gst_souphttp_src_get_size (GstBaseSrc * 
 }
 
 static gboolean
-gst_souphttp_src_is_seekable (GstBaseSrc * bsrc)
+gst_soup_http_src_is_seekable (GstBaseSrc *bsrc)
 {
-  GstSouphttpSrc *src = GST_SOUPHTTP_SRC (bsrc);
+  GstSoupHTTPSrc *src = GST_SOUP_HTTP_SRC (bsrc);
 
   return src->seekable;
 }
 
 static gboolean
-gst_souphttp_src_do_seek (GstBaseSrc * bsrc, GstSegment * segment)
+gst_soup_http_src_do_seek (GstBaseSrc *bsrc, GstSegment *segment)
 {
-  GstSouphttpSrc *src = GST_SOUPHTTP_SRC (bsrc);
+  GstSoupHTTPSrc *src = GST_SOUP_HTTP_SRC (bsrc);
 
   GST_DEBUG_OBJECT (src, "do_seek(%" G_GUINT64_FORMAT ")", segment->start);
 
@@ -980,7 +980,7 @@ gst_souphttp_src_do_seek (GstBaseSrc * b
 }
 
 static gboolean
-gst_souphttp_src_set_location (GstSouphttpSrc * src, const gchar * uri)
+gst_soup_http_src_set_location (GstSoupHTTPSrc *src, const gchar *uri)
 {
   if (src->location) {
     g_free (src->location);
@@ -992,7 +992,7 @@ gst_souphttp_src_set_location (GstSoupht
 }
 
 static gboolean
-gst_souphttp_src_set_proxy (GstSouphttpSrc * src, const gchar * uri)
+gst_soup_http_src_set_proxy (GstSoupHTTPSrc *src, const gchar *uri)
 {
   if (src->proxy) {
     soup_uri_free (src->proxy);
@@ -1004,54 +1004,54 @@ gst_souphttp_src_set_proxy (GstSouphttpS
 }
 
 static guint
-gst_souphttp_src_uri_get_type (void)
+gst_soup_http_src_uri_get_type (void)
 {
   return GST_URI_SRC;
 }
 
 static gchar **
-gst_souphttp_src_uri_get_protocols (void)
+gst_soup_http_src_uri_get_protocols (void)
 {
   static gchar *protocols[] = { "http", "https", "dav", "davs", NULL };
   return protocols;
 }
 
 static const gchar *
-gst_souphttp_src_uri_get_uri (GstURIHandler * handler)
+gst_soup_http_src_uri_get_uri (GstURIHandler *handler)
 {
-  GstSouphttpSrc *src = GST_SOUPHTTP_SRC (handler);
+  GstSoupHTTPSrc *src = GST_SOUP_HTTP_SRC (handler);
 
   return src->location;
 }
 
 static gboolean
-gst_souphttp_src_uri_set_uri (GstURIHandler * handler, const gchar * uri)
+gst_soup_http_src_uri_set_uri (GstURIHandler *handler, const gchar *uri)
 {
-  GstSouphttpSrc *src = GST_SOUPHTTP_SRC (handler);
+  GstSoupHTTPSrc *src = GST_SOUP_HTTP_SRC (handler);
 
-  return gst_souphttp_src_set_location (src, uri);
+  return gst_soup_http_src_set_location (src, uri);
 }
 
 static void
-gst_souphttp_src_uri_handler_init (gpointer g_iface, gpointer iface_data)
+gst_soup_http_src_uri_handler_init (gpointer g_iface, gpointer iface_data)
 {
   GstURIHandlerInterface *iface = (GstURIHandlerInterface *) g_iface;
 
-  iface->get_type = gst_souphttp_src_uri_get_type;
-  iface->get_protocols = gst_souphttp_src_uri_get_protocols;
-  iface->get_uri = gst_souphttp_src_uri_get_uri;
-  iface->set_uri = gst_souphttp_src_uri_set_uri;
+  iface->get_type = gst_soup_http_src_uri_get_type;
+  iface->get_protocols = gst_soup_http_src_uri_get_protocols;
+  iface->get_uri = gst_soup_http_src_uri_get_uri;
+  iface->set_uri = gst_soup_http_src_uri_set_uri;
 }
 
 static gboolean
-plugin_init (GstPlugin * plugin)
+plugin_init (GstPlugin *plugin)
 {
   return gst_element_register (plugin, "souphttpsrc", GST_RANK_MARGINAL,
-      GST_TYPE_SOUPHTTP_SRC);
+      GST_TYPE_SOUP_HTTP_SRC);
 }
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
     "soup",
-    "libsoup http client src",
+    "libsoup HTTP client src",
     plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
Index: ext/soup/gstsouphttpsrc.h
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-bad/ext/soup/gstsouphttpsrc.h,v
retrieving revision 1.5
diff -u -p -r1.5 gstsouphttpsrc.h
--- ext/soup/gstsouphttpsrc.h	30 Jan 2008 13:06:01 -0000	1.5
+++ ext/soup/gstsouphttpsrc.h	30 Jan 2008 21:02:39 -0000
@@ -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))
+#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(). */
-
-  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__ */
 
