Changeset 222960cff9c3968b0c6b8c073bfa08182e3cc78a

Timestamp:

11/10/07 03:02:50 (1 year ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1192064570 +0000

git-parent:

[393b8a063539c0230473e517e6ffe37fc290b810]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1192064570 +0000

Message:

playlist/services_discovery.c: Isolate more the services_discovery code from the playlist code by having two separate header. Partly revert [22536].

Files:

• include/vlc_playlist.h (modified) (4 diffs)
• include/vlc_services_discovery.h (added)
• src/playlist/engine.c (modified) (2 diffs)
• src/playlist/services_discovery.c (modified) (7 diffs)

include/vlc_playlist.h

@@ -36 +36 @@
-#include <vlc_input.h>
-#include <vlc_events.h>
+#include <vlc_services_discovery.h>
-#include <stdio.h>
-#include <stdlib.h>
@@ -159 +160 @@
-{ PLAYLIST_STOPPED,PLAYLIST_RUNNING,PLAYLIST_PAUSED } playlist_status_t;
-
-
-struct services_discovery_t
-{
-    VLC_COMMON_MEMBERS
-    char *              psz_module;
-    module_t *          p_module;
-
-    char *              psz_localized_name; /* Accessed through Setters for non class function */
-    vlc_event_manager_t event_manager;      /* Accessed through Setters for non class function */
-
-    /* the playlist items for category and onelevel */
-    playlist_item_t*    p_cat;
-    playlist_item_t*    p_one;
-
-    services_discovery_sys_t *p_sys;
-    void (*pf_run) ( services_discovery_t *);
-};
-
-/** Structure containing information about the playlist */
-struct playlist_t
@@ -182 +165 @@
-    VLC_COMMON_MEMBERS
-
-
-
-
+
+
+
+
+
+
+
-
-    int                   i_enabled; /**< How many items are enabled ? */
@@ -417 +404 @@
-VLC_EXPORT( playlist_item_t *, playlist_GetPrevLeaf, ( playlist_t *p_playlist, playlist_item_t *p_root, playlist_item_t *p_item, vlc_bool_t b_ena, vlc_bool_t b_unplayed ) );
-VLC_EXPORT( playlist_item_t *, playlist_GetLastLeaf, ( playlist_t *p_playlist, playlist_item_t *p_root ) );
-
-/***********************************************************************
- * Service Discovery
- ***********************************************************************/
-
-/* Get the services discovery modules names to use in Create(), in a null
- * terminated string array. Array and string must be freed after use. */
-VLC_EXPORT( char **, services_discovery_GetServicesNames, ( vlc_object_t * p_super ) );
-
-/* Creation of a service_discovery object */
-VLC_EXPORT( services_discovery_t *, services_discovery_Create, ( vlc_object_t * p_super, const char * psz_service_name ) );
-VLC_EXPORT( void,                   services_discovery_Destroy, ( services_discovery_t * p_this ) );
-VLC_EXPORT( int,                    services_discovery_Start, ( services_discovery_t * p_this ) );
-VLC_EXPORT( void,                   services_discovery_Stop, ( services_discovery_t * p_this ) );
-
-/* Read info from discovery object */
-VLC_EXPORT( char *,                 services_discovery_GetLocalizedName, ( services_discovery_t * p_this ) );
-
-/* Receive event notification (prefered way to get new items) */
-VLC_EXPORT( vlc_event_manager_t *,  services_discovery_EventManager, ( services_discovery_t * p_this ) );
-
-/* Used by services_discovery to post update about their items */
-VLC_EXPORT( void,                   services_discovery_SetLocalizedName, ( services_discovery_t * p_this, const char * ) );
-    /* About the psz_category, it is a legacy way to add info to the item,
-     * for more options, directly set the (meta) data on the input item */
-VLC_EXPORT( void,                   services_discovery_AddItem, ( services_discovery_t * p_this, input_item_t * p_item, const char * psz_category ) );
-VLC_EXPORT( void,                   services_discovery_RemoveItem, ( services_discovery_t * p_this, input_item_t * p_item ) );
-
-/***********************************************************************

src/playlist/engine.c

@@ -67 +67 @@
-    }
-
-, p_playlist->pp_sd
+s, p_playlist->pp_sds
-
-    p_parent->p_libvlc->p_playlist = p_playlist;
@@ -438 +438 @@
-    }
-
-
+s
-    {
-        playlist_ServicesDiscoveryRemove( p_playlist,
-[0]
+s[0]->p_sd
-    }
-

src/playlist/services_discovery.c

@@ -253 +253 @@
-    for (;;)
-    {
+        struct playlist_services_discovery_support_t * p_sds;
-        playlist_item_t * p_cat;
-        playlist_item_t * p_one;
@@ -294 +295 @@
-            PL_UNLOCK;
-        }
-        p_sd->p_cat = p_cat;
-        p_sd->p_one = p_one;
-
-        vlc_event_attach( services_discovery_EventManager( p_sd ),
@@ -319 +318 @@
-        services_discovery_Start( p_sd );
-
+        /* Free in playlist_ServicesDiscoveryRemove */ 
+        p_sds = malloc( sizeof(struct playlist_services_discovery_support_t) );
+        if( !p_sds )
+        {
+            msg_Err( p_playlist, "No more memory" );
+            return VLC_ENOMEM;
+        }
+        p_sds->p_sd = p_sd; 
+        p_sds->p_one = p_one; 
+        p_sds->p_cat = p_cat; 
+
-        PL_LOCK;
-, p_playlist->pp_sd, p_sd
+s, p_playlist->pp_sds, p_sds
-        PL_UNLOCK;
-    }
@@ -330 +340 @@
-                                       const char *psz_module )
-{
+    struct playlist_services_discovery_support_t * p_sds = NULL;
-    int i;
-    struct services_discovery_t *p_sd = NULL;
-
-    PL_LOCK;
-
-
-[i]
-
- = p_playlist->pp_sd
-, p_playlist->i_sd
+s
+
+s[i]->p_sd
+
+s = p_playlist->pp_sds
+s, p_playlist->i_sds
-            break;
-        }
@@ -345 +355 @@
-    PL_UNLOCK;
-
-p_sd == NULL
+!p_sds || !p_sds->p_sd
-    {
-        msg_Warn( p_playlist, "module %s is not loaded", psz_module );
@@ -351 +361 @@
-    }
-
-
-
-
+s->p_sd
+
+s->p_sd
-                        vlc_ServicesDiscoveryItemAdded,
-                        playlist_sd_item_added,
-
-
-
+s
+
+s->p_sd
-                        vlc_ServicesDiscoveryItemAdded,
-                        playlist_sd_item_added,
-
-
-
+s
+
+s->p_sd
-                        vlc_ServicesDiscoveryItemRemoved,
-                        playlist_sd_item_removed,
-
-
-
+s
+
+s->p_sd
-                        vlc_ServicesDiscoveryItemRemoved,
-                        playlist_sd_item_removed,
-
+s
-
-    /* Remove the sd playlist node if it exists */
-    PL_LOCK;
-
-
-
-
-
+s
+s
+
+s
+s
-    }
-    PL_UNLOCK;
-
-
+s->p_sd
-
-    return VLC_SUCCESS;
@@ -394 +404 @@
-    PL_LOCK;
-
-
-
-[i]
+s
+
+s[i]->p_sd
-        {
-            PL_UNLOCK;