Changeset d3b42e438a49b7df4912c9f0db365b9355b93462

Timestamp:

11/10/07 01:04:09 (1 year ago)

Author:

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

git-committer:

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

git-parent:

[884e2a4e4ffac2249258648ce8e9270c4d42152e]

git-author:

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

Message:

services_discovery: storing the category & onelevel playlist items with the services_discovery_t is not needed anymore, simplify that.
put the services_discovery_t** in the public playlist_t to save one unchecked malloc() and the corresponding free()

Files:

• include/vlc_playlist.h (modified) (1 diff)
• src/playlist/engine.c (modified) (3 diffs)
• src/playlist/playlist_internal.h (modified) (1 diff)
• src/playlist/services_discovery.c (modified) (4 diffs)

include/vlc_playlist.h

@@ -181 +181 @@
-{
-    VLC_COMMON_MEMBERS
-
+
+
+
+
-
-    int                   i_enabled; /**< How many items are enabled ? */

src/playlist/engine.c

@@ -67 +67 @@
-    }
-
-
-
+
-
-    p_parent->p_libvlc->p_playlist = p_playlist;
@@ -179 +178 @@
-    vlc_mutex_destroy( &p_playlist->gc_lock );
-    vlc_object_detach( p_playlist );
-    free( p_playlist->p_internal );
-    vlc_object_destroy( p_playlist );
-}
@@ -440 +438 @@
-    }
-
-p_internal->i_asds
+i_sd
-    {
-        playlist_ServicesDiscoveryRemove( p_playlist,
-_internal->pp_asds[0]->p_sd
+p_sd[0]
-    }
-

src/playlist/playlist_internal.h

@@ -58 +58 @@
-    DECL_ARRAY(playlist_album_t) albums;
-};
-
-typedef struct playlist_archived_services_discovery_t {
-        services_discovery_t * p_sd; /* The service discovery module */
-        playlist_item_t      * p_cat;/* Corresponding item in the category view */
-        playlist_item_t      * p_one;/* Corresponding item in the one level view */
-} playlist_archived_services_discovery_t;
-
-struct playlist_internal_t {
-    struct playlist_archived_services_discovery_t
-                **pp_asds; /**< Loaded service discovery modules */
-    int         i_asds;    /**< Number of service discovery modules */
-};
-
-
-/*****************************************************************************

src/playlist/services_discovery.c

@@ -304 +304 @@
-        services_discovery_Start( p_sd );
-
-        /* Free in playlist_ServicesDiscoveryRemove */
-        p_asd = malloc( sizeof(struct playlist_archived_services_discovery_t) );
-        p_asd->p_sd = p_sd;
-        p_asd->p_one = p_one;
-        p_asd->p_cat = p_cat;
-
-        PL_LOCK;
-p_internal->i_asds, p_playlist->p_internal->pp_asds, p_a
+i_sd, p_playlist->pp_sd, p_
-        PL_UNLOCK;
-    }
@@ -322 +316 @@
-{
-    int i;
-playlist_archived_services_discovery_t *p_a
+services_discovery_t *p_
-
-    PL_LOCK;
-p_internal->i_asds
-
-_internal->pp_asds[i]->p_sd
-
-asd = p_playlist->p_internal->pp_asds
-_internal->pp_asds, p_playlist->p_internal->i_asds
+i_sd
+
+p_sd[i]
+
+sd = p_playlist->pp_sd
+p_sd, p_playlist->i_sd
-            break;
-        }
@@ -336 +330 @@
-    PL_UNLOCK;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    {
-        msg_Warn( p_playlist, "module %s is not loaded", psz_module );
-        return VLC_EGENERIC;
-    }
+
+    services_discovery_Stop( p_sd );
+
+    vlc_event_detach( services_discovery_EventManager( p_sd ),
+                        vlc_ServicesDiscoveryItemAdded,
+                        playlist_sd_item_added,
+                        p_sd->p_one );
+
+    vlc_event_detach( services_discovery_EventManager( p_sd ),
+                        vlc_ServicesDiscoveryItemAdded,
+                        playlist_sd_item_added,
+                        p_sd->p_cat );
+
+    vlc_event_detach( services_discovery_EventManager( p_sd ),
+                        vlc_ServicesDiscoveryItemRemoved,
+                        playlist_sd_item_removed,
+                        p_sd->p_one );
+
+    vlc_event_detach( services_discovery_EventManager( p_sd ),
+                        vlc_ServicesDiscoveryItemRemoved,
+                        playlist_sd_item_removed,
+                        p_sd->p_cat );
+
+    /* Remove the sd playlist node if it exists */
+    PL_LOCK;
+    if( p_sd->p_cat != p_playlist->p_root_category &&
+        p_sd->p_one != p_playlist->p_root_onelevel )
+    {
+        playlist_NodeDelete( p_playlist, p_sd->p_cat, VLC_TRUE, VLC_FALSE );
+        playlist_NodeDelete( p_playlist, p_sd->p_one, VLC_TRUE, VLC_FALSE );
+    }
+    PL_UNLOCK;
+
+    services_discovery_Destroy( p_sd );
+
-    return VLC_SUCCESS;
-}
@@ -388 +379 @@
-    PL_LOCK;
-
-p_internal->i_asds
-
-_internal->pp_asds[i]->p_sd
+i_sd
+
+p_sd[i]
-        {
-            PL_UNLOCK;