]> git.sesse.net Git - vlc/commitdiff
atmo: compile fix
authorRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 3 Aug 2008 16:10:12 +0000 (19:10 +0300)
committerRémi Denis-Courmont <rdenis@simphalempin.com>
Sun, 3 Aug 2008 16:10:29 +0000 (19:10 +0300)
modules/video_filter/atmo/AtmoThread.cpp
modules/video_filter/atmo/AtmoThread.h
modules/video_filter/atmo/atmo.cpp

index 18abfc254727812be2b217cb4aa4176a0fd88dd7..cdf22a5dd512620b0dd683cbca1846b1c8a70f55 100644 (file)
@@ -67,8 +67,9 @@ CThread::~CThread(void)
 
 #if defined(_ATMO_VLC_PLUGIN_)
 
-void CThread::ThreadProc(atmo_thread_t *pAtmoThread)
+void *CThread::ThreadProc(vlc_object_t *obj)
 {
+      atmo_thread_t *pAtmoThread = (atmo_thread_t *)obj;
       CThread *pThread = (CThread *)pAtmoThread->p_thread;
       if(pThread) {
          // give feedback I'am running?
@@ -77,6 +78,7 @@ void CThread::ThreadProc(atmo_thread_t *pAtmoThread)
             pThread->Execute();
 
       }
+      return NULL;
 }
 
 #else
index a129e9f1c3799ed27bd783f3eb89503039bb7d54..fb279ee46ed27cdf4f459141ff5d61950ed178e1 100644 (file)
@@ -50,7 +50,7 @@ protected:
 private:
 
 #if defined(_ATMO_VLC_PLUGIN_)
-    static void ThreadProc(atmo_thread_t *pAtmoThread);
+    static void *ThreadProc(vlc_object_t *);
 #else
        static DWORD WINAPI ThreadProc(LPVOID lpParameter);
 #endif
index 79b4ddb486465ee7993e6899b10f868d2aa46d7e..442d34ba4122faeff6a92f6ee8973a86b27e4286 100644 (file)
@@ -555,7 +555,7 @@ typedef struct
 
 } fadethread_t;
 
-static void FadeToColorThread(fadethread_t *p_fadethread);
+static void *FadeToColorThread(vlc_object_t *);
 
 
 /*****************************************************************************
@@ -1723,8 +1723,9 @@ static picture_t * Filter( filter_t *p_filter, picture_t *p_pic )
 * to a target color defined in p_fadethread struct
 * use for: Fade to Pause Color,  and Fade to End Color
 *****************************************************************************/
-static void FadeToColorThread(fadethread_t *p_fadethread)
+static void *FadeToColorThread(vlc_object_t *obj)
 {
+    fadethread_t *p_fadethread = (fadethread_t *)obj;
     filter_sys_t *p_sys = (filter_sys_t *)p_fadethread->p_filter->p_sys;
     int i_steps_done = 0;
     int i_index;