upnp: report and support proper mimetypes for matroska

xbmc · Sep 25, 2012 · 360f41d · 360f41d
1 parent a653df7
commit 360f41d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
@@ -2880,12 +2880,14 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = {
     {"aif",  "audio/x-aiff"},
     {"aifc", "audio/x-aiff"},
     {"aiff", "audio/x-aiff"},
+    {"mka",  "audio/x-matroska"},
     {"mpa",  "audio/mpeg"},
     {"mp2",  "audio/mpeg"},
     {"mp3",  "audio/mpeg"},
     {"m4a",  "audio/mp4"},
     {"wma",  "audio/x-ms-wma"},
     {"wav",  "audio/x-wav"},
+    {"mkv",  "video/x-matroska"},
     {"mpeg", "video/mpeg"},
     {"mpg",  "video/mpeg"},
     {"mp4",  "video/mp4"},
@@ -2898,6 +2900,7 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = {
     {"wtv",  "video/x-ms-wmv"},
     {"asf",  "video/x-ms-asf"},
     {"mkv",  "video/x-matroska"},
+    {"mk3d", "video/x-matroska-3d"},
     {"flv",  "video/x-flv"},
     {"avi",  "video/x-msvideo"},
     {"divx", "video/x-msvideo"},

diff --git a/xbmc/network/upnp/UPnPRenderer.cpp b/xbmc/network/upnp/UPnPRenderer.cpp
@@ -29,6 +29,7 @@ CUPnPRenderer::SetupServices()
     service->SetStateVariable("SinkProtocolInfo"
         ,"http-get:*:*:*"
         ",xbmc-get:*:*:*"
+        ",http-get:*:audio/mkv:*"
         ",http-get:*:audio/mpegurl:*"
         ",http-get:*:audio/mpeg:*"
         ",http-get:*:audio/mpeg3:*"
@@ -67,6 +68,7 @@ CUPnPRenderer::SetupServices()
         ",http-get:*:audio/x-pn-realaudio:*"
         ",http-get:*:audio/x-realaudio:*"
         ",http-get:*:audio/x-wav:*"
+        ",http-get:*:audio/x-matroska:*"
         ",http-get:*:audio/x-ms-wma:*"
         ",http-get:*:audio/x-mpegurl:*"
         ",http-get:*:application/x-shockwave-flash:*"
@@ -86,6 +88,7 @@ CUPnPRenderer::SetupServices()
         ",http-get:*:video/vc1:*"
         ",http-get:*:video/ogg:*"
         ",http-get:*:video/mp4:*"
+        ",http-get:*:video/mkv:*"
         ",http-get:*:video/BT656:*"
         ",http-get:*:video/CelB:*"
         ",http-get:*:video/JPEG:*"
@@ -98,6 +101,7 @@ CUPnPRenderer::SetupServices()
         ",http-get:*:video/MP1S:*"
         ",http-get:*:video/MP2P:*"
         ",http-get:*:video/BMPEG:*"
+        ",http-get:*:video/x-matroska:*"
         ",http-get:*:video/x-ms-wmv:*"
         ",http-get:*:video/x-ms-avi:*"
         ",http-get:*:video/x-flv:*"