Changeset bd054d30866ab0144e0b0582e249184a8ea6506f

Timestamp:

06/12/08 21:01:16 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213297276 +0300

git-parent:

[bff9720dbec39d193e25cea5defee42da464ca92]

git-author:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213297276 +0300

Message:

Remove services discovery tasks before the playlist

I assume nothing can ever try to add a new one once the interfaces have
been destroyed. If not there is a race condition.

Files:

• src/libvlc.c (modified) (1 diff)
• src/libvlc.h (modified) (1 diff)
• src/playlist/engine.c (modified) (1 diff)
• src/playlist/services_discovery.c (modified) (1 diff)

src/libvlc.c

@@ -950 +950 @@
-    }
-#endif
+
+    /* Remove all services discovery */
+    msg_Dbg( p_libvlc, "removing all services discovery tasks" );
+    playlist_ServicesDiscoveryKillAll( priv->p_playlist );
-
-    /* Free playlist */

src/libvlc.h

@@ -247 +247 @@
-    return (libvlc_priv_t *)(libvlc + 1);
-}
+
+void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist );
-
-#define libvlc_stats( o ) (libvlc_priv((VLC_OBJECT(o))->p_libvlc)->b_stats)

src/playlist/engine.c

@@ -420 +420 @@
-#endif
-
-
-
-
-
-
-
+
+
-    playlist_MLDump( p_playlist );
-

src/playlist/services_discovery.c

@@ -431 +431 @@
-}
-
+void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist )
+{
+    while( p_playlist->i_sds > 0 )
+        playlist_ServicesDiscoveryRemove( p_playlist,
+                                     p_playlist->pp_sds[0]->p_sd->psz_module );
+}
+