[vlc-commits] mmal: deinterlace/vout rename open/close callbacks

[John Cox]

vlc | branch: master | John Cox <jc at kynesim.co.uk> | Fri Jan 17 12:19:06 2020 +0100| [345ed2eb8e3ad01bce7795258a3612e3d2d3a1f6] | committer: Steve Lhomme

mmal: deinterlace/vout rename open/close callbacks

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

 modules/hw/mmal/deinterlace.c | 12 ++++++------
 modules/hw/mmal/vout.c        | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/hw/mmal/deinterlace.c b/modules/hw/mmal/deinterlace.c
index 8903c026a4..66afd2bf7f 100644
--- a/modules/hw/mmal/deinterlace.c
+++ b/modules/hw/mmal/deinterlace.c
@@ -45,8 +45,8 @@
 #define MMAL_DEINTERLACE_QPU_TEXT N_("Use QPUs for advanced HD deinterlacing.")
 #define MMAL_DEINTERLACE_QPU_LONGTEXT N_("Make use of the QPUs to allow higher quality deinterlacing of HD content.")
 
-static int Open(vlc_object_t *);
-static void Close(vlc_object_t *);
+static int OpenMmalDeinterlace(vlc_object_t *);
+static void CloseMmalDeinterlace(vlc_object_t *);
 
 vlc_module_begin()
     set_shortname(N_("MMAL deinterlace"))
@@ -54,7 +54,7 @@ vlc_module_begin()
     set_capability("video filter", 0)
     set_category(CAT_VIDEO)
     set_subcategory(SUBCAT_VIDEO_VFILTER)
-    set_callbacks(Open, Close)
+    set_callbacks(OpenMmalDeinterlace, CloseMmalDeinterlace)
     add_shortcut("deinterlace")
     add_bool(MMAL_DEINTERLACE_QPU, false, MMAL_DEINTERLACE_QPU_TEXT,
                     MMAL_DEINTERLACE_QPU_LONGTEXT, true);
@@ -84,7 +84,7 @@ static void flush(filter_t *filter);
 
 #define MMAL_COMPONENT_DEFAULT_DEINTERLACE "vc.ril.image_fx"
 
-static int Open(vlc_object_t *obj)
+static int OpenMmalDeinterlace(vlc_object_t *obj)
 {
     filter_t *filter = (filter_t *)obj;
     if (filter->fmt_in.video.i_chroma != VLC_CODEC_MMAL_OPAQUE)
@@ -251,12 +251,12 @@ static int Open(vlc_object_t *obj)
 
 out:
     if (ret != VLC_SUCCESS)
-        Close(obj);
+        CloseMmalDeinterlace(obj);
 
     return ret;
 }
 
-static void Close(vlc_object_t *obj)
+static void CloseMmalDeinterlace(vlc_object_t *obj)
 {
     filter_t *filter = (filter_t *)obj;
     filter_sys_t *sys = filter->p_sys;
diff --git a/modules/hw/mmal/vout.c b/modules/hw/mmal/vout.c
index 66701e3ca7..0c2e3e5e0d 100644
--- a/modules/hw/mmal/vout.c
+++ b/modules/hw/mmal/vout.c
@@ -67,9 +67,9 @@
 #define PHASE_OFFSET_TARGET ((double)0.25)
 #define PHASE_CHECK_INTERVAL 100
 
-static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
-                video_format_t *fmt, vlc_video_context *context);
-static void Close(vout_display_t *vd);
+static int OpenMmalVout(vout_display_t *, const vout_display_cfg_t *,
+                video_format_t *, vlc_video_context *);
+static void CloseMmalVout(vout_display_t *);
 
 vlc_module_begin()
     set_shortname(N_("MMAL vout"))
@@ -82,7 +82,7 @@ vlc_module_begin()
                     MMAL_ADJUST_REFRESHRATE_LONGTEXT, false)
     add_bool(MMAL_NATIVE_INTERLACED, false, MMAL_NATIVE_INTERLACE_TEXT,
                     MMAL_NATIVE_INTERLACE_LONGTEXT, false)
-    set_callback_display(Open, 90)
+    set_callback_display(OpenMmalVout, 90)
 vlc_module_end()
 
 struct dmx_region_t {
@@ -182,7 +182,7 @@ static void dmx_region_delete(struct dmx_region_t *dmx_region,
 static void show_background(vout_display_t *vd, bool enable);
 static void maintain_phase_sync(vout_display_t *vd);
 
-static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
+static int OpenMmalVout(vout_display_t *vd, const vout_display_cfg_t *cfg,
                 video_format_t *fmt, vlc_video_context *context)
 {
     vout_display_sys_t *sys;
@@ -303,7 +303,7 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
     vd->prepare = vd_prepare;
     vd->display = vd_display;
     vd->control = vd_control;
-    vd->close = Close;
+    vd->close = CloseMmalVout;
 
     vc_tv_register_callback(tvservice_cb, vd);
 
@@ -320,13 +320,13 @@ static int Open(vout_display_t *vd, const vout_display_cfg_t *cfg,
 
 out:
     if (ret != VLC_SUCCESS)
-        Close(vd);
+        CloseMmalVout(vd);
 
     (void) context;
     return ret;
 }
 
-static void Close(vout_display_t *vd)
+static void CloseMmalVout(vout_display_t *vd)
 {
     vout_display_sys_t *sys = vd->sys;
     char response[20]; /* answer is hvs_update_fields=%1d */