Merge pull request #4102 from Montellese/platinum_patches_only

platinum: add all currently applied patches

1 files changed, 32 insertions, 0 deletions

diff --git a/lib/libUPnP/patches/0017-Platinum-don-t-disregard-PLT_MediaObjects-only-for-l.patch b/lib/libUPnP/patches/0017-Platinum-don-t-disregard-PLT_MediaObjects-only-for-l.patch
new file mode 100644
index 0000000000..3e83fd1df3
--- /dev/null
+++ b/lib/libUPnP/patches/0017-Platinum-don-t-disregard-PLT_MediaObjects-only-for-l.patch
@@ -0,0 +1,32 @@
+From 3d0063a78b969478fe6965e31aa5dd4d8f5b45d9 Mon Sep 17 00:00:00 2001
+From: Joakim Plate <elupus@ecce.se>
+Date: Sat, 19 Jan 2013 19:00:30 +0100
+Subject: [PATCH 17/21] Platinum: don't disregard PLT_MediaObjects only for
+ lacking resources
+
+This could cause us to misscount the number of media objects in a upnp
+browse request, and re-request items we already had in list giving
+us duplicated items in lists.
+---
+ lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
+index 3856001..f4d793d 100644
+--- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
++++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
+@@ -723,11 +723,6 @@ PLT_MediaItem::FromDidl(NPT_XmlElementNode* entry)
+     }
+ 
+     NPT_Result result = PLT_MediaObject::FromDidl(entry);
+-    
+-    // make sure we have at least one valid resource
+-    if (m_Resources.GetItemCount() == 0) {
+-        NPT_CHECK_SEVERE(NPT_ERROR_INVALID_PARAMETERS);
+-    }
+ 
+     return result;
+ }
+-- 
+1.7.11.msysgit.0
+