input/soup: plugin removed

Makefile.am

@@ -697,7 +697,6 @@ libinput_a_SOURCES = \
 
 libinput_a_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(CURL_CFLAGS) \
-	$(SOUP_CFLAGS) \
 	$(CDIO_PARANOIA_CFLAGS) \
 	$(FFMPEG_CFLAGS) \
 	$(DESPOTIFY_CFLAGS) \
@@ -706,7 +705,6 @@ libinput_a_CPPFLAGS = $(AM_CPPFLAGS) \
 INPUT_LIBS = \
 	libinput.a \
 	$(CURL_LIBS) \
-	$(SOUP_LIBS) \
 	$(CDIO_PARANOIA_LIBS) \
 	$(FFMPEG_LIBS) \
 	$(DESPOTIFY_LIBS) \
@@ -718,11 +716,6 @@ libinput_a_SOURCES += \
 	src/IcyMetaDataParser.cxx src/IcyMetaDataParser.hxx
 endif
 
-if ENABLE_SOUP
-libinput_a_SOURCES += \
-	src/input/SoupInputPlugin.cxx src/input/SoupInputPlugin.hxx
-endif
-
 if ENABLE_CDIO_PARANOIA
 libinput_a_SOURCES += \
 	src/input/CdioParanoiaInputPlugin.cxx \

NEWS

 ver 0.18 (2012/??/??)
+* innput:
+  - soup: plugin removed
 * decoder:
   - adplug: new decoder plugin using libadplug
   - flac: require libFLAC 1.2 or newer

configure.ac

@@ -190,11 +190,6 @@ AC_ARG_ENABLE(curl,
 		[enable support for libcurl HTTP streaming (default: auto)]),,
 	[enable_curl=auto])
 
-AC_ARG_ENABLE(soup,
-	AS_HELP_STRING([--enable-soup],
-		[enable support for libsoup HTTP streaming (default: auto)]),,
-	[enable_soup=auto])
-
 AC_ARG_ENABLE(debug,
 	AS_HELP_STRING([--enable-debug],
 		[enable debugging (default: disabled)]),,
@@ -711,14 +706,6 @@ if test x$enable_curl = xyes; then
 fi
 AM_CONDITIONAL(ENABLE_CURL, test x$enable_curl = xyes)
 
-dnl ----------------------------------- SOUP ----------------------------------
-MPD_AUTO_PKG(soup, SOUP, [libsoup-2.4],
-	[libsoup HTTP streaming], [libsoup not found])
-if test x$enable_soup = xyes; then
-	AC_DEFINE(ENABLE_SOUP, 1, [Define when libsoup is used for HTTP streaming])
-fi
-AM_CONDITIONAL(ENABLE_SOUP, test x$enable_soup = xyes)
-
 dnl --------------------------------- Last.FM ---------------------------------
 if test x$enable_lastfm = xyes; then
 	if test x$enable_curl != xyes; then
@@ -1664,7 +1651,6 @@ results(lastfm,[Last.FM])
 results(soundcloud,[Soundcloud])
 printf '\n\t'
 results(mms,[MMS])
-results(soup, [SOUP])
 
 printf '\n\n##########################################\n\n'
 

doc/user.xml

@@ -875,35 +875,6 @@ systemctl start mpd.socket</programlisting>
           </tgroup>
         </informaltable>
       </section>
-
-      <section>
-        <title><varname>soup</varname></title>
-
-        <para>
-          Opens remote files or streams over HTTP.
-        </para>
-
-        <informaltable>
-          <tgroup cols="2">
-            <thead>
-              <row>
-                <entry>Setting</entry>
-                <entry>Description</entry>
-              </row>
-            </thead>
-            <tbody>
-              <row>
-                <entry>
-                  <varname>proxy</varname>
-                </entry>
-                <entry>
-                  Sets the address of the HTTP proxy server.
-                </entry>
-              </row>
-            </tbody>
-          </tgroup>
-        </informaltable>
-      </section>
     </section>
 
     <section>

src/InputRegistry.cxx

@@ -29,10 +29,6 @@
 #include "input/CurlInputPlugin.hxx"
 #endif
 
-#ifdef ENABLE_SOUP
-#include "input/SoupInputPlugin.hxx"
-#endif
-
 #ifdef HAVE_FFMPEG
 #include "input/FfmpegInputPlugin.hxx"
 #endif
@@ -59,9 +55,6 @@ const struct input_plugin *const input_plugins[] = {
 #ifdef ENABLE_CURL
 	&input_plugin_curl,
 #endif
-#ifdef ENABLE_SOUP
-	&input_plugin_soup,
-#endif
 #ifdef HAVE_FFMPEG
 	&input_plugin_ffmpeg,
 #endif

src/input/SoupInputPlugin.hxx

-/*
- * Copyright (C) 2003-2013 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#ifndef MPD_INPUT_SOUP_HXX
-#define MPD_INPUT_SOUP_HXX
-
-extern const struct input_plugin input_plugin_soup;
-
-#endif

src/ls.cxx

@@ -34,7 +34,7 @@
   * connected by IPC socket.
   */
 static const char *remoteUrlPrefixes[] = {
-#if defined(ENABLE_CURL) || defined(ENABLE_SOUP)
+#if defined(ENABLE_CURL)
 	"http://",
 #endif
 #ifdef ENABLE_MMS

valgrind.suppressions

@@ -394,54 +394,6 @@
    Memcheck:Leak
    fun:*alloc
    ...
-   fun:g_type_init_with_debug_flags
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   fun:g_type_register_static
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   fun:g_type_add_interface_static
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   fun:g_type_add_interface_check
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   fun:g_type_interface_add_prerequisite
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:calloc
-   fun:g_malloc0
-   fun:g_type_class_ref
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:*alloc
-   ...
    fun:g_*_class_intern_init
 }
 
@@ -482,38 +434,6 @@
    Memcheck:Leak
    fun:*alloc
    ...
-   fun:soup_*_class_intern_init
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   fun:soup_auth_manager_add_type
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   fun:soup_auth_manager_class_intern_init
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:*alloc
-   ...
-   fun:soup_auth_manager_ntlm_class_intern_init
-}
-
-{
-   <insert_a_suppression_name_here>
-   Memcheck:Leak
-   fun:*alloc
-   ...
    fun:intern_header_name
 }