[vlc-commits] upnp: Always specify ContainerID instead of ObjectID

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Wed May 25 18:58:39 2016 +0200| [741b9ebf5449fc11a6318ef78c16dadf4808640d] | committer: Hugo Beauzée-Luyssen

upnp: Always specify ContainerID instead of ObjectID

Additionnaly, ensure we pass "0" instead of an empty string for the root
object

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=741b9ebf5449fc11a6318ef78c16dadf4808640d
---

 modules/services_discovery/upnp.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index 6429907..570e6c1 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -936,11 +936,11 @@ IXML_Document* MediaServer::_browseAction( const char* psz_object_id_,
         return NULL;
 
     i_res = UpnpAddToAction( &p_action, "Browse",
-            CONTENT_DIRECTORY_SERVICE_TYPE, "ObjectID", psz_object_id_ );
+            CONTENT_DIRECTORY_SERVICE_TYPE, "ContainerID", psz_object_id_ ? psz_object_id_ : "0" );
 
     if ( i_res != UPNP_E_SUCCESS )
     {
-        msg_Dbg( access_, "AddToAction 'ObjectID' failed: %s",
+        msg_Dbg( access_, "AddToAction 'ContainerID' failed: %s",
                 UpnpGetErrorMessage( i_res ) );
         goto browseActionCleanup;
     }