Changeset be8dfea8d22bb8bd66ef31dcf0aa845fd095e4f0

Timestamp:

15/10/07 00:52:53 (1 year ago)

Author:

Rafaël Carré <funman@videolan.org>

git-committer:

Rafaël Carré <funman@videolan.org> 1192402373 +0000

git-parent:

[8cce17627c00e62af3f38d7e45258b30ab7a53bc]

git-author:

Rafaël Carré <funman@videolan.org> 1192402373 +0000

Message:

upnp intel: reverts [22521] to make it compile. The module should be rewritten to not use any playlist code

Files:

• modules/services_discovery/upnp_intel.cpp (modified) (4 diffs)

modules/services_discovery/upnp_intel.cpp

@@ -43 +43 @@
-
-
+// VLC handle
+
+struct services_discovery_sys_t
+{
+    playlist_item_t *p_node_cat;
+    playlist_item_t *p_node_one;
+};
+
+
-// Constants
-
@@ -269 +278 @@
-{
-    services_discovery_t *p_sd = ( services_discovery_t* )p_this;
+    services_discovery_sys_t *p_sys  = ( services_discovery_sys_t * )
+    malloc( sizeof( services_discovery_sys_t ) );
+
-    p_sd->pf_run = Run;
+    p_sd->p_sys = p_sys;
-
-    /* Create our playlist node */
-
+
+
+
-
-    return VLC_SUCCESS;
@@ -279 +294 @@
-static void Close( vlc_object_t *p_this )
-{
+    services_discovery_t *p_sd = ( services_discovery_t* )p_this;
+    services_discovery_sys_t *p_sys = p_sd->p_sys;
+
+    playlist_NodeDelete( pl_Get( p_sd ), p_sys->p_node_one, VLC_TRUE,
+                         VLC_TRUE );
+    playlist_NodeDelete( pl_Get( p_sd ), p_sys->p_node_cat, VLC_TRUE,
+                         VLC_TRUE );
+
+    free( p_sys );
-}
-
@@ -893 +917 @@
-    playlist_item_t* node = playlist_NodeCreate( pl_Get( _cookie->serviceDiscovery ),
-                                                 name,
-
+sys->p_node_
-    free( name );
-    s->setPlaylistNode( node );