vlc | branch: master | Steve Lhomme <rob...@videolabs.io> | Wed Nov 22 18:18:29 2017 +0100| [a5d181248b18f4fe93161bfae778a2be677a652c] | committer: Jean-Baptiste Kempf
hw:d3d9: rename the Open/Close for each module Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a5d181248b18f4fe93161bfae778a2be677a652c --- modules/hw/d3d9/d3d9_adjust.c | 6 +++--- modules/hw/d3d9/dxa9.c | 12 ++++++------ modules/hw/d3d9/dxva2_deinterlace.c | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/hw/d3d9/d3d9_adjust.c b/modules/hw/d3d9/d3d9_adjust.c index e523d4b10d..b62ea5ef95 100644 --- a/modules/hw/d3d9/d3d9_adjust.c +++ b/modules/hw/d3d9/d3d9_adjust.c @@ -216,7 +216,7 @@ static int AdjustCallback( vlc_object_t *p_this, char const *psz_var, return VLC_SUCCESS; } -static int Open(vlc_object_t *obj) +static int D3D9OpenAdjust(vlc_object_t *obj) { filter_t *filter = (filter_t *)obj; filter_sys_t *sys = NULL; @@ -424,7 +424,7 @@ error: return VLC_EGENERIC; } -static void Close(vlc_object_t *obj) +static void D3D9CloseAdjust(vlc_object_t *obj) { filter_t *filter = (filter_t *)obj; filter_sys_t *sys = filter->p_sys; @@ -443,7 +443,7 @@ vlc_module_begin() set_capability("video filter", 0) set_category(CAT_VIDEO) set_subcategory(SUBCAT_VIDEO_VFILTER) - set_callbacks(Open, Close) + set_callbacks(D3D9OpenAdjust, D3D9CloseAdjust) add_shortcut( "adjust" ) add_float_with_range( "contrast", 1.0, 0.0, 2.0, diff --git a/modules/hw/d3d9/dxa9.c b/modules/hw/d3d9/dxa9.c index 93095ca055..ff26e2d3ff 100644 --- a/modules/hw/d3d9/dxa9.c +++ b/modules/hw/d3d9/dxa9.c @@ -287,7 +287,7 @@ VIDEO_FILTER_WRAPPER (DXA9_YV12) VIDEO_FILTER_WRAPPER (DXA9_NV12) VIDEO_FILTER_WRAPPER (YV12_D3D9) -static int OpenConverter( vlc_object_t *obj ) +static int D3D9OpenConverter( vlc_object_t *obj ) { filter_t *p_filter = (filter_t *)obj; HINSTANCE hd3d_dll = NULL; @@ -336,7 +336,7 @@ done: return err; } -static int OpenFromCPU( vlc_object_t *obj ) +static int D3D9OpenCPUConverter( vlc_object_t *obj ) { filter_t *p_filter = (filter_t *)obj; int err = VLC_EGENERIC; @@ -455,7 +455,7 @@ done: return err; } -static void CloseConverter( vlc_object_t *obj ) +static void D3D9CloseConverter( vlc_object_t *obj ) { filter_t *p_filter = (filter_t *)obj; copy_cache_t *p_copy_cache = (copy_cache_t*) p_filter->p_sys; @@ -464,7 +464,7 @@ static void CloseConverter( vlc_object_t *obj ) p_filter->p_sys = NULL; } -static void CloseFromCPU( vlc_object_t *obj ) +static void D3D9CloseCPUConverter( vlc_object_t *obj ) { filter_t *p_filter = (filter_t *)obj; filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys; @@ -482,8 +482,8 @@ static void CloseFromCPU( vlc_object_t *obj ) vlc_module_begin () set_description( N_("Conversions from DxVA2 to YUV") ) set_capability( "video converter", 10 ) - set_callbacks( OpenConverter, CloseConverter ) + set_callbacks( D3D9OpenConverter, D3D9CloseConverter ) add_submodule() - set_callbacks( OpenFromCPU, CloseFromCPU ) + set_callbacks( D3D9OpenCPUConverter, D3D9CloseCPUConverter ) set_capability( "video converter", 10 ) vlc_module_end () diff --git a/modules/hw/d3d9/dxva2_deinterlace.c b/modules/hw/d3d9/dxva2_deinterlace.c index 4dfc906950..06fb217826 100644 --- a/modules/hw/d3d9/dxva2_deinterlace.c +++ b/modules/hw/d3d9/dxva2_deinterlace.c @@ -266,7 +266,7 @@ static picture_t *NewOutputPicture( filter_t *p_filter ) return pic; } -static int Open(vlc_object_t *obj) +static int D3D9OpenDeinterlace(vlc_object_t *obj) { filter_t *filter = (filter_t *)obj; filter_sys_t *sys = NULL; @@ -492,7 +492,7 @@ error: return VLC_EGENERIC; } -static void Close(vlc_object_t *obj) +static void D3D9CloseDeinterlace(vlc_object_t *obj) { filter_t *filter = (filter_t *)obj; filter_sys_t *sys = filter->p_sys; @@ -511,6 +511,6 @@ vlc_module_begin() set_capability("video filter", 0) set_category(CAT_VIDEO) set_subcategory(SUBCAT_VIDEO_VFILTER) - set_callbacks(Open, Close) + set_callbacks(D3D9OpenDeinterlace, D3D9CloseDeinterlace) add_shortcut ("deinterlace") vlc_module_end() _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits