[vlc-devel] commit: Fix threaded function type. ( Rémi Duraffort )

git version control git at videolan.org
Thu Aug 7 20:51:20 CEST 2008


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Thu Aug  7 20:32:39 2008 +0200| [dd15d24b4732527314ce46203890f35d43fd969a] | committer: Rémi Duraffort 

Fix threaded function type.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dd15d24b4732527314ce46203890f35d43fd969a
---

 src/playlist/thread.c |   22 ++++++++++++++--------
 1 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/playlist/thread.c b/src/playlist/thread.c
index 33f2861..4143494 100644
--- a/src/playlist/thread.c
+++ b/src/playlist/thread.c
@@ -35,11 +35,11 @@
 /*****************************************************************************
  * Local prototypes
  *****************************************************************************/
-static void RunControlThread ( playlist_t * );
-static void RunPreparse( playlist_preparse_t * );
-static void RunFetcher( playlist_fetcher_t * );
-static void PreparseDestructor( vlc_object_t * );
-static void FetcherDestructor( vlc_object_t * );
+static void* RunControlThread   ( vlc_object_t * );
+static void* RunPreparse        ( vlc_object_t * );
+static void* RunFetcher         ( vlc_object_t * );
+static void PreparseDestructor  ( vlc_object_t * );
+static void FetcherDestructor   ( vlc_object_t * );
 
 /*****************************************************************************
  * Main functions for the global thread
@@ -132,8 +132,9 @@ void __playlist_ThreadCreate( vlc_object_t *p_parent )
 /**
  * Run the main control thread itself
  */
-static void RunControlThread ( playlist_t *p_playlist )
+static void* RunControlThread ( vlc_object_t *p_this )
 {
+    playlist_t *p_playlist = (playlist_t*)p_this;
     /* Tell above that we're ready */
     vlc_thread_ready( p_playlist );
 
@@ -164,23 +165,28 @@ static void RunControlThread ( playlist_t *p_playlist )
     vlc_object_unlock( p_playlist );
 
     playlist_LastLoop( p_playlist );
+    return NULL;
 }
 
 /*****************************************************************************
  * Preparse-specific functions
  *****************************************************************************/
-static void RunPreparse ( playlist_preparse_t *p_obj )
+static void* RunPreparse ( vlc_object_t *p_this )
 {
+    playlist_preparse_t *p_obj = (playlist_preparse_t*)p_this;
     /* Tell above that we're ready */
     vlc_thread_ready( p_obj );
     playlist_PreparseLoop( p_obj );
+    return NULL;
 }
 
-static void RunFetcher( playlist_fetcher_t *p_obj )
+static void* RunFetcher( vlc_object_t *p_this )
 {
+    playlist_fetcher_t *p_obj = (playlist_fetcher_t *)p_this;
     /* Tell above that we're ready */
     vlc_thread_ready( p_obj );
     playlist_FetcherLoop( p_obj );
+    return NULL;
 }
 
 static void PreparseDestructor( vlc_object_t * p_this )




More information about the vlc-devel mailing list