[vlc-devel] commit: atmo: compile fix ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Sun Aug  3 19:10:12 2008 +0300| [c5fb066da9978b27bbfe0bdfb3cac51b26b49b89] | committer: Rémi Denis-Courmont 

atmo: compile fix

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

 modules/video_filter/atmo/AtmoThread.cpp |    4 +++-
 modules/video_filter/atmo/AtmoThread.h   |    2 +-
 modules/video_filter/atmo/atmo.cpp       |    5 +++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/modules/video_filter/atmo/AtmoThread.cpp b/modules/video_filter/atmo/AtmoThread.cpp
index 18abfc2..cdf22a5 100644
--- a/modules/video_filter/atmo/AtmoThread.cpp
+++ b/modules/video_filter/atmo/AtmoThread.cpp
@@ -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
diff --git a/modules/video_filter/atmo/AtmoThread.h b/modules/video_filter/atmo/AtmoThread.h
index a129e9f..fb279ee 100644
--- a/modules/video_filter/atmo/AtmoThread.h
+++ b/modules/video_filter/atmo/AtmoThread.h
@@ -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
diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp
index 79b4ddb..442d34b 100644
--- a/modules/video_filter/atmo/atmo.cpp
+++ b/modules/video_filter/atmo/atmo.cpp
@@ -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;