[vlc-commits] UPNP: Attempt to fix #4714. Not tested.

[Konstantin Pavlov]

vlc | branch: master | Konstantin Pavlov <thresh at videolan.org> | Tue Apr 26 14:18:51 2011 +0400| [cbfb5395328a568b1c263569a7f3c5f114753804] | committer: Konstantin Pavlov

UPNP: Attempt to fix #4714. Not tested.

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

 modules/services_discovery/upnp.cpp |   27 +++------------------------
 1 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp
index 3a992e5..afdc9c8 100644
--- a/modules/services_discovery/upnp.cpp
+++ b/modules/services_discovery/upnp.cpp
@@ -755,36 +755,15 @@ bool MediaServer::_fetchContents( Container* p_parent )
             if ( !objectID )
                 continue;
 
-            const char* childCountStr =
-                    ixmlElement_getAttribute( containerElement, "childCount" );
-
-            if ( !childCountStr )
-                continue;
-
-            int childCount = atoi( childCountStr );
             const char* title = xml_getChildElementValue( containerElement,
                                                           "dc:title" );
 
             if ( !title )
                 continue;
 
-            const char* resource = xml_getChildElementValue( containerElement,
-                                                             "res" );
-
-            if ( resource && childCount < 1 )
-            {
-                Item* item = new Item( p_parent, objectID, title, resource, -1 );
-                p_parent->addItem( item );
-            }
-
-            else
-            {
-                Container* container = new Container( p_parent, objectID, title );
-                p_parent->addContainer( container );
-
-                if ( childCount > 0 )
-                    _fetchContents( container );
-            }
+            Container* container = new Container( p_parent, objectID, title );
+            p_parent->addContainer( container );
+            _fetchContents( container );
         }
         ixmlNodeList_free( containerNodeList );
     }