GNOME.org
 

[rygel] mediathek: Remove plugin

commit 6d71bc32f1905b047825c463389054b95457588e
Author: Jens Georg <mail jensge org>
Date:   Sat May 21 12:42:05 2016 +0200

    mediathek: Remove plugin
    
    The RSS items don't work anymore, always return 404.
    
    Signed-off-by: Jens Georg <mail jensge org>

 README                                             |    1 -
 autogen.sh                                         |    2 +-
 configure.ac                                       |   11 --
 data/rygel.conf                                    |    6 -
 doc/Makefile.am                                    |    3 +-
 doc/README.Mediathek                               |   21 ---
 doc/man/rygel.conf.xml                             |   27 +---
 po/POTFILES.skip                                   |   16 --
 po/gen-potfiles-skip                               |    1 -
 src/plugins/Makefile.am                            |    5 -
 src/plugins/mediathek/Makefile.am                  |   30 ----
 src/plugins/mediathek/mediathek.plugin.in          |    7 -
 .../rygel-mediathek-asx-playlist-parser.vala       |  105 -------------
 .../rygel-mediathek-mov-playlist-parser.vala       |   56 -------
 .../mediathek/rygel-mediathek-playlist-parser.vala |   55 -------
 src/plugins/mediathek/rygel-mediathek-plugin.vala  |   46 ------
 .../mediathek/rygel-mediathek-root-container.vala  |   93 -----------
 .../mediathek/rygel-mediathek-rss-container.vala   |  142 -----------------
 .../mediathek/rygel-mediathek-soup-utils.vala      |   31 ----
 .../rygel-mediathek-video-item-factory.vala        |  165 --------------------
 20 files changed, 3 insertions(+), 820 deletions(-)
---
diff --git a/README b/README
index a653ea4..3205631 100644
--- a/README
+++ b/README
@@ -83,7 +83,6 @@ References
   * http://www.upnp.org/specs/av/UPnP-av-MediaServer-v2-Device-20060531.pdf
   * https://wiki.gnome.org/Projects/Tracker
   * https://wiki.gnome.org/Projects/DVBDaemon
-  * http://www.zdf.de
   * https://wiki.gnome.org/Projects/Rygel/MediaServer2Spec
   * http://www.mpris.org/2.0/spec/
 
diff --git a/autogen.sh b/autogen.sh
index aaa3abf..4b79ff6 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
 
-DEFAULT_ARGS="--enable-vala --enable-maintainer-mode  --enable-debug  --enable-example-plugins 
--enable-mediathek-plugin --enable-gst-launch-plugin --disable-strict-valac"
+DEFAULT_ARGS="--enable-vala --enable-maintainer-mode  --enable-debug  --enable-example-plugins 
--enable-gst-launch-plugin --disable-strict-valac"
 
 mkdir -p m4
 
diff --git a/configure.ac b/configure.ac
index 88fba8c..4f6327c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -220,16 +220,6 @@ AS_IF([test "x$enable_mpris_plugin" = "xyes"],
     PKG_CHECK_MODULES([RYGEL_PLUGIN_MPRIS_DEPS], [$RYGEL_COMMON_MODULES gio-2.0 >= $GIO_REQUIRED])
   ])
 
