[rygel] mediathek: There's no WMV support anymore
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] mediathek: There's no WMV support anymore
- Date: Fri, 11 Sep 2015 08:42:01 +0000 (UTC)
commit 878ea39822074663b69d65d99b7b03abd6a65dd7
Author: Jens Georg <mail jensge org>
Date: Fri Sep 11 10:13:32 2015 +0200
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>
data/rygel.conf | 1 -
.../rygel-mediathek-video-item-factory.vala | 28 +++-----------------
2 files changed, 4 insertions(+), 25 deletions(-)
---
diff --git a/data/rygel.conf b/data/rygel.conf
index e53a4b7..fbb16c3 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 160dcd3..5ed8ecd 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") {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]