Commit e17db4e3 authored by Laurent Aimar's avatar Laurent Aimar

Split out non events code into common.c

parent 7235303a
...@@ -2,28 +2,33 @@ SOURCES_directx = \ ...@@ -2,28 +2,33 @@ SOURCES_directx = \
directx.c \ directx.c \
vout.h \ vout.h \
events.c \ events.c \
common.c \
$(NULL) $(NULL)
SOURCES_direct3d = \ SOURCES_direct3d = \
direct3d.c \ direct3d.c \
vout.h \ vout.h \
events.c \ events.c \
common.c \
$(NULL) $(NULL)
SOURCES_glwin32 = \ SOURCES_glwin32 = \
glwin32.c \ glwin32.c \
vout.h \ vout.h \
events.c \ events.c \
common.c \
$(NULL) $(NULL)
SOURCES_wingdi = \ SOURCES_wingdi = \
wingdi.c \ wingdi.c \
vout.h \ vout.h \
events.c \ events.c \
common.c \
$(NULL) $(NULL)
SOURCES_wingapi = \ SOURCES_wingapi = \
wingdi.c \ wingdi.c \
vout.h \ vout.h \
events.c \ events.c \
common.c \
$(NULL) $(NULL)
This diff is collapsed.
...@@ -192,6 +192,7 @@ static int OpenVideo( vlc_object_t *p_this ) ...@@ -192,6 +192,7 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->pf_manage = Manage; p_vout->pf_manage = Manage;
p_vout->pf_render = Direct3DVoutRenderScene; p_vout->pf_render = Direct3DVoutRenderScene;
p_vout->pf_display = FirstDisplay; p_vout->pf_display = FirstDisplay;
p_vout->pf_control = Control;
p_vout->p_sys->hwnd = p_vout->p_sys->hvideownd = NULL; p_vout->p_sys->hwnd = p_vout->p_sys->hvideownd = NULL;
p_vout->p_sys->hparent = p_vout->p_sys->hfswnd = NULL; p_vout->p_sys->hparent = p_vout->p_sys->hfswnd = NULL;
......
...@@ -225,6 +225,7 @@ static int OpenVideo( vlc_object_t *p_this ) ...@@ -225,6 +225,7 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->pf_manage = Manage; p_vout->pf_manage = Manage;
p_vout->pf_render = NULL; p_vout->pf_render = NULL;
p_vout->pf_display = FirstDisplay; p_vout->pf_display = FirstDisplay;
p_vout->pf_control = Control;
p_vout->p_sys->p_ddobject = NULL; p_vout->p_sys->p_ddobject = NULL;
p_vout->p_sys->p_display = NULL; p_vout->p_sys->p_display = NULL;
......
This diff is collapsed.
...@@ -102,6 +102,7 @@ static int OpenVideo( vlc_object_t *p_this ) ...@@ -102,6 +102,7 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->pf_end = End; p_vout->pf_end = End;
p_vout->pf_manage = Manage; p_vout->pf_manage = Manage;
p_vout->pf_swap = FirstSwap; p_vout->pf_swap = FirstSwap;
p_vout->pf_control = Control;
p_vout->p_sys->hwnd = p_vout->p_sys->hvideownd = NULL; p_vout->p_sys->hwnd = p_vout->p_sys->hvideownd = NULL;
p_vout->p_sys->hparent = p_vout->p_sys->hfswnd = NULL; p_vout->p_sys->hparent = p_vout->p_sys->hfswnd = NULL;
......
...@@ -256,15 +256,20 @@ int DirectDrawUpdateOverlay( vout_thread_t *p_vout ); ...@@ -256,15 +256,20 @@ int DirectDrawUpdateOverlay( vout_thread_t *p_vout );
/***************************************************************************** /*****************************************************************************
* Prototypes from events.c * Prototypes from events.c
*****************************************************************************/ *****************************************************************************/
void* EventThread ( vlc_object_t *p_this ); int CreateEventThread( vout_thread_t *p_vout );
void StopEventThread ( vout_thread_t *p_vout );
/*****************************************************************************
* Prototypes from common.c
*****************************************************************************/
int Control( vout_thread_t *p_vout, int i_query, va_list args );
void UpdateRects ( vout_thread_t *p_vout, bool b_force ); void UpdateRects ( vout_thread_t *p_vout, bool b_force );
void Win32ToggleFullscreen ( vout_thread_t *p_vout ); void Win32ToggleFullscreen ( vout_thread_t *p_vout );
#ifndef UNDER_CE #ifndef UNDER_CE
void DisableScreensaver ( vout_thread_t *p_vout ); void DisableScreensaver ( vout_thread_t *p_vout );
void RestoreScreensaver ( vout_thread_t *p_vout ); void RestoreScreensaver ( vout_thread_t *p_vout );
#endif #endif
int CreateEventThread( vout_thread_t *p_vout );
void StopEventThread ( vout_thread_t *p_vout );
/***************************************************************************** /*****************************************************************************
* Constants * Constants
......
...@@ -152,6 +152,7 @@ static int OpenVideo ( vlc_object_t *p_this ) ...@@ -152,6 +152,7 @@ static int OpenVideo ( vlc_object_t *p_this )
p_vout->pf_end = End; p_vout->pf_end = End;
p_vout->pf_manage = Manage; p_vout->pf_manage = Manage;
p_vout->pf_render = Render; p_vout->pf_render = Render;
p_vout->pf_control = Control;
#ifdef MODULE_NAME_IS_wingapi #ifdef MODULE_NAME_IS_wingapi
p_vout->pf_display = FirstDisplayGAPI; p_vout->pf_display = FirstDisplayGAPI;
......
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