[rygel] server: Add Samsung TV hacks for mkv format
- From: Jens Georg <jensgeorg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rygel] server: Add Samsung TV hacks for mkv format
- Date: Sat, 9 Mar 2013 15:28:14 +0000 (UTC)
commit 32311fd80d1101c91b7796c2ea0920999c4bb142
Author: Choe Hwanjin <choe hwanjin gmail com>
Date: Thu Dec 20 00:35:10 2012 +0900
server: Add Samsung TV hacks for mkv format
Samsung TV wants "video/x-mkv" instead of "video/x-matroska".
https://bugzilla.gnome.org/show_bug.cgi?id=691654
src/librygel-server/filelist.am | 1 +
src/librygel-server/rygel-client-hacks.vala | 26 +++++++++++++++-
src/librygel-server/rygel-samsung-tv-hacks.vala | 36 +++++++++++++++++++++++
3 files changed, 61 insertions(+), 2 deletions(-)
---
diff --git a/src/librygel-server/filelist.am b/src/librygel-server/filelist.am
index d0dfa3f..6d200a5 100644
--- a/src/librygel-server/filelist.am
+++ b/src/librygel-server/filelist.am
@@ -65,6 +65,7 @@ LIBRYGEL_SERVER_NONVAPI_SOURCE_FILES = \
rygel-media-query-action.vala \
rygel-media-receiver-registrar.vala \
rygel-panasonic-hacks.vala \
+ rygel-samsung-tv-hacks.vala \
rygel-search-criteria-parser.vala \
rygel-search.vala \
rygel-serializer.vala \
diff --git a/src/librygel-server/rygel-client-hacks.vala b/src/librygel-server/rygel-client-hacks.vala
index 3fd9040..d1cf04d 100644
--- a/src/librygel-server/rygel-client-hacks.vala
+++ b/src/librygel-server/rygel-client-hacks.vala
@@ -21,6 +21,7 @@
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
+using Gee;
using Soup;
using GUPnP;
@@ -31,6 +32,8 @@ internal errordomain Rygel.ClientHacksError {
internal abstract class Rygel.ClientHacks : GLib.Object {
private const string CORRECT_OBJECT_ID = "ObjectID";
+ private static HashMap<string, string> client_agent_cache;
+
public unowned string object_id { get;
protected set;
default = CORRECT_OBJECT_ID; }
@@ -50,7 +53,7 @@ internal abstract class Rygel.ClientHacks : GLib.Object {
}
if (message != null) {
- this.check_headers (message.request_headers);
+ this.check_headers (message);
}
}
@@ -68,6 +71,10 @@ internal abstract class Rygel.ClientHacks : GLib.Object {
return new WMPHacks (message);
} catch (Error error) { }
+ try {
+ return new SamsungTVHacks (message);
+ } catch (Error error) { }
+
return new XBMCHacks (message);
}
@@ -95,11 +102,26 @@ internal abstract class Rygel.ClientHacks : GLib.Object {
cancellable);
}
- private void check_headers (MessageHeaders headers)
+ private void check_headers (Message message)
throws ClientHacksError {
+ var headers = message.request_headers;
+
var agent = headers.get_one ("User-Agent");
+ if (agent == null) {
+ var address = message.get_address ();
+ agent = client_agent_cache.get (address.get_physical ());
+ }
+
if (agent == null || !(this.agent_regex.match (agent))) {
throw new ClientHacksError.NA (_("Not Applicable"));
}
+
+ if (agent != null) {
+ var address = message.get_address ();
+ if (client_agent_cache == null) {
+ client_agent_cache = new HashMap<string, string>();
+ }
+ client_agent_cache.set (address.get_physical (), agent);
+ }
}
}
diff --git a/src/librygel-server/rygel-samsung-tv-hacks.vala b/src/librygel-server/rygel-samsung-tv-hacks.vala
new file mode 100644
index 0000000..452382e
--- /dev/null
+++ b/src/librygel-server/rygel-samsung-tv-hacks.vala
@@ -0,0 +1,36 @@
+/*
+ * Copyright (C) 2012 Choe Hwanjin <choe hwanjin gmail com>
+ *
+ * This file is part of Rygel.
+ *
+ * Rygel is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Rygel 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser 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.
+ */
+
+using Soup;
+using GUPnP;
+
+internal class Rygel.SamsungTVHacks : ClientHacks {
+ private const string AGENT = ".*SEC_HHP.*|.*SEC HHP.*";
+
+ public SamsungTVHacks (Message? message = null) throws ClientHacksError {
+ base (AGENT, message);
+ }
+
+ public override void apply (MediaItem item) {
+ if (item.mime_type == "video/x-matroska") {
+ item.mime_type = "video/x-mkv";
+ }
+ }
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]