vlc | branch: master | Steve Lhomme <rob...@videolabs.io> | Wed Nov 22 18:18:28 2017 +0100| [9c716cc9ea66c865e02c153167f948b2c86c6115] | committer: Jean-Baptiste Kempf
hw:d3d11: 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=9c716cc9ea66c865e02c153167f948b2c86c6115 --- modules/hw/d3d11/d3d11_adjust.c | 6 +++--- modules/hw/d3d11/d3d11_deinterlace.c | 6 +++--- modules/hw/d3d11/d3d11_surface.c | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/hw/d3d11/d3d11_adjust.c b/modules/hw/d3d11/d3d11_adjust.c index 1c4aca64fb..f5ace01acc 100644 --- a/modules/hw/d3d11/d3d11_adjust.c +++ b/modules/hw/d3d11/d3d11_adjust.c @@ -324,7 +324,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 D3D11OpenAdjust(vlc_object_t *obj) { filter_t *filter = (filter_t *)obj; HRESULT hr; @@ -587,7 +587,7 @@ error: return VLC_EGENERIC; } -static void Close(vlc_object_t *obj) +static void D3D11CloseAdjust(vlc_object_t *obj) { filter_t *filter = (filter_t *)obj; filter_sys_t *sys = filter->p_sys; @@ -620,7 +620,7 @@ vlc_module_begin() set_capability("video filter", 0) set_category( CAT_VIDEO ) set_subcategory( SUBCAT_VIDEO_VFILTER ) - set_callbacks(Open, Close) + set_callbacks(D3D11OpenAdjust, D3D11CloseAdjust) add_shortcut( "adjust" ) add_float_with_range( "contrast", 1.0, 0.0, 2.0, diff --git a/modules/hw/d3d11/d3d11_deinterlace.c b/modules/hw/d3d11/d3d11_deinterlace.c index 1e310fb2dc..64c098558e 100644 --- a/modules/hw/d3d11/d3d11_deinterlace.c +++ b/modules/hw/d3d11/d3d11_deinterlace.c @@ -281,7 +281,7 @@ static picture_t *NewOutputPicture( filter_t *p_filter ) return pic; } -static int Open(vlc_object_t *obj) +static int D3D11OpenDeinterlace(vlc_object_t *obj) { filter_t *filter = (filter_t *)obj; HRESULT hr; @@ -515,7 +515,7 @@ error: return VLC_EGENERIC; } -static void Close(vlc_object_t *obj) +static void D3D11CloseDeinterlace(vlc_object_t *obj) { filter_t *filter = (filter_t *)obj; filter_sys_t *sys = filter->p_sys; @@ -535,6 +535,6 @@ vlc_module_begin() set_capability("video filter", 0) set_category(CAT_VIDEO) set_subcategory(SUBCAT_VIDEO_VFILTER) - set_callbacks(Open, Close) + set_callbacks(D3D11OpenDeinterlace, D3D11CloseDeinterlace) add_shortcut ("deinterlace") vlc_module_end() diff --git a/modules/hw/d3d11/d3d11_surface.c b/modules/hw/d3d11/d3d11_surface.c index ca79b224a3..24de73ae7c 100644 --- a/modules/hw/d3d11/d3d11_surface.c +++ b/modules/hw/d3d11/d3d11_surface.c @@ -624,7 +624,7 @@ VIDEO_FILTER_WRAPPER (D3D11_NV12) VIDEO_FILTER_WRAPPER (D3D11_YUY2) VIDEO_FILTER_WRAPPER (NV12_D3D11) -static int OpenConverter( vlc_object_t *obj ) +static int D3D11OpenConverter( vlc_object_t *obj ) { filter_t *p_filter = (filter_t *)obj; int err = VLC_EGENERIC; @@ -671,7 +671,7 @@ done: return err; } -static int OpenFromCPU( vlc_object_t *obj ) +static int D3D11OpenCPUConverter( vlc_object_t *obj ) { filter_t *p_filter = (filter_t *)obj; int err = VLC_EGENERIC; @@ -796,7 +796,7 @@ done: return err; } -static void CloseConverter( vlc_object_t *obj ) +static void D3D11CloseConverter( vlc_object_t *obj ) { filter_t *p_filter = (filter_t *)obj; filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys; @@ -819,7 +819,7 @@ static void CloseConverter( vlc_object_t *obj ) p_filter->p_sys = NULL; } -static void CloseFromCPU( vlc_object_t *obj ) +static void D3D11CloseCPUConverter( vlc_object_t *obj ) { filter_t *p_filter = (filter_t *)obj; filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys; @@ -836,8 +836,8 @@ static void CloseFromCPU( vlc_object_t *obj ) vlc_module_begin () set_description( N_("Conversions from D3D11 to YUV") ) set_capability( "video converter", 10 ) - set_callbacks( OpenConverter, CloseConverter ) + set_callbacks( D3D11OpenConverter, D3D11CloseConverter ) add_submodule() - set_callbacks( OpenFromCPU, CloseFromCPU ) + set_callbacks( D3D11OpenCPUConverter, D3D11CloseCPUConverter ) set_capability( "video converter", 10 ) vlc_module_end () _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits