platinum: update patches

28 files changed, 221 insertions, 299 deletions

diff --git a/lib/libUPnP/patches/0001-platinum-fix-compile-error-in-NptZip.cpp.patch b/lib/libUPnP/patches/0001-platinum-fix-compile-error-in-NptZip.cpp.patch
new file mode 100644
index 0000000000..39cd35b25d
--- /dev/null
+++ b/lib/libUPnP/patches/0001-platinum-fix-compile-error-in-NptZip.cpp.patch
@@ -0,0 +1,25 @@
+From 9886ea3ec0cbdb198b31c8ece1b9a4100f4204b0 Mon Sep 17 00:00:00 2001
+From: montellese <montellese@xbmc.org>
+Date: Sat, 10 May 2014 10:05:06 +0200
+Subject: [PATCH 01/24] platinum: fix compile error in NptZip.cpp
+
+---
+ lib/libUPnP/Neptune/Source/Core/NptZip.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/libUPnP/Neptune/Source/Core/NptZip.cpp b/lib/libUPnP/Neptune/Source/Core/NptZip.cpp
+index 463a07f..bed1e55 100644
+--- a/lib/libUPnP/Neptune/Source/Core/NptZip.cpp
++++ b/lib/libUPnP/Neptune/Source/Core/NptZip.cpp
+@@ -280,7 +280,7 @@ NPT_ZipFile::GetInputStream(Entry& entry, NPT_InputStreamReference& zip_stream,
+         return NPT_ERROR_NOT_SUPPORTED;
+     }
+ #else
+-    if (entry.m_CompressionMethod != NPT_ZIP_COMPRESSION_METHOD_NONE) {
++    if (entry.m_CompressionMethod != NPT_ZIP_FILE_COMPRESSION_METHOD_NONE) {
+         return NPT_ERROR_NOT_SUPPORTED;
+     }
+ #endif
+-- 
+1.7.11.msysgit.0
+
diff --git a/lib/libUPnP/patches/0001-platinum-add-custom-Makefile.in.patch b/lib/libUPnP/patches/0002-platinum-add-custom-Makefile.in.patch
index a4e62cd76e..cc2ce2e77b 100644
--- a/lib/libUPnP/patches/0001-platinum-add-custom-Makefile.in.patch
+++ b/lib/libUPnP/patches/0002-platinum-add-custom-Makefile.in.patch
@@ -1,67 +1,43 @@
-From 7e2edf03681ee3f4446d11894d126206e486f3a0 Mon Sep 17 00:00:00 2001
+From 17f16bff49f6353b1afc98a8f14cfcedb4673ae8 Mon Sep 17 00:00:00 2001
 From: montellese <montellese@xbmc.org>
 Date: Thu, 9 Jan 2014 21:23:53 +0100
-Subject: [PATCH 01/21] platinum: add custom Makefile.in
+Subject: [PATCH 02/24] platinum: add custom Makefile.in
 
 ---
- lib/libUPnP/Makefile.in | 97 +++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 97 insertions(+)
+ lib/libUPnP/Makefile.in | 107 ++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 107 insertions(+)
  create mode 100644 lib/libUPnP/Makefile.in
 
 diff --git a/lib/libUPnP/Makefile.in b/lib/libUPnP/Makefile.in
 new file mode 100644
-index 0000000..e1f9462
+index 0000000..03dfdd8
 --- /dev/null
 +++ b/lib/libUPnP/Makefile.in
-@@ -0,0 +1,97 @@
+@@ -0,0 +1,107 @@
 +ARCH=@ARCH@
 +
 +ifeq (@USE_UPNP@, 1)
-+SRCS= Platinum/Source/Core/PltAction.cpp \
-+      Platinum/Source/Core/PltArgument.cpp \
-+      Platinum/Source/Core/PltConstants.cpp \
-+      Platinum/Source/Core/PltCtrlPoint.cpp \
-+      Platinum/Source/Core/PltCtrlPointTask.cpp \
-+      Platinum/Source/Core/PltDatagramStream.cpp \
-+      Platinum/Source/Core/PltDeviceData.cpp \
-+      Platinum/Source/Core/PltDeviceHost.cpp \
-+      Platinum/Source/Core/PltEvent.cpp \
-+      Platinum/Source/Core/PltHttp.cpp \
-+      Platinum/Source/Core/PltHttpClientTask.cpp \
-+      Platinum/Source/Core/PltHttpServer.cpp \
-+      Platinum/Source/Core/PltHttpServerTask.cpp \
-+      Platinum/Source/Core/PltIconsData.cpp \
-+      Platinum/Source/Core/PltMimeType.cpp \
-+      Platinum/Source/Core/PltProtocolInfo.cpp \
-+      Platinum/Source/Core/PltService.cpp \
-+      Platinum/Source/Core/PltSsdp.cpp \
-+      Platinum/Source/Core/PltStateVariable.cpp \
-+      Platinum/Source/Core/PltTaskManager.cpp \
-+      Platinum/Source/Core/PltThreadTask.cpp \
-+      Platinum/Source/Core/PltUPnP.cpp \
-+      Platinum/Source/Devices/MediaServer/PltDidl.cpp \
-+      Platinum/Source/Devices/MediaServer/PltFileMediaServer.cpp \
-+      Platinum/Source/Devices/MediaServer/PltMediaBrowser.cpp \
-+      Platinum/Source/Devices/MediaServer/PltMediaCache.cpp \
-+      Platinum/Source/Devices/MediaServer/PltMediaItem.cpp \
-+      Platinum/Source/Devices/MediaServer/PltMediaServer.cpp \
-+      Platinum/Source/Devices/MediaServer/ConnectionManagerSCPD.cpp \
-+      Platinum/Source/Devices/MediaServer/ContentDirectorySCPD.cpp \
-+      Platinum/Source/Devices/MediaServer/ContentDirectorywSearchSCPD.cpp \
-+      Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp \
-+      Neptune/Source/Core/Neptune.cpp \
++SRCS= Neptune/Source/Core/Neptune.cpp \
++      Neptune/Source/Core/NptAutomaticCleaner.cpp \
 +      Neptune/Source/Core/NptBase64.cpp \
 +      Neptune/Source/Core/NptBufferedStreams.cpp \
 +      Neptune/Source/Core/NptCommon.cpp \
++      Neptune/Source/Core/NptConsole.cpp \
++      Neptune/Source/Core/NptCrypto.cpp \
 +      Neptune/Source/Core/NptDataBuffer.cpp \
 +      Neptune/Source/Core/NptDebug.cpp \
++      Neptune/Source/Core/NptDigest.cpp \
++      Neptune/Source/Core/NptDynamicLibraries.cpp \
 +      Neptune/Source/Core/NptFile.cpp \
 +      Neptune/Source/Core/NptHash.cpp \
 +      Neptune/Source/Core/NptHttp.cpp \
++      Neptune/Source/Core/NptJson.cpp \
 +      Neptune/Source/Core/NptList.cpp \
++      Neptune/Source/Core/NptLogging.cpp \
 +      Neptune/Source/Core/NptMessaging.cpp \
 +      Neptune/Source/Core/NptNetwork.cpp \
 +      Neptune/Source/Core/NptQueue.cpp \
++      Neptune/Source/Core/NptResults.cpp \
 +      Neptune/Source/Core/NptRingBuffer.cpp \
 +      Neptune/Source/Core/NptSimpleMessageQueue.cpp \
 +      Neptune/Source/Core/NptSockets.cpp \
@@ -70,25 +46,59 @@ index 0000000..e1f9462
 +      Neptune/Source/Core/NptSystem.cpp \
 +      Neptune/Source/Core/NptThreads.cpp \
 +      Neptune/Source/Core/NptTime.cpp \
++      Neptune/Source/Core/NptTls.cpp \
 +      Neptune/Source/Core/NptUri.cpp \
 +      Neptune/Source/Core/NptUtils.cpp \
 +      Neptune/Source/Core/NptXml.cpp \
-+      Neptune/Source/System/Bsd/NptBsdSockets.cpp \
++      Neptune/Source/Core/NptZip.cpp \
 +      Neptune/Source/System/Bsd/NptBsdNetwork.cpp \
-+      Neptune/Source/System/Posix/NptPosixSystem.cpp \
-+      Neptune/Source/System/Posix/NptSelectableMessageQueue.cpp \
++      Neptune/Source/System/Bsd/NptBsdSockets.cpp \
 +      Neptune/Source/System/Posix/NptPosixQueue.cpp \
++      Neptune/Source/System/Posix/NptPosixSystem.cpp \
 +      Neptune/Source/System/Posix/NptPosixThreads.cpp \
 +      Neptune/Source/System/Posix/NptPosixTime.cpp \
++      Neptune/Source/System/Posix/NptSelectableMessageQueue.cpp \
 +      Neptune/Source/System/StdC/NptStdcDebug.cpp \
 +      Neptune/Source/System/StdC/NptStdcEnvironment.cpp \
-+      Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.cpp \
-+      Platinum/Source/Devices/MediaRenderer/PltMediaController.cpp \
++      Platinum/Source/Core/PltAction.cpp \
++      Platinum/Source/Core/PltArgument.cpp \
++      Platinum/Source/Core/PltConstants.cpp \
++      Platinum/Source/Core/PltCtrlPoint.cpp \
++      Platinum/Source/Core/PltCtrlPointTask.cpp \
++      Platinum/Source/Core/PltDatagramStream.cpp \
++      Platinum/Source/Core/PltDeviceData.cpp \
++      Platinum/Source/Core/PltDeviceHost.cpp \
++      Platinum/Source/Core/PltEvent.cpp \
++      Platinum/Source/Core/PltHttp.cpp \
++      Platinum/Source/Core/PltHttpClientTask.cpp \
++      Platinum/Source/Core/PltHttpServer.cpp \
++      Platinum/Source/Core/PltHttpServerTask.cpp \
++      Platinum/Source/Core/PltIconsData.cpp \
++      Platinum/Source/Core/PltMimeType.cpp \
++      Platinum/Source/Core/PltProtocolInfo.cpp \
++      Platinum/Source/Core/PltService.cpp \
++      Platinum/Source/Core/PltSsdp.cpp \
++      Platinum/Source/Core/PltStateVariable.cpp \
++      Platinum/Source/Core/PltTaskManager.cpp \
++      Platinum/Source/Core/PltThreadTask.cpp \
++      Platinum/Source/Core/PltUPnP.cpp \
++      Platinum/Source/Devices/MediaConnect/X_MS_MediaReceiverRegistrarSCPD.cpp \
++      Platinum/Source/Devices/MediaConnect/PltMediaConnect.cpp \
 +      Platinum/Source/Devices/MediaRenderer/AVTransportSCPD.cpp \
++      Platinum/Source/Devices/MediaRenderer/PltMediaController.cpp \
++      Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.cpp \
 +      Platinum/Source/Devices/MediaRenderer/RdrConnectionManagerSCPD.cpp \
 +      Platinum/Source/Devices/MediaRenderer/RenderingControlSCPD.cpp \
-+      Platinum/Source/Devices/MediaConnect/X_MS_MediaReceiverRegistrarSCPD.cpp \
-+      Platinum/Source/Devices/MediaConnect/PltMediaConnect.cpp \
++      Platinum/Source/Devices/MediaServer/ConnectionManagerSCPD.cpp \
++      Platinum/Source/Devices/MediaServer/ContentDirectorySCPD.cpp \
++      Platinum/Source/Devices/MediaServer/ContentDirectorywSearchSCPD.cpp \
++      Platinum/Source/Devices/MediaServer/PltDidl.cpp \
++      Platinum/Source/Devices/MediaServer/PltFileMediaServer.cpp \
++      Platinum/Source/Devices/MediaServer/PltMediaBrowser.cpp \
++      Platinum/Source/Devices/MediaServer/PltMediaCache.cpp \
++      Platinum/Source/Devices/MediaServer/PltMediaItem.cpp \
++      Platinum/Source/Devices/MediaServer/PltMediaServer.cpp \
++      Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp \
 +
 +ifeq ($(findstring osx,$(ARCH)),osx)
 +
diff --git a/lib/libUPnP/patches/0002-UPnP-Platinum-log-allowed-values-with-state-variable.patch b/lib/libUPnP/patches/0003-platinum-log-allowed-values-with-state-variable-erro.patch
index 05d8d6bfae..5a39207d96 100644
--- a/lib/libUPnP/patches/0002-UPnP-Platinum-log-allowed-values-with-state-variable.patch
+++ b/lib/libUPnP/patches/0003-platinum-log-allowed-values-with-state-variable-erro.patch
@@ -1,18 +1,18 @@
-From 58d8b1df5f6c631bd43c1bcda810a786c23de9ac Mon Sep 17 00:00:00 2001
+From 60f546b6f4a54a399a0cd0cece84486b7018c477 Mon Sep 17 00:00:00 2001
 From: Alasdair Campbell <alcoheca@gmail.com>
 Date: Wed, 6 Jun 2012 17:04:31 +0100
-Subject: [PATCH 02/21] [UPnP] Platinum - log allowed values with state
- variable errors
+Subject: [PATCH 03/24] platinum: log allowed values with state variable
+ errors
 
 ---
  lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp | 14 +++++++++-----
  1 file changed, 9 insertions(+), 5 deletions(-)
 
 diff --git a/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp b/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
-index 5dd2d61..229e304 100644
+index a772bbf..c3eb7cc 100644
 --- a/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
 +++ b/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
-@@ -197,12 +197,16 @@ PLT_StateVariable::ValidateValue(const char* value)
+@@ -198,12 +198,16 @@ PLT_StateVariable::ValidateValue(const char* value)
              NPT_List<NPT_String>::Iterator val = values.GetFirstItem();
              while (val) {
                  val->Trim(" ");
diff --git a/lib/libUPnP/patches/0004-UPnP-reinstated-fixed-upnp-server-s-http-server-woul.patch b/lib/libUPnP/patches/0004-UPnP-reinstated-fixed-upnp-server-s-http-server-woul.patch
deleted file mode 100644
index c5355a1291..0000000000
--- a/lib/libUPnP/patches/0004-UPnP-reinstated-fixed-upnp-server-s-http-server-woul.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e332ca20095fccfea9478650120c37f03fb500fd Mon Sep 17 00:00:00 2001
-From: Alasdair Campbell <alcoheca@gmail.com>
-Date: Wed, 6 Jun 2012 18:02:16 +0100
-Subject: [PATCH 03/21] [UPnP] reinstated: 'fixed: upnp server's http server
- would not provide content length on HEAD requests' by
- elupus @ 9cbcf5063c3af350d385f1992017f6883f37a8e0
-
----
- lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.cpp b/lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.cpp
-index 11a7ac0..7ffed7e 100644
---- a/lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.cpp
-+++ b/lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.cpp
-@@ -279,7 +279,7 @@ PLT_HttpServerSocketTask::Write(NPT_HttpResponse* response,
-     // get the request entity to set additional headers
-     NPT_InputStreamReference body_stream;
-     NPT_HttpEntity* entity = response->GetEntity();
--    if (entity && NPT_SUCCEEDED(entity->GetInputStream(body_stream))) {
-+    if (entity) {
-         // set the content length if known
-         if (entity->ContentLengthIsKnown()) {
-             headers.SetHeader(NPT_HTTP_HEADER_CONTENT_LENGTH, 
-@@ -341,7 +341,7 @@ PLT_HttpServerSocketTask::Write(NPT_HttpResponse* response,
-     NPT_CHECK_WARNING(output_stream->WriteFully(header_stream.GetData(), header_stream.GetDataSize()));
- 
-     // send response body if any
--    if (!headers_only && !body_stream.IsNull()) {
-+    if (!headers_only && NPT_SUCCEEDED(entity->GetInputStream(body_stream)) && !body_stream.IsNull()) {
-         NPT_CHECK_WARNING(NPT_StreamToStreamCopy(
-             *body_stream.AsPointer(), 
-             *output_stream.AsPointer(),
--- 
-1.7.11.msysgit.0
-
diff --git a/lib/libUPnP/patches/0003-UPnP-reinstated-changed-make-sure-Neptune-threads-ar.patch b/lib/libUPnP/patches/0004-platinum-make-sure-Neptune-threads-are-named.patch
index ab199dfb0a..d2625625ed 100644
--- a/lib/libUPnP/patches/0003-UPnP-reinstated-changed-make-sure-Neptune-threads-ar.patch
+++ b/lib/libUPnP/patches/0004-platinum-make-sure-Neptune-threads-are-named.patch
@@ -1,18 +1,17 @@
-From 922c1b38eddeca181acfba39c17e28819e8e18da Mon Sep 17 00:00:00 2001
+From e8af954923d374303564863c8fe6a41499bf43c5 Mon Sep 17 00:00:00 2001
 From: Alasdair Campbell <alcoheca@gmail.com>
 Date: Wed, 6 Jun 2012 19:22:09 +0100
-Subject: [PATCH] [UPnP] reinstated: 'changed: make sure Neptune threads are
- named' by elupus @ 42d7b6b9180f634f988e12673de655228233b305
+Subject: [PATCH 04/24] platinum: make sure Neptune threads are named
 
 ---
  .../Source/System/Win32/NptWin32Threads.cpp        | 22 ++++++++++++++++++++++
  1 file changed, 22 insertions(+)
 
 diff --git a/lib/libUPnP/Neptune/Source/System/Win32/NptWin32Threads.cpp b/lib/libUPnP/Neptune/Source/System/Win32/NptWin32Threads.cpp
-index bd32fb3..aca91a1 100644
+index 9666a4c..8de7d74 100644
 --- a/lib/libUPnP/Neptune/Source/System/Win32/NptWin32Threads.cpp
 +++ b/lib/libUPnP/Neptune/Source/System/Win32/NptWin32Threads.cpp
-@@ -506,6 +506,28 @@ NPT_Win32Thread::EntryPoint(void* argument)
+@@ -521,6 +521,28 @@ NPT_Win32Thread::EntryPoint(void* argument)
      NPT_System::GetCurrentTimeStamp(now);
      NPT_System::SetRandomSeed((NPT_UInt32)(now.ToNanos()) + ::GetCurrentThreadId());
  
diff --git a/lib/libUPnP/patches/0005-UPnP-reinstated-UPnP-use-server-provided-item-count-.patch b/lib/libUPnP/patches/0005-platinum-use-server-provided-item-count-to-iterate-b.patch
index ed7d3cc2f4..b35bd0b1c9 100644
--- a/lib/libUPnP/patches/0005-UPnP-reinstated-UPnP-use-server-provided-item-count-.patch
+++ b/lib/libUPnP/patches/0005-platinum-use-server-provided-item-count-to-iterate-b.patch
@@ -1,9 +1,8 @@
-From db5f6f17dad070f8046a80bf6077914b7fe86182 Mon Sep 17 00:00:00 2001
+From 883f4f02d741317f5c8c6866d38b4b78dd79adf1 Mon Sep 17 00:00:00 2001
 From: Alasdair Campbell <alcoheca@gmail.com>
 Date: Wed, 6 Jun 2012 18:40:00 +0100
-Subject: [PATCH 07/21] [UPnP] reinstated: '[UPnP] use server provided item
- count to iterate browse req' by elupus @
- cb110ea28b7506cb31d6ab4fd347fad1c96ec9ed
+Subject: [PATCH 05/24] platinum: use server provided item count to iterate
+ browse req
 
 all other modifications to libPlatinum/Neptune since codiqs last commit have
 been checked and are not required / have been included upstream
@@ -39,7 +38,7 @@ ec70e260e95becc5bfcd86512b245776ef9653ea
  1 file changed, 12 insertions(+), 4 deletions(-)
 
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp
-index 2bd23f8..091ae00 100644
+index f6391fb..96c36df 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp
 @@ -36,6 +36,7 @@
diff --git a/lib/libUPnP/patches/0006-upnp-report-and-support-proper-mimetypes-for-matrosk.patch b/lib/libUPnP/patches/0006-platinum-report-and-support-proper-mimetypes-for-mat.patch
index 6f2e9324e0..12f811e69f 100644
--- a/lib/libUPnP/patches/0006-upnp-report-and-support-proper-mimetypes-for-matrosk.patch
+++ b/lib/libUPnP/patches/0006-platinum-report-and-support-proper-mimetypes-for-mat.patch
@@ -1,17 +1,18 @@
-From 404163dca7899d7dfb3b64d65b83adc7d9eeb173 Mon Sep 17 00:00:00 2001
+From 0b4a39723d3476c8a279a787660065ac1a64767a Mon Sep 17 00:00:00 2001
 From: Joakim Plate <elupus@ecce.se>
 Date: Tue, 25 Sep 2012 23:32:48 +0200
-Subject: [PATCH] upnp: report and support proper mimetypes for matroska
+Subject: [PATCH 06/24] platinum: report and support proper mimetypes for
+ matroska
 
 ---
  lib/libUPnP/Neptune/Source/Core/NptHttp.cpp | 3 +++
  1 file changed, 3 insertions(+)
 
 diff --git a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
-index a756fd8..07586f9 100644
+index 132746a..1700afc 100644
 --- a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
 +++ b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
-@@ -2880,12 +2880,14 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = {
+@@ -2779,12 +2779,14 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = {
      {"aif",  "audio/x-aiff"},
      {"aifc", "audio/x-aiff"},
      {"aiff", "audio/x-aiff"},
@@ -26,7 +27,7 @@ index a756fd8..07586f9 100644
      {"mpeg", "video/mpeg"},
      {"mpg",  "video/mpeg"},
      {"mp4",  "video/mp4"},
-@@ -2898,6 +2900,7 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = {
+@@ -2797,6 +2799,7 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = {
      {"wtv",  "video/x-ms-wmv"},
      {"asf",  "video/x-ms-asf"},
      {"mkv",  "video/x-matroska"},
diff --git a/lib/libUPnP/patches/0007-UPnP-Platinum-should-also-support-sort-criterias-in-.patch b/lib/libUPnP/patches/0007-platinum-also-support-sort-criterias-in-format-res-p.patch
index c6c06bbe40..da4d9363b5 100644
--- a/lib/libUPnP/patches/0007-UPnP-Platinum-should-also-support-sort-criterias-in-.patch
+++ b/lib/libUPnP/patches/0007-platinum-also-support-sort-criterias-in-format-res-p.patch
@@ -1,18 +1,18 @@
-From d5a14410bcc80340a29879fc2351865c45e373fc Mon Sep 17 00:00:00 2001
+From 091b91cdba14242c965dc5a41d74ba00386a5d91 Mon Sep 17 00:00:00 2001
 From: Alasdair Campbell <alcoheca@gmail.com>
 Date: Fri, 14 Sep 2012 11:12:03 +0100
-Subject: [PATCH 08/21] [UPnP] Platinum should also support sort criterias in
- format res@<property>
+Subject: [PATCH 07/24] platinum: also support sort criterias in format
+ res@<property>
 
 ---
  lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.cpp | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.cpp
-index 990869a..5b01b54 100644
+index b8ce964..e275069 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.cpp
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.cpp
-@@ -336,6 +336,8 @@ PLT_MediaServer::ParseSort(const NPT_String& sort, NPT_List<NPT_String>& list)
+@@ -342,6 +342,8 @@ PLT_MediaServer::ParseSort(const NPT_String& sort, NPT_List<NPT_String>& list)
      NPT_List<NPT_String>::Iterator property = list.GetFirstItem();
      while (property) {
          NPT_List<NPT_String> parsed_property = (*property).Split(":");
diff --git a/lib/libUPnP/patches/0008-Platinum-allow-some-statevariables-to-reset-to-defau.patch b/lib/libUPnP/patches/0008-platinum-allow-some-statevariables-to-reset-to-defau.patch
index 4dd76838a8..8841447ad7 100644
--- a/lib/libUPnP/patches/0008-Platinum-allow-some-statevariables-to-reset-to-defau.patch
+++ b/lib/libUPnP/patches/0008-platinum-allow-some-statevariables-to-reset-to-defau.patch
@@ -1,7 +1,7 @@
-From ad0db59a112ff4cf62ffc18c9565e48b90c4e4e2 Mon Sep 17 00:00:00 2001
+From 73a60837afb1a0ddf03ac500665c28853d95dca8 Mon Sep 17 00:00:00 2001
 From: Alasdair Campbell <alcoheca@gmail.com>
 Date: Tue, 9 Oct 2012 10:14:39 +0100
-Subject: [PATCH 04/21] Platinum: allow some statevariables to reset to
+Subject: [PATCH 08/24] platinum: allow some statevariables to reset to
  default value after sending completed (needed for
  ContainerUpdateIDs usage)
 
@@ -13,10 +13,10 @@ Subject: [PATCH 04/21] Platinum: allow some statevariables to reset to
  4 files changed, 34 insertions(+), 6 deletions(-)
 
 diff --git a/lib/libUPnP/Platinum/Source/Core/PltService.cpp b/lib/libUPnP/Platinum/Source/Core/PltService.cpp
-index 3280b15..62bdc49 100644
+index b1fec51..b86fb23 100644
 --- a/lib/libUPnP/Platinum/Source/Core/PltService.cpp
 +++ b/lib/libUPnP/Platinum/Source/Core/PltService.cpp
-@@ -460,14 +460,14 @@ PLT_Service::IsSubscribable()
+@@ -459,14 +459,14 @@ PLT_Service::IsSubscribable()
  |   PLT_Service::SetStateVariable
  +---------------------------------------------------------------------*/
  NPT_Result
@@ -33,8 +33,8 @@ index 3280b15..62bdc49 100644
  }
  
  /*----------------------------------------------------------------------
-@@ -838,6 +838,13 @@ PLT_Service::NotifyChanged()
-         delete sub;
+@@ -835,6 +835,13 @@ PLT_Service::NotifyChanged()
+         m_Subscribers.Erase(sub_iter++);
      }
  
 +    // some state variables must be cleared immediatly after sending
@@ -48,7 +48,7 @@ index 3280b15..62bdc49 100644
  }
  
 diff --git a/lib/libUPnP/Platinum/Source/Core/PltService.h b/lib/libUPnP/Platinum/Source/Core/PltService.h
-index c03a552..9bd4d12 100644
+index 84959f2..0401ea2 100644
 --- a/lib/libUPnP/Platinum/Source/Core/PltService.h
 +++ b/lib/libUPnP/Platinum/Source/Core/PltService.h
 @@ -216,8 +216,9 @@ public:
@@ -63,20 +63,20 @@ index c03a552..9bd4d12 100644
      /**
       Certain state variables notifications must not be sent faster than a certain 
 diff --git a/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp b/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
-index 229e304..47aeb5a 100644
+index c3eb7cc..d38392e 100644
 --- a/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
 +++ b/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
-@@ -48,7 +48,8 @@ NPT_SET_LOCAL_LOGGER("platinum.core.statevariable")
- PLT_StateVariable::PLT_StateVariable(PLT_Service* service) : 
+@@ -49,7 +49,8 @@ PLT_StateVariable::PLT_StateVariable(PLT_Service* service) :
      m_Service(service), 
      m_AllowedValueRange(NULL),
+     m_IsSendingEvents(false),
 -    m_IsSendingEventsIndirectly(true)
 +    m_IsSendingEventsIndirectly(true),
 +    m_ShouldClearOnSend(false)
  {
  }
  
-@@ -145,7 +146,7 @@ PLT_StateVariable::SetRate(NPT_TimeInterval rate)
+@@ -146,7 +147,7 @@ PLT_StateVariable::SetRate(NPT_TimeInterval rate)
  |   PLT_StateVariable::SetValue
  +---------------------------------------------------------------------*/
  NPT_Result
@@ -85,7 +85,7 @@ index 229e304..47aeb5a 100644
  {
      if (value == NULL) {
          return NPT_FAILURE;
-@@ -159,6 +160,7 @@ PLT_StateVariable::SetValue(const char* value)
+@@ -160,6 +161,7 @@ PLT_StateVariable::SetValue(const char* value)
          }
  
          m_Value = value;
@@ -93,7 +93,7 @@ index 229e304..47aeb5a 100644
          m_Service->AddChanged(this); 
      }
  
-@@ -183,6 +185,16 @@ PLT_StateVariable::IsReadyToPublish()
+@@ -184,6 +186,16 @@ PLT_StateVariable::IsReadyToPublish()
  }
  
  /*----------------------------------------------------------------------
diff --git a/lib/libUPnP/patches/0009-UPnP-add-support-for-upnp-lastPlaybackPosition-upnp-.patch b/lib/libUPnP/patches/0009-platinum-add-support-for-upnp-lastPlaybackPosition-u.patch
index 1c7e200075..4a8efb1ccb 100644
--- a/lib/libUPnP/patches/0009-UPnP-add-support-for-upnp-lastPlaybackPosition-upnp-.patch
+++ b/lib/libUPnP/patches/0009-platinum-add-support-for-upnp-lastPlaybackPosition-u.patch
@@ -1,7 +1,7 @@
-From e36e418d536733d04dc4cbab2ee520a31e4cfe69 Mon Sep 17 00:00:00 2001
+From 5f4aa26956ebc15e774186955e49cc7c77896f0e Mon Sep 17 00:00:00 2001
 From: Alasdair Campbell <alcoheca@gmail.com>
 Date: Mon, 30 Jul 2012 13:02:34 +0100
-Subject: [PATCH 09/21] [UPnP] add support for upnp:lastPlaybackPosition,
+Subject: [PATCH 09/24] platinum: add support for upnp:lastPlaybackPosition,
  upnp:lastPlaybackTime and upnp:playbackCount
 
 ---
@@ -10,7 +10,7 @@ Subject: [PATCH 09/21] [UPnP] add support for upnp:lastPlaybackPosition,
  2 files changed, 46 insertions(+)
 
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-index 5b974e8..214f13d 100644
+index 62e0ba9..3ec7696 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
 @@ -183,6 +183,9 @@ PLT_MediaObject::Reset()
@@ -23,7 +23,7 @@ index 5b974e8..214f13d 100644
      m_MiscInfo.dvdregioncode		 = 0;
      m_MiscInfo.toc					 = "";
      m_MiscInfo.user_annotation		 = "";
-@@ -317,6 +320,27 @@ PLT_MediaObject::ToDidl(NPT_UInt32 mask, NPT_String& didl)
+@@ -316,6 +319,27 @@ PLT_MediaObject::ToDidl(NPT_UInt32 mask, NPT_String& didl)
          didl += "</upnp:originalTrackNumber>";
      }
  
@@ -51,7 +51,7 @@ index 5b974e8..214f13d 100644
      // program title
      if (mask & PLT_FILTER_MASK_PROGRAMTITLE && !m_Recorded.program_title.IsEmpty()) {
          didl += "<upnp:programTitle>";
-@@ -511,6 +535,25 @@ PLT_MediaObject::FromDidl(NPT_XmlElementNode* entry)
+@@ -510,6 +534,25 @@ PLT_MediaObject::FromDidl(NPT_XmlElementNode* entry)
      if (NPT_FAILED(str.ToInteger(value))) value = 0;
      m_MiscInfo.original_track_number = value;
  
@@ -78,7 +78,7 @@ index 5b974e8..214f13d 100644
      PLT_XmlHelper::GetChildren(entry, children, "res");
      for (NPT_Cardinal i=0; i<children.GetItemCount(); i++) {
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
-index 3ebc3b0..8261244 100644
+index 81f3dc8..cc3bdf9 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
 @@ -130,6 +130,9 @@ typedef struct {
diff --git a/lib/libUPnP/patches/0010-Platinum-use-PersonRole-for-directors.-Also-fixes-Fr.patch b/lib/libUPnP/patches/0010-platinum-use-PersonRole-for-directors.-Also-fixes-Fr.patch
index 6389f7a03a..76da4278c1 100644
--- a/lib/libUPnP/patches/0010-Platinum-use-PersonRole-for-directors.-Also-fixes-Fr.patch
+++ b/lib/libUPnP/patches/0010-platinum-use-PersonRole-for-directors.-Also-fixes-Fr.patch
@@ -1,7 +1,7 @@
-From b4bfe2c005f264691f77982127790e45fe6ac51d Mon Sep 17 00:00:00 2001
+From 501fb90b02537c45837526677220c67b8d8eb3f3 Mon Sep 17 00:00:00 2001
 From: Alasdair Campbell <alcoheca@gmail.com>
 Date: Sun, 7 Oct 2012 10:46:54 +0100
-Subject: [PATCH 10/21] Platinum: use PersonRole for directors. Also fixes
+Subject: [PATCH 10/24] platinum: use PersonRole for directors. Also fixes
  ::FromDidl for authors, actors, directors -
  previously duplicate entries were present
 
@@ -73,7 +73,7 @@ index f6eaf14..c50d450 100644
  #define PLT_FILTER_FIELD_GENRE                      "upnp:genre"
  #define PLT_FILTER_FIELD_ALBUMARTURI                "upnp:albumArtURI"
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-index 214f13d..64437d2 100644
+index 3ec7696..d46d1a5 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
 @@ -253,6 +253,11 @@ PLT_MediaObject::ToDidl(NPT_UInt32 mask, NPT_String& didl)
@@ -88,7 +88,7 @@ index 214f13d..64437d2 100644
      // album
      if ((mask & PLT_FILTER_MASK_ALBUM) && !m_Affiliation.album.IsEmpty()) {
          didl += "<upnp:album>";
-@@ -489,15 +494,22 @@ PLT_MediaObject::FromDidl(NPT_XmlElementNode* entry)
+@@ -488,15 +493,22 @@ PLT_MediaObject::FromDidl(NPT_XmlElementNode* entry)
      m_Title = m_Title.SubString(0, 256);    
      m_ObjectClass.type =  m_ObjectClass.type.SubString(0, 256);
  
@@ -101,7 +101,7 @@ index 214f13d..64437d2 100644
      m_People.authors.FromDidl(children);
      
 +    children.Clear();
-     PLT_XmlHelper::GetChildren(entry, children, "actors", didl_namespace_upnp);
+     PLT_XmlHelper::GetChildren(entry, children, "actor", didl_namespace_upnp);
      m_People.actors.FromDidl(children);
  
 +    children.Clear();
@@ -112,7 +112,7 @@ index 214f13d..64437d2 100644
      PLT_XmlHelper::GetChildText(entry, "programTitle", m_Recorded.program_title, didl_namespace_upnp);
      PLT_XmlHelper::GetChildText(entry, "seriesTitle", m_Recorded.series_title, didl_namespace_upnp);
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
-index 8261244..84704b1 100644
+index cc3bdf9..fe04f34 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
 @@ -91,7 +91,7 @@ typedef struct {
diff --git a/lib/libUPnP/patches/0011-UPnP-support-video-ratings.patch b/lib/libUPnP/patches/0011-platinum-support-video-ratings.patch
index ec6201bbff..c97d6491da 100644
--- a/lib/libUPnP/patches/0011-UPnP-support-video-ratings.patch
+++ b/lib/libUPnP/patches/0011-platinum-support-video-ratings.patch
@@ -1,7 +1,7 @@
-From 8e9605a51d2d05c6f8784eed86e5764506bc57b2 Mon Sep 17 00:00:00 2001
+From a650caab79695b0caaef7b860ae59086a335bb30 Mon Sep 17 00:00:00 2001
 From: Alasdair Campbell <alcoheca@gmail.com>
 Date: Sat, 6 Oct 2012 23:35:52 +0100
-Subject: [PATCH 11/21] [UPnP] support video ratings
+Subject: [PATCH 11/24] platinum: support video ratings
 
 ---
  lib/libUPnP/Platinum/Source/Devices/MediaServer/PltDidl.h        | 8 +++++---
@@ -36,10 +36,10 @@ index c50d450..8d9704f 100644
  #define PLT_FILTER_FIELD_PROGRAMTITLE               "upnp:programTitle"
  #define PLT_FILTER_FIELD_SERIESTITLE                "upnp:seriesTitle"
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-index 64437d2..0a55eef 100644
+index d46d1a5..3416112 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-@@ -318,6 +318,13 @@ PLT_MediaObject::ToDidl(NPT_UInt32 mask, NPT_String& didl)
+@@ -317,6 +317,13 @@ PLT_MediaObject::ToDidl(NPT_UInt32 mask, NPT_String& didl)
          didl += "</upnp:icon>";
      }
  
@@ -53,7 +53,7 @@ index 64437d2..0a55eef 100644
      // original track number
      if ((mask & PLT_FILTER_MASK_ORIGINALTRACK) && m_MiscInfo.original_track_number > 0) {
          didl += "<upnp:originalTrackNumber>";
-@@ -529,6 +536,7 @@ PLT_MediaObject::FromDidl(NPT_XmlElementNode* entry)
+@@ -528,6 +535,7 @@ PLT_MediaObject::FromDidl(NPT_XmlElementNode* entry)
      PLT_XmlHelper::GetChildText(entry, "description", m_Description.description, didl_namespace_dc);
      PLT_XmlHelper::GetChildText(entry, "longDescription", m_Description.long_description, didl_namespace_upnp);
      PLT_XmlHelper::GetChildText(entry, "icon", m_Description.icon_uri, didl_namespace_upnp);
diff --git a/lib/libUPnP/patches/0012-UPnP-increase-number-of-requested-items-per-iteratio.patch b/lib/libUPnP/patches/0012-platinum-increase-number-of-requested-items-per-iter.patch
index 48604a06d2..93402a2ff9 100644
--- a/lib/libUPnP/patches/0012-UPnP-increase-number-of-requested-items-per-iteratio.patch
+++ b/lib/libUPnP/patches/0012-platinum-increase-number-of-requested-items-per-iter.patch
@@ -1,7 +1,7 @@
-From 76de0e319e443f8fde00979682280005930ffcf9 Mon Sep 17 00:00:00 2001
+From 058d7557b61afc45d83f98477f3ef5d1ab6cb571 Mon Sep 17 00:00:00 2001
 From: Alasdair Campbell <alcoheca@gmail.com>
 Date: Thu, 11 Oct 2012 13:22:35 +0100
-Subject: [PATCH 12/21] [UPnP] increase number of requested items per
+Subject: [PATCH 12/24] platinum: increase number of requested items per
  iteration. gives 2-3 times speed up.
 
 ---
@@ -9,7 +9,7 @@ Subject: [PATCH 12/21] [UPnP] increase number of requested items per
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp
-index 091ae00..bea1064 100644
+index 96c36df..24219ff 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp
 @@ -262,7 +262,7 @@ PLT_SyncMediaBrowser::BrowseSync(PLT_DeviceDataReference&      device,
diff --git a/lib/libUPnP/patches/0013-upnp-fixes-support-for-filtering-by-the-extended-pro.patch b/lib/libUPnP/patches/0013-platinum-fixes-support-for-filtering-by-the-extended.patch
index 5a6113e19d..6e7333bc2f 100644
--- a/lib/libUPnP/patches/0013-upnp-fixes-support-for-filtering-by-the-extended-pro.patch
+++ b/lib/libUPnP/patches/0013-platinum-fixes-support-for-filtering-by-the-extended.patch
@@ -1,7 +1,7 @@
-From 3f9fff2f4372991836c1691d8c5fb2a91424c2aa Mon Sep 17 00:00:00 2001
+From 38538aa36eaf64d7bcff662735ae9b5a0c1db08c Mon Sep 17 00:00:00 2001
 From: Alasdair Campbell <alcoheca@gmail.com>
 Date: Thu, 25 Oct 2012 11:59:46 +0100
-Subject: [PATCH 13/21] upnp: fixes support for filtering by the extended
+Subject: [PATCH 13/24] platinum: fixes support for filtering by the extended
  properties we need
 
 ---
@@ -42,7 +42,7 @@ index 2c20b25..6ad2ec4 100644
              mask |= PLT_FILTER_MASK_RES;
          } else if (NPT_String::CompareN(s+i, PLT_FILTER_FIELD_RES_DURATION, len, true) == 0 ||
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-index 0a55eef..01cf13f 100644
+index 3416112..b10d75a 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
 @@ -171,6 +171,7 @@ PLT_MediaObject::Reset()
@@ -54,7 +54,7 @@ index 0a55eef..01cf13f 100644
      m_Affiliation.album     = "";
      m_Affiliation.genres.Clear();
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h
-index e628af9..5722b82 100644
+index 0fe43b5..e8cb7c6 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h
 @@ -118,7 +118,7 @@ protected:
diff --git a/lib/libUPnP/patches/0014-Platinum-switch-to-NPT_UInt64-for-bitmask-flags.patch b/lib/libUPnP/patches/0014-platinum-switch-to-NPT_UInt64-for-bitmask-flags.patch
index 873a6cd177..288ccbd197 100644
--- a/lib/libUPnP/patches/0014-Platinum-switch-to-NPT_UInt64-for-bitmask-flags.patch
+++ b/lib/libUPnP/patches/0014-platinum-switch-to-NPT_UInt64-for-bitmask-flags.patch
@@ -1,7 +1,7 @@
-From 5e3cec1f974afc902a916e3cfb931c584d61245b Mon Sep 17 00:00:00 2001
+From 7f93296d158095f59169d12c4181af060f4b9884 Mon Sep 17 00:00:00 2001
 From: Alasdair Campbell <alcoheca@gmail.com>
 Date: Fri, 26 Oct 2012 12:30:04 +0100
-Subject: [PATCH 14/21] Platinum: switch to NPT_UInt64 for bitmask flags
+Subject: [PATCH 14/24] platinum: switch to NPT_UInt64 for bitmask flags
 
 ---
  .../Source/Devices/MediaServer/PltDidl.cpp         |  6 +-
@@ -133,7 +133,7 @@ index 8d9704f..29ce9ca 100644
  
  #endif /* _PLT_DIDL_H_ */
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-index 01cf13f..a3561fd 100644
+index b10d75a..31bc16c 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
 @@ -215,7 +215,7 @@ PLT_MediaObject::ToDidl(const NPT_String& filter, NPT_String& didl)
@@ -145,7 +145,7 @@ index 01cf13f..a3561fd 100644
  {
      // title is required
      didl += "<dc:title>";
-@@ -683,7 +683,7 @@ PLT_MediaItem::ToDidl(const NPT_String& filter, NPT_String& didl)
+@@ -682,7 +682,7 @@ PLT_MediaItem::ToDidl(const NPT_String& filter, NPT_String& didl)
  |   PLT_MediaItem::ToDidl
  +---------------------------------------------------------------------*/
  NPT_Result
@@ -154,7 +154,7 @@ index 01cf13f..a3561fd 100644
  {
      didl += "<item id=\"";
  
-@@ -774,7 +774,7 @@ PLT_MediaContainer::ToDidl(const NPT_String& filter, NPT_String& didl)
+@@ -773,7 +773,7 @@ PLT_MediaContainer::ToDidl(const NPT_String& filter, NPT_String& didl)
  |   PLT_MediaContainer::ToDidl
  +---------------------------------------------------------------------*/
  NPT_Result
@@ -164,7 +164,7 @@ index 01cf13f..a3561fd 100644
  	// container id property
      didl += "<container id=\"";
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
-index 84704b1..6cd597d 100644
+index fe04f34..2449276 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.h
 @@ -196,7 +196,7 @@ public:
@@ -195,7 +195,7 @@ index 84704b1..6cd597d 100644
  
  public:
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h
-index 5722b82..e83a73b 100644
+index e8cb7c6..94f1ab3 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h
 @@ -118,7 +118,7 @@ protected:
diff --git a/lib/libUPnP/patches/0015-Platinum-fix-missing-filtering-for-extra-metadata.patch b/lib/libUPnP/patches/0015-platinum-fix-missing-filtering-for-extra-metadata.patch
index 6664604a4c..ad8e0b1ff1 100644
--- a/lib/libUPnP/patches/0015-Platinum-fix-missing-filtering-for-extra-metadata.patch
+++ b/lib/libUPnP/patches/0015-platinum-fix-missing-filtering-for-extra-metadata.patch
@@ -1,7 +1,7 @@
-From 9f4aff60ebe92e98df47ae61e243af1a845c1c42 Mon Sep 17 00:00:00 2001
+From c6d2a53c63a065a974c3f8fd1df29c30c2e2b40a Mon Sep 17 00:00:00 2001
 From: Alasdair Campbell <alcoheca@gmail.com>
 Date: Fri, 26 Oct 2012 12:57:58 +0100
-Subject: [PATCH 15/21] Platinum: fix missing filtering for extra metadata
+Subject: [PATCH 15/24] platinum: fix missing filtering for extra metadata
 
 ---
  lib/libUPnP/Platinum/Source/Devices/MediaServer/PltDidl.cpp      | 6 ++++++
@@ -52,10 +52,10 @@ index 29ce9ca..9af9725 100644
  #define PLT_FILTER_FIELD_SEARCHABLE                 "@searchable"
  #define PLT_FILTER_FIELD_CHILDCOUNT                 "@childcount"
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-index a3561fd..3856001 100644
+index 31bc16c..af6bc3b 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-@@ -334,21 +334,21 @@ PLT_MediaObject::ToDidl(NPT_UInt64 mask, NPT_String& didl)
+@@ -333,21 +333,21 @@ PLT_MediaObject::ToDidl(NPT_UInt64 mask, NPT_String& didl)
      }
  
      // last playback position
diff --git a/lib/libUPnP/patches/0016-osx-fix-compilation-by-using-the-right-suffix-for-64.patch b/lib/libUPnP/patches/0016-platinum-fix-compilation-by-using-the-right-suffix-f.patch
index 3c24bff966..162c4c727d 100644
--- a/lib/libUPnP/patches/0016-osx-fix-compilation-by-using-the-right-suffix-for-64.patch
+++ b/lib/libUPnP/patches/0016-platinum-fix-compilation-by-using-the-right-suffix-f.patch
@@ -1,8 +1,8 @@
-From 152462afb82c13dd2a723f1c256c07e86457ccc3 Mon Sep 17 00:00:00 2001
+From 5b2c16078401c8de2fdd7530df8d8d485c288495 Mon Sep 17 00:00:00 2001
 From: Memphiz <memphis@machzwo.de>
 Date: Fri, 26 Oct 2012 18:08:59 +0200
-Subject: [PATCH 16/21] [osx] - fix compilation by using the right suffix for
- 64bit constants
+Subject: [PATCH 16/24] platinum: fix compilation by using the right suffix
+ for 64bit constants
 
 ---
  .../Platinum/Source/Devices/MediaServer/PltDidl.h  | 72 +++++++++++-----------
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
index 3e83fd1df3..35e49044da 100644
--- 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
@@ -1,7 +1,7 @@
-From 3d0063a78b969478fe6965e31aa5dd4d8f5b45d9 Mon Sep 17 00:00:00 2001
+From e4e282340a1524a5a01cce7ac9c03646d4df14a9 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
+Subject: [PATCH 17/24] platinum: don't disregard PLT_MediaObjects only for
  lacking resources
 
 This could cause us to misscount the number of media objects in a upnp
@@ -12,10 +12,10 @@ us duplicated items in lists.
  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
+index af6bc3b..514a1ab 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)
+@@ -722,11 +722,6 @@ PLT_MediaItem::FromDidl(NPT_XmlElementNode* entry)
      }
  
      NPT_Result result = PLT_MediaObject::FromDidl(entry);
diff --git a/lib/libUPnP/patches/0018-Platinum-add-SetNextAVTransportURI-support-to-media-.patch b/lib/libUPnP/patches/0018-platinum-add-SetNextAVTransportURI-support-to-media-.patch
index 7cd46de87e..cafb494a1e 100644
--- a/lib/libUPnP/patches/0018-Platinum-add-SetNextAVTransportURI-support-to-media-.patch
+++ b/lib/libUPnP/patches/0018-platinum-add-SetNextAVTransportURI-support-to-media-.patch
@@ -1,17 +1,17 @@
-From a3e34ef19a3dd3751b382374cfed64ac55765cde Mon Sep 17 00:00:00 2001
+From 365faa24a48af37eb9c31f650187ff38be4eccb2 Mon Sep 17 00:00:00 2001
 From: Joakim Plate <elupus@ecce.se>
 Date: Sun, 4 Nov 2012 17:23:18 +0100
-Subject: [PATCH 18/21] Platinum: add SetNextAVTransportURI support to media
+Subject: [PATCH 18/24] platinum: add SetNextAVTransportURI support to media
  renderer base
 
 ---
  .../Devices/MediaRenderer/AVTransportSCPD.cpp      | 1889 ++++++++++----------
  .../Devices/MediaRenderer/AVTransportSCPD.xml      |   20 +
- .../Devices/MediaRenderer/PltMediaController.cpp   |   12 +-
+ .../Devices/MediaRenderer/PltMediaController.cpp   |    4 +
  .../Devices/MediaRenderer/PltMediaController.h     |    5 +
  .../Devices/MediaRenderer/PltMediaRenderer.cpp     |   30 +
  .../Devices/MediaRenderer/PltMediaRenderer.h       |    2 +
- 6 files changed, 1016 insertions(+), 942 deletions(-)
+ 6 files changed, 1012 insertions(+), 938 deletions(-)
 
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/AVTransportSCPD.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/AVTransportSCPD.cpp
 index 1c1fa44..64014ed 100644
@@ -1945,25 +1945,10 @@ index 63a3ee9..f9ee988 100644
           <argumentList>
              <argument>
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.cpp
-index 638a6cb..520145c 100644
+index 11e4e6a..87aabf3 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.cpp
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.cpp
-@@ -562,10 +562,10 @@ PLT_MediaController::SetNextAVTransportURI(PLT_DeviceDataReference& device,
- {
-     PLT_ActionReference action;
-     NPT_CHECK_SEVERE(m_CtrlPoint->CreateAction(
--                                               device, 
--                                               "urn:schemas-upnp-org:service:AVTransport:1", 
--                                               "SetNextAVTransportURI", 
--                                               action));
-+        device,
-+        "urn:schemas-upnp-org:service:AVTransport:1",
-+        "SetNextAVTransportURI",
-+        action));
-     
-     // set the uri
-     if (NPT_FAILED(action->SetArgumentValue("NextURI", next_uri))) {
-@@ -867,6 +867,10 @@ PLT_MediaController::OnActionResponse(NPT_Result           res,
+@@ -882,6 +882,10 @@ PLT_MediaController::OnActionResponse(NPT_Result           res,
          if (NPT_FAILED(FindRenderer(uuid, device))) res = NPT_FAILURE;
          m_Delegate->OnSetAVTransportURIResult(res, device, userdata);
      }
@@ -1975,7 +1960,7 @@ index 638a6cb..520145c 100644
          if (NPT_FAILED(FindRenderer(uuid, device))) res = NPT_FAILURE;
          m_Delegate->OnSetPlayModeResult(res, device, userdata);
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.h b/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.h
-index f5f0615..c91ce64 100644
+index 672c12a..bfd909c 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.h
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaController.h
 @@ -176,6 +176,11 @@ public:
@@ -1991,10 +1976,10 @@ index f5f0615..c91ce64 100644
          NPT_Result               /* res */,
          PLT_DeviceDataReference& /* device */,
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.cpp
-index 6c9653d..80e04f5 100644
+index 2a6986b..88144f7 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.cpp
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaRenderer/PltMediaRenderer.cpp
-@@ -249,6 +249,9 @@ PLT_MediaRenderer::OnAction(PLT_ActionReference&          action,
+@@ -258,6 +258,9 @@ PLT_MediaRenderer::OnAction(PLT_ActionReference&          action,
      if (name.Compare("SetAVTransportURI", true) == 0) {
          return OnSetAVTransportURI(action);
      }
@@ -2004,7 +1989,7 @@ index 6c9653d..80e04f5 100644
      if (name.Compare("SetPlayMode", true) == 0) {
          return OnSetPlayMode(action);
      }
-@@ -417,6 +420,33 @@ PLT_MediaRenderer::OnSetAVTransportURI(PLT_ActionReference& action)
+@@ -426,6 +429,33 @@ PLT_MediaRenderer::OnSetAVTransportURI(PLT_ActionReference& action)
  }
  
  /*----------------------------------------------------------------------
diff --git a/lib/libUPnP/patches/0019-upnp-add-support-for-UpdateObject-action-to-Platinum.patch b/lib/libUPnP/patches/0019-platinum-add-support-for-UpdateObject-action.patch
index 6e2681b738..7a857406b4 100644
--- a/lib/libUPnP/patches/0019-upnp-add-support-for-UpdateObject-action-to-Platinum.patch
+++ b/lib/libUPnP/patches/0019-platinum-add-support-for-UpdateObject-action.patch
@@ -1,7 +1,7 @@
-From 515003179e48e958d0bf7ce6d5045ff1c7d09ab4 Mon Sep 17 00:00:00 2001
+From abab9608a647177ff2a81d5827a6a0d11358b304 Mon Sep 17 00:00:00 2001
 From: Alasdair Campbell <alcoheca@gmail.com>
 Date: Wed, 3 Apr 2013 13:07:13 +0100
-Subject: [PATCH 19/21] upnp: add support for UpdateObject action to Platinum
+Subject: [PATCH 19/24] platinum: add support for UpdateObject action
 
 ---
  .../MediaServer/ContentDirectorywSearchSCPD.cpp    | 760 +++++++++++----------
@@ -826,10 +826,10 @@ index 056a641..cba42e5 100644
 \ No newline at end of file
 +</scpd>
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.cpp
-index 5b01b54..6b484f6 100644
+index e275069..6ecec0f 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.cpp
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaServer.cpp
-@@ -163,6 +163,9 @@ PLT_MediaServer::OnAction(PLT_ActionReference&          action,
+@@ -169,6 +169,9 @@ PLT_MediaServer::OnAction(PLT_ActionReference&          action,
      if (name.Compare("Search", true) == 0) {
          return OnSearch(action, context);
      }
@@ -839,7 +839,7 @@ index 5b01b54..6b484f6 100644
      if (name.Compare("GetSystemUpdateID", true) == 0) {
          return OnGetSystemUpdateID(action, context);
      }
-@@ -350,6 +353,59 @@ PLT_MediaServer::ParseSort(const NPT_String& sort, NPT_List<NPT_String>& list)
+@@ -356,6 +359,59 @@ PLT_MediaServer::ParseSort(const NPT_String& sort, NPT_List<NPT_String>& list)
  }
  
  /*----------------------------------------------------------------------
@@ -899,7 +899,7 @@ index 5b01b54..6b484f6 100644
  |   PLT_MediaServer::OnBrowse
  +---------------------------------------------------------------------*/
  NPT_Result
-@@ -523,6 +579,57 @@ PLT_MediaServer::OnSearch(PLT_ActionReference&          action,
+@@ -529,6 +585,57 @@ PLT_MediaServer::OnSearch(PLT_ActionReference&          action,
  }
  
  /*----------------------------------------------------------------------
diff --git a/lib/libUPnP/patches/0020-fixed-compiler-warning-about-unused-var.patch b/lib/libUPnP/patches/0020-platinum-fixed-compiler-warning-about-unused-var.patch
index 696836fc1a..5b74d6fd17 100644
--- a/lib/libUPnP/patches/0020-fixed-compiler-warning-about-unused-var.patch
+++ b/lib/libUPnP/patches/0020-platinum-fixed-compiler-warning-about-unused-var.patch
@@ -1,17 +1,17 @@
-From a6e9c50f338587e9c38790896fcf38350f1d2eb6 Mon Sep 17 00:00:00 2001
+From a6f7512f1d377a65fc5bf1976431454780d53d73 Mon Sep 17 00:00:00 2001
 From: davilla <davilla@4pi.com>
 Date: Thu, 11 Apr 2013 13:22:36 -0400
-Subject: [PATCH 05/21] fixed compiler warning about unused var
+Subject: [PATCH 20/24] platinum: fixed compiler warning about unused var
 
 ---
  lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp | 2 ++
  1 file changed, 2 insertions(+)
 
 diff --git a/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp b/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
-index 47aeb5a..7b46539 100644
+index d38392e..e303cc6 100644
 --- a/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
 +++ b/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
-@@ -210,6 +210,7 @@ PLT_StateVariable::ValidateValue(const char* value)
+@@ -211,6 +211,7 @@ PLT_StateVariable::ValidateValue(const char* value)
              while (val) {
                  val->Trim(" ");
                  if (!m_AllowedValues.Find(NPT_StringFinder(*val))) {
@@ -19,7 +19,7 @@ index 47aeb5a..7b46539 100644
                      NPT_LOG_WARNING_2("Invalid value of %s for state variable %s",
                          (const char*)*val,
                          (const char*)m_Name);
-@@ -217,6 +218,7 @@ PLT_StateVariable::ValidateValue(const char* value)
+@@ -218,6 +219,7 @@ PLT_StateVariable::ValidateValue(const char* value)
                          NPT_String *val = *m_AllowedValues.GetItem(i);
                          NPT_LOG_WARNING_1("Allowed: %s", (const char*)*val);
                      }
diff --git a/lib/libUPnP/patches/0021-platinum-fix-shadowed-local-var.patch b/lib/libUPnP/patches/0021-platinum-fix-shadowed-local-var.patch
index 201377eb56..f81b60902d 100644
--- a/lib/libUPnP/patches/0021-platinum-fix-shadowed-local-var.patch
+++ b/lib/libUPnP/patches/0021-platinum-fix-shadowed-local-var.patch
@@ -1,17 +1,17 @@
-From dc013f1ce379537617080a93ccb155ab1dc2f24a Mon Sep 17 00:00:00 2001
+From f9eff4bb16d36222c265681576707407627cf161 Mon Sep 17 00:00:00 2001
 From: Memphiz <memphis@machzwo.de>
 Date: Sat, 25 May 2013 23:06:14 +0200
-Subject: [PATCH 06/21] [platinum] - fix shadowed local var
+Subject: [PATCH 21/24] platinum: fix shadowed local var
 
 ---
  lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp b/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
-index 7b46539..a8eb4e2 100644
+index e303cc6..f733d5c 100644
 --- a/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
 +++ b/lib/libUPnP/Platinum/Source/Core/PltStateVariable.cpp
-@@ -215,8 +215,8 @@ PLT_StateVariable::ValidateValue(const char* value)
+@@ -216,8 +216,8 @@ PLT_StateVariable::ValidateValue(const char* value)
                          (const char*)*val,
                          (const char*)m_Name);
                      for (unsigned long i=0; i < m_AllowedValues.GetItemCount(); i++) {
diff --git a/lib/libUPnP/patches/0022-fixed-compiler-warning.-album_art-is-never-used.patch b/lib/libUPnP/patches/0022-fixed-compiler-warning.-album_art-is-never-used.patch
deleted file mode 100644
index af7dd0dfb3..0000000000
--- a/lib/libUPnP/patches/0022-fixed-compiler-warning.-album_art-is-never-used.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 98087a7b2cb969961a96ecfc4169164079a19602 Mon Sep 17 00:00:00 2001
-From: "S. Davilla" <davilla@4pi.com>
-Date: Thu, 31 Oct 2013 20:35:00 -0400
-Subject: [PATCH 20/21] fixed, compiler warning. album_art is never used
-
----
- lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-index f4d793d..d6986be 100644
---- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-+++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-@@ -282,7 +282,6 @@ PLT_MediaObject::ToDidl(NPT_UInt64 mask, NPT_String& didl)
- 
-     // album art URI
-     if ((mask & PLT_FILTER_MASK_ALBUMARTURI) && m_ExtraInfo.album_arts.GetItemCount()) {
--        NPT_List<PLT_AlbumArtInfo>::Iterator album_art = m_ExtraInfo.album_arts.GetFirstItem();
-         for (NPT_List<PLT_AlbumArtInfo>::Iterator iter = m_ExtraInfo.album_arts.GetFirstItem();
-              iter;
-              iter++) {
--- 
-1.7.11.msysgit.0
-
diff --git a/lib/libUPnP/patches/0024-Neptune-Add-audio-x-flac-MIME-type.patch b/lib/libUPnP/patches/0022-platinum-Add-audio-x-flac-MIME-type-to-Neptune.patch
index 67a876f430..dfcb0e0ae8 100644
--- a/lib/libUPnP/patches/0024-Neptune-Add-audio-x-flac-MIME-type.patch
+++ b/lib/libUPnP/patches/0022-platinum-Add-audio-x-flac-MIME-type-to-Neptune.patch
@@ -1,7 +1,7 @@
-From 0308017deff74d962190b9621d4dfeaa1df20ef8 Mon Sep 17 00:00:00 2001
+From c7dc8e23d0646200424179c16ccac2961df8da86 Mon Sep 17 00:00:00 2001
 From: mossywell <mark@mossywell.com>
 Date: Fri, 28 Mar 2014 07:26:49 +0000
-Subject: [PATCH 24/24] Neptune Add audio/x-flac MIME type
+Subject: [PATCH 22/24] platinum: Add audio/x-flac MIME type to Neptune
 
 Change streaming FLAC MIME type from application/octet to audio/x-flac to
 support Frontier Silicon systems (such as the Axis X3) that require
@@ -16,10 +16,10 @@ FLAC not added to DefaultDlnaMap as * suffices.
  1 file changed, 1 insertion(+)
 
 diff --git a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
-index 07586f9..d2e36b1 100644
+index 1700afc..8c5d587 100644
 --- a/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
 +++ b/lib/libUPnP/Neptune/Source/Core/NptHttp.cpp
-@@ -2880,6 +2880,7 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = {
+@@ -2779,6 +2779,7 @@ NPT_HttpFileRequestHandler_DefaultFileTypeMap[] = {
      {"aif",  "audio/x-aiff"},
      {"aifc", "audio/x-aiff"},
      {"aiff", "audio/x-aiff"},
@@ -28,5 +28,5 @@ index 07586f9..d2e36b1 100644
      {"mpa",  "audio/mpeg"},
      {"mp2",  "audio/mpeg"},
 -- 
-1.8.4.msysgit.0
+1.7.11.msysgit.0
 
diff --git a/lib/libUPnP/patches/0023-platinum-fix-parsing-of-upnp-actor-in-PltMediaItem.patch b/lib/libUPnP/patches/0023-platinum-fix-parsing-of-upnp-actor-in-PltMediaItem.patch
deleted file mode 100644
index 94a93fe042..0000000000
--- a/lib/libUPnP/patches/0023-platinum-fix-parsing-of-upnp-actor-in-PltMediaItem.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fda8d4192ae53f3f2ac10ba6dd9fa0ae5ebbb083 Mon Sep 17 00:00:00 2001
-From: montellese <montellese@xbmc.org>
-Date: Fri, 27 Dec 2013 13:02:01 +0100
-Subject: [PATCH 21/21] platinum: fix parsing of upnp:actor in PltMediaItem
-
----
- lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-index d6986be..a6566eb 100644
---- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-+++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-@@ -510,7 +510,7 @@ PLT_MediaObject::FromDidl(NPT_XmlElementNode* entry)
-     m_People.authors.FromDidl(children);
-     
-     children.Clear();
--    PLT_XmlHelper::GetChildren(entry, children, "actors", didl_namespace_upnp);
-+    PLT_XmlHelper::GetChildren(entry, children, "actor", didl_namespace_upnp);
-     m_People.actors.FromDidl(children);
- 
-     children.Clear();
--- 
-1.7.11.msysgit.0
-
diff --git a/lib/libUPnP/patches/0025-platinum-lastPlaybackTime-is-in-the-upnp-and-not-in-the-dc-namespace.patch b/lib/libUPnP/patches/0023-platinum-lastPlaybackTime-is-in-the-upnp-and-not-in-.patch
index 057668fb11..22622c37e3 100644
--- a/lib/libUPnP/patches/0025-platinum-lastPlaybackTime-is-in-the-upnp-and-not-in-the-dc-namespace.patch
+++ b/lib/libUPnP/patches/0023-platinum-lastPlaybackTime-is-in-the-upnp-and-not-in-.patch
@@ -1,18 +1,18 @@
-From 80dfacb5ec2ff32cdd07d9d897cf2ac5048d0719 Mon Sep 17 00:00:00 2001
+From 19863401ba591822bc1df58c8d804530e0bafc16 Mon Sep 17 00:00:00 2001
 From: montellese <montellese@xbmc.org>
 Date: Thu, 23 Jan 2014 19:36:06 +0100
-Subject: [PATCH] platinum: lastPlaybackTime is in the "upnp" and not in the
- "dc" namespace
+Subject: [PATCH 23/24] platinum: lastPlaybackTime is in the "upnp" and not in
+ the "dc" namespace
 
 ---
  lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-index a6566eb..85b5856 100644
+index 514a1ab..1728eff 100644
 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
 +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltMediaItem.cpp
-@@ -559,7 +559,7 @@
+@@ -559,7 +559,7 @@ PLT_MediaObject::FromDidl(NPT_XmlElementNode* entry)
      if (NPT_FAILED(str.ToInteger(value))) value = 0;
      m_MiscInfo.last_position = value;
  
@@ -22,5 +22,5 @@ index a6566eb..85b5856 100644
      for (int format=0; format<=NPT_DateTime::FORMAT_RFC_1036; format++) {
          NPT_DateTime date;
 -- 
-1.9.1
+1.7.11.msysgit.0
 
diff --git a/lib/libUPnP/patches/0024-platinum-enable-logging.patch b/lib/libUPnP/patches/0024-platinum-enable-logging.patch
new file mode 100644
index 0000000000..39a8110a86
--- /dev/null
+++ b/lib/libUPnP/patches/0024-platinum-enable-logging.patch
@@ -0,0 +1,25 @@
+From 290644f4063539698fc27e0e8ba9b9c8a9f9f0b4 Mon Sep 17 00:00:00 2001
+From: montellese <montellese@xbmc.org>
+Date: Tue, 13 May 2014 21:31:41 +0200
+Subject: [PATCH 24/24] platinum: enable logging
+
+---
+ lib/libUPnP/Makefile.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/lib/libUPnP/Makefile.in b/lib/libUPnP/Makefile.in
+index 03dfdd8..75cc448 100644
+--- a/lib/libUPnP/Makefile.in
++++ b/lib/libUPnP/Makefile.in
+@@ -99,6 +99,8 @@ endif
+ 
+ INCLUDES=-I./Neptune/Source/Core -I./Platinum/Source/Core -I./Platinum/Source/Platinum -I./Platinum/Source/Devices/MediaConnect -I./Platinum/Source/Devices/MediaRenderer -I./Platinum/Source/Devices/MediaServer -I./Neptune/Source/System/Posix -I./Platinum/Source/Extras
+ 
++CXXFLAGS+=-DNPT_CONFIG_ENABLE_LOGGING
++
+ LIB=libupnp.a
+ 
+ include ../../Makefile.include
+-- 
+1.7.11.msysgit.0
+
diff --git a/lib/libUPnP/patches/0026-platinum-enable-logging.patch b/lib/libUPnP/patches/0026-platinum-enable-logging.patch
deleted file mode 100644
index cf9aa97ae1..0000000000
--- a/lib/libUPnP/patches/0026-platinum-enable-logging.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1dbb70de6caf307d87aa61e21fe324bbb1709a39 Mon Sep 17 00:00:00 2001
-From: montellese <montellese@xbmc.org>
-Date: Tue, 13 May 2014 21:31:41 +0200
-Subject: [PATCH] platinum: enable logging
-
----
- lib/libUPnP/Makefile.in | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/lib/libUPnP/Makefile.in b/lib/libUPnP/Makefile.in
-index e1f9462..e194a58 100644
---- a/lib/libUPnP/Makefile.in
-+++ b/lib/libUPnP/Makefile.in
-@@ -43,9 +43,11 @@ SRCS= Platinum/Source/Core/PltAction.cpp \
-       Neptune/Source/Core/NptHash.cpp \
-       Neptune/Source/Core/NptHttp.cpp \
-       Neptune/Source/Core/NptList.cpp \
-+      Neptune/Source/Core/NptLogging.cpp \
-       Neptune/Source/Core/NptMessaging.cpp \
-       Neptune/Source/Core/NptNetwork.cpp \
-       Neptune/Source/Core/NptQueue.cpp \
-+      Neptune/Source/Core/NptResults.cpp \
-       Neptune/Source/Core/NptRingBuffer.cpp \
-       Neptune/Source/Core/NptSimpleMessageQueue.cpp \
-       Neptune/Source/Core/NptSockets.cpp \
-@@ -89,6 +91,8 @@ endif
- 
- INCLUDES=-I./Neptune/Source/Core -I./Platinum/Source/Core -I./Platinum/Source/Platinum -I./Platinum/Source/Devices/MediaConnect -I./Platinum/Source/Devices/MediaRenderer -I./Platinum/Source/Devices/MediaServer -I./Neptune/Source/System/Posix -I./Platinum/Source/Extras
- 
-+CXXFLAGS+=-DNPT_CONFIG_ENABLE_LOGGING
-+
- LIB=libupnp.a
- 
- include ../../Makefile.include
--- 
-1.7.11.msysgit.0
-