-RYGEL_ADD_PLUGIN([mediathek],[ZDF Mediathek],[no])
-AS_IF([test "x$enable_mediathek_plugin" = "xyes"],
-  [
-    PKG_CHECK_MODULES([RYGEL_PLUGIN_MEDIATHEK_DEPS],
-                      [$RYGEL_COMMON_MODULES
-                       gio-2.0 >= $GIO_REQUIRED
-                       libsoup-2.4 >= $LIBSOUP_REQUIRED
-                       libxml-2.0 >= $LIBXML_REQUIRED])
-  ])
-
 RYGEL_ADD_PLUGIN([ruih],[Ruih],[yes])
 AS_IF([test "x$enable_ruih_plugin" = "xyes"],
   [
@@ -582,7 +572,6 @@ echo "
         examples:               ${enable_example_plugins}
         tracker:                ${enable_tracker_plugin}
             version:            ${tracker_api_version}
-        mediathek:              ${enable_mediathek_plugin}
         media-export            ${enable_media_export_plugin}
         lightmediascanner       ${enable_lms_plugin}
         external:               ${enable_external_plugin}
diff --git a/data/rygel.conf b/data/rygel.conf
index 6325d72..87dd408 100644
--- a/data/rygel.conf
+++ b/data/rygel.conf
@@ -123,12 +123,6 @@ virtual-folders=true
 enabled=true
 title=Audio/Video playback on @PRETTY_HOSTNAME@
 
-[ZDFMediathek]
-enabled=false
-# List of ids of broadcasts
-rss=1901618
-update-interval=1800
-
 [GstLaunch]
 enabled=false
 launch-items=audiotestsrc;videotestsrc;videotestoverlay
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8e84ab0..35d763e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -8,8 +8,7 @@ dist_man5_MANS = \
 
 EXTRA_DIST = \
                man/rygel.xml \
-               man/rygel.conf.xml \
-               README.Mediathek
+               man/rygel.conf.xml
 
 if HAVE_XSLTPROC
 %.5 %.1: man/%.xml
diff --git a/doc/man/rygel.conf.xml b/doc/man/rygel.conf.xml
index d77beef..649d90e 100644
--- a/doc/man/rygel.conf.xml
+++ b/doc/man/rygel.conf.xml
@@ -444,31 +444,6 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
     <para>This plugin has no special options.</para>
   </refsect1>
   <refsect1>
-    <title>ZDFMediathek</title>
-    <para>The  <ulink url="http://www.zdf.de/ZDFmediathek";>ZDF Mediathek</ulink> is an online archive of 
broadcasts from the second german television. This plugin can be used to subscribes to the RSS feeds of this 
service and expose the broadcasts via UPnP.</para>
-    <para><note>
-        <para>The support for the WMV streaming format was removed from the server, only RTSP support 
remains. Rygel has issues proxying this via HTTP so your client has to support RTSP in order to be able to 
view the streams without transcoding.</para>
-      </note></para>
-    <variablelist>
-      <varlistentry>
-        <term>
-          <option>rss</option>
-        </term>
-        <listitem>
-          <para>A list of broadcast ids. How to get the broadcast ids from the web site is described in the 
file <filename>README.Mediathek</filename> (in german only).</para>
-        </listitem>
-      </varlistentry>
-      <varlistentry>
-        <term>
-          <option>update-interval</option>
-        </term>
-        <listitem>
-          <para>Time in seconds after which the plugin checks for new content. The default interval is 1800 
seconds (30 minutes), the minimum interval 10 minutes.</para>
-        </listitem>
-      </varlistentry>
-    </variablelist>
-  </refsect1>
-  <refsect1>
     <title>LightMediaScanner Plugin</title>
     <para>The LightMediaScanner plugin exports the contents of the <ulink 
url="https://github.com/profusion/lightmediascanner";>lightmediascanner daemon</ulink> </para>
     <para>This plugin does not have any special options.</para>
@@ -551,7 +526,7 @@ title= REALNAME@&apos;s Banshee on @HOSTNAME@</programlisting></para>
 <!-- In alpabetical order. -->    <para><citerefentry>
         <refentrytitle>rygel</refentrytitle>
         <manvolnum>1</manvolnum>
-      </citerefentry>, <filename>README.Mediathek</filename>, <citerefentry>
+      </citerefentry>, <citerefentry>
         <refentrytitle>gst-launch</refentrytitle>
         <manvolnum>1</manvolnum>
       </citerefentry></para>
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 078a80c..0f6decd 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -213,22 +213,6 @@ src/plugins/media-export/rygel-media-export-trackable-db-container.c
 src/plugins/media-export/rygel-media-export-updatable-object.c
 src/plugins/media-export/rygel-media-export-video-item.c
 src/plugins/media-export/rygel-media-export-writable-db-container.c
-src/plugins/mediathek/rygel-mediathek-asx-playlist-parser.c
-src/plugins/mediathek/rygel-mediathek-asx-playlist-parser.vala
-src/plugins/mediathek/rygel-mediathek-mov-playlist-parser.c
-src/plugins/mediathek/rygel-mediathek-mov-playlist-parser.vala
-src/plugins/mediathek/rygel-mediathek-playlist-parser.c
-src/plugins/mediathek/rygel-mediathek-playlist-parser.vala
-src/plugins/mediathek/rygel-mediathek-plugin.c
-src/plugins/mediathek/rygel-mediathek-plugin.vala
-src/plugins/mediathek/rygel-mediathek-root-container.c
-src/plugins/mediathek/rygel-mediathek-root-container.vala
-src/plugins/mediathek/rygel-mediathek-rss-container.c
-src/plugins/mediathek/rygel-mediathek-rss-container.vala
-src/plugins/mediathek/rygel-mediathek-soup-utils.c
-src/plugins/mediathek/rygel-mediathek-soup-utils.vala
-src/plugins/mediathek/rygel-mediathek-video-item-factory.c
-src/plugins/mediathek/rygel-mediathek-video-item-factory.vala
 src/plugins/mpris/rygel-mpris-interfaces.c
 src/plugins/mpris/rygel-mpris-player.c
 src/plugins/mpris/rygel-mpris-plugin.c
diff --git a/po/gen-potfiles-skip b/po/gen-potfiles-skip
index a1c9bc5..dccbf75 100755
--- a/po/gen-potfiles-skip
+++ b/po/gen-potfiles-skip
@@ -12,6 +12,5 @@ data/xml/RenderingControl2.xml
 __EOF__
 ) > POTFILES.skip
 
-(cd .. && find src/plugins/mediathek -name "*.vala" | sort) >> POTFILES.skip
 (cd .. && find src -name "*.c" | sort ) >> POTFILES.skip
 (cd .. && find tests -name "*.c" | sort ) >> POTFILES.skip
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 40791f0..cae36a9 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -2,10 +2,6 @@ if BUILD_TRACKER_PLUGIN
 TRACKER_PLUGIN = tracker
 endif
 
-if BUILD_MEDIATHEK_PLUGIN
-MEDIATHEK_PLUGIN = mediathek
-endif
-
 if BUILD_MEDIA_EXPORT_PLUGIN
 MEDIA_EXPORT_PLUGIN = media-export
 endif
@@ -35,7 +31,6 @@ RUIH = ruih
 endif
 
 SUBDIRS = $(TRACKER_PLUGIN) \
-         $(MEDIATHEK_PLUGIN) \
          $(MEDIA_EXPORT_PLUGIN) \
          $(LMS_PLUGIN) \
          $(EXTERNAL_PLUGIN) \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]