Commit c5fb066d authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

atmo: compile fix

parent b2e054c0
...@@ -67,8 +67,9 @@ CThread::~CThread(void) ...@@ -67,8 +67,9 @@ CThread::~CThread(void)
#if defined(_ATMO_VLC_PLUGIN_) #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; CThread *pThread = (CThread *)pAtmoThread->p_thread;
if(pThread) { if(pThread) {
// give feedback I'am running? // give feedback I'am running?
...@@ -77,6 +78,7 @@ void CThread::ThreadProc(atmo_thread_t *pAtmoThread) ...@@ -77,6 +78,7 @@ void CThread::ThreadProc(atmo_thread_t *pAtmoThread)
pThread->Execute(); pThread->Execute();
} }
return NULL;
} }
#else #else
......
...@@ -50,7 +50,7 @@ protected: ...@@ -50,7 +50,7 @@ protected:
private: private:
#if defined(_ATMO_VLC_PLUGIN_) #if defined(_ATMO_VLC_PLUGIN_)
static void ThreadProc(atmo_thread_t *pAtmoThread); static void *ThreadProc(vlc_object_t *);
#else #else
static DWORD WINAPI ThreadProc(LPVOID lpParameter); static DWORD WINAPI ThreadProc(LPVOID lpParameter);
#endif #endif
......
...@@ -555,7 +555,7 @@ typedef struct ...@@ -555,7 +555,7 @@ typedef struct
} fadethread_t; } 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 ) ...@@ -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 * to a target color defined in p_fadethread struct
* use for: Fade to Pause Color, and Fade to End Color * 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; filter_sys_t *p_sys = (filter_sys_t *)p_fadethread->p_filter->p_sys;
int i_steps_done = 0; int i_steps_done = 0;
int i_index; int i_index;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment