Changeset 1153717cbfca7f913577a1dfb6226991190e1257

Timestamp:

18/08/07 05:44:13 (1 year ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

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

git-parent:

[716d5bf2f23ca759a3558558cb900e7039ba5e5c]

git-author:

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

Message:

playlist/services_discovery.c: Use a stop method to end the service.

Files:

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

include/vlc_playlist.h

@@ -429 +429 @@
-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 */

src/playlist/services_discovery.c

@@ -73 +73 @@
-void services_discovery_Destroy ( services_discovery_t * p_sd )
-{
-
-
+
-
-    free( p_sd->psz_module );
-    module_Unneed( p_sd, p_sd->p_module );
-
-    vlc_event_manager_fini( &p_sd->event_manager );
-    free( p_sd->psz_localized_name );
-
@@ -99 +95 @@
-    }
-    return VLC_SUCCESS;
+}
+
+/***********************************************************************
+ * Stop
+ ***********************************************************************/
+void services_discovery_Stop ( services_discovery_t * p_sd )
+{
+    vlc_object_kill( p_sd );
+    if( p_sd->pf_run ) vlc_thread_join( p_sd );
+
+    module_Unneed( p_sd, p_sd->p_module );
-}
-
@@ -317 +324 @@
-    if( p_asd && p_asd->p_sd )
-    {
-Destroy
+Stop
-
-        vlc_event_detach( services_discovery_EventManager( p_asd->p_sd ),
@@ -349 +356 @@
-        PL_UNLOCK;
-
+        services_discovery_Destroy( p_asd->p_sd );
+
-        free( p_asd );
-    }