diff options
| author | Jens Georg <mail@jensge.org> | 2015-09-11 10:13:32 +0200 |
|---|---|---|
| committer | Jens Georg <mail@jensge.org> | 2015-09-11 10:41:09 +0200 |
| commit | 878ea39822074663b69d65d99b7b03abd6a65dd7 (patch) | |
| tree | eb1e5821401f0d5ad8d395fa2a01090ef07af58e | |
| parent | d0828e13eee01824778fd1235d47ddadefea5255 (diff) | |
| download | rygel-878ea39822074663b69d65d99b7b03abd6a65dd7.tar.gz | |
mediathek: There's no WMV support anymore
Use MP4 by default. Unfortunately this also means RTSP which limits the
supported players quite a bit
Signed-off-by: Jens Georg <mail@jensge.org>
| -rw-r--r-- | data/rygel.conf | 1 | ||||
| -rw-r--r-- | src/plugins/mediathek/rygel-mediathek-video-item-factory.vala | 26 |
2 files changed, 3 insertions, 24 deletions
diff --git a/data/rygel.conf b/data/rygel.conf index e53a4b71..fbb16c33 100644 --- a/data/rygel.conf +++ b/data/rygel.conf @@ -123,7 +123,6 @@ enabled=false # List of ids of broadcasts rss=1901618 update-interval=1800 -video-format=wmv [GstLaunch] enabled=false diff --git a/src/plugins/mediathek/rygel-mediathek-video-item-factory.vala b/src/plugins/mediathek/rygel-mediathek-video-item-factory.vala index 160dcd39..5ed8ecd2 100644 --- a/src/plugins/mediathek/rygel-mediathek-video-item-factory.vala +++ b/src/plugins/mediathek/rygel-mediathek-video-item-factory.vala @@ -84,32 +84,12 @@ internal class Rygel.Mediathek.VideoItemFactory : Object { } private VideoItemFactory () { - var config = Rygel.MetaConfig.get_default (); - this.video_format = VIDEO_FORMAT_WMV; - - try { - this.video_format = config.get_string ("ZDFMediathek", - "video-format"); - this.video_format = this.video_format.casefold (); - if (this.video_format != VIDEO_FORMAT_WMV && - this.video_format != VIDEO_FORMAT_MP4) { - this.video_format = VIDEO_FORMAT_WMV; - } - } catch (Error error) { } + this.video_format = VIDEO_FORMAT_MP4; - debug ("Exposing mediathek items in format: %s", video_format); + debug ("Exposing mediathek items in format: mp4"); var session = RootContainer.get_default_session (); - switch (video_format) { - case VIDEO_FORMAT_WMV: - this.playlist_parser = new AsxPlaylistParser (session); - break; - case VIDEO_FORMAT_MP4: - this.playlist_parser = new MovPlaylistParser (session); - break; - default: - assert_not_reached (); - } + this.playlist_parser = new MovPlaylistParser (session); } private bool namespace_ok (Xml.Node* node, string prefix = "media") { |