[vlc-commits] vout display: deprecate the "manage" callback (refs #17700)
Rémi Denis-Courmont
git at videolan.org
Sun Aug 6 20:27:17 CEST 2017
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug 5 23:13:43 2017 +0300| [ce0be79b4361d6646e9acb5a1bb3f775bb6a82b6] | committer: Rémi Denis-Courmont
vout display: deprecate the "manage" callback (refs #17700)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ce0be79b4361d6646e9acb5a1bb3f775bb6a82b6
---
include/vlc_vout_display.h | 2 +-
modules/codec/omxil/vout.c | 1 -
modules/hw/vdpau/display.c | 1 -
modules/video_output/android/display.c | 1 -
modules/video_output/decklink.cpp | 1 -
modules/video_output/fb.c | 1 -
modules/video_output/flaschen.c | 1 -
modules/video_output/ios.m | 1 -
modules/video_output/opengl/display.c | 1 -
modules/video_output/vdummy.c | 1 -
modules/video_output/vmem.c | 1 -
modules/video_output/wayland/shm.c | 1 -
modules/video_output/xcb/x11.c | 1 -
modules/video_output/xcb/xvideo.c | 1 -
modules/video_output/yuv.c | 1 -
15 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index bbe2e9acb8..4dd513ff62 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -329,7 +329,7 @@ struct vout_display_t {
int (*control)(vout_display_t *, int, va_list);
/* Manage pending event (optional) */
- void (*manage)(vout_display_t *);
+ void (*manage)(vout_display_t *) VLC_DEPRECATED;
/* Private place holder for the vout_display_t module (optional)
*
diff --git a/modules/codec/omxil/vout.c b/modules/codec/omxil/vout.c
index 84d79acd46..3e659f2ced 100644
--- a/modules/codec/omxil/vout.c
+++ b/modules/codec/omxil/vout.c
@@ -291,7 +291,6 @@ static int Open(vlc_object_t *p_this)
vd->display = Display;
vd->control = Control;
vd->prepare = NULL;
- vd->manage = NULL;
/* Create the associated picture */
pictures = calloc(p_sys->port.i_buffers, sizeof(*pictures));
diff --git a/modules/hw/vdpau/display.c b/modules/hw/vdpau/display.c
index a92ac742e5..767112a9ec 100644
--- a/modules/hw/vdpau/display.c
+++ b/modules/hw/vdpau/display.c
@@ -655,7 +655,6 @@ static int Open(vlc_object_t *obj)
vd->prepare = Queue;
vd->display = Wait;
vd->control = Control;
- vd->manage = NULL;
return VLC_SUCCESS;
diff --git a/modules/video_output/android/display.c b/modules/video_output/android/display.c
index 6757299e35..aa0cc94aff 100644
--- a/modules/video_output/android/display.c
+++ b/modules/video_output/android/display.c
@@ -759,7 +759,6 @@ static int OpenCommon(vout_display_t *vd)
vd->prepare = Prepare;
vd->display = Display;
vd->control = Control;
- vd->manage = NULL;
vd->info.is_slow = !sys->p_window->b_opaque;
return VLC_SUCCESS;
diff --git a/modules/video_output/decklink.cpp b/modules/video_output/decklink.cpp
index 13d9a608f6..2ec4126a54 100644
--- a/modules/video_output/decklink.cpp
+++ b/modules/video_output/decklink.cpp
@@ -1071,7 +1071,6 @@ static int OpenVideo(vlc_object_t *p_this)
vd->prepare = PrepareVideo;
vd->display = DisplayVideo;
vd->control = ControlVideo;
- vd->manage = NULL;
return VLC_SUCCESS;
}
diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index de2c35c77d..615b2c7663 100644
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -310,7 +310,6 @@ static int Open(vlc_object_t *object)
vd->prepare = NULL;
vd->display = Display;
vd->control = Control;
- vd->manage = NULL;
/* */
vout_display_SendEventDisplaySize(vd, fmt.i_visible_width, fmt.i_visible_height);
diff --git a/modules/video_output/flaschen.c b/modules/video_output/flaschen.c
index 4ae5022101..795e02d4db 100644
--- a/modules/video_output/flaschen.c
+++ b/modules/video_output/flaschen.c
@@ -146,7 +146,6 @@ static int Open(vlc_object_t *object)
vd->prepare = NULL;
vd->display = Display;
vd->control = Control;
- vd->manage = NULL;
vout_display_DeleteWindow(vd, NULL);
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index e4a56cb2cb..b0333800ab 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -212,7 +212,6 @@ static int Open(vlc_object_t *this)
vd->prepare = PictureRender;
vd->display = PictureDisplay;
vd->control = Control;
- vd->manage = NULL;
/* forward our dimensions to the vout core */
[sys->glESView performSelectorOnMainThread:@selector(propagateDimensionsToVoutCore) withObject:nil waitUntilDone:YES];
diff --git a/modules/video_output/opengl/display.c b/modules/video_output/opengl/display.c
index e72e16005d..c375302efe 100644
--- a/modules/video_output/opengl/display.c
+++ b/modules/video_output/opengl/display.c
@@ -129,7 +129,6 @@ static int Open (vlc_object_t *obj)
vd->prepare = PictureRender;
vd->display = PictureDisplay;
vd->control = Control;
- vd->manage = NULL;
return VLC_SUCCESS;
error:
diff --git a/modules/video_output/vdummy.c b/modules/video_output/vdummy.c
index 925897fd8d..40d54b9b96 100644
--- a/modules/video_output/vdummy.c
+++ b/modules/video_output/vdummy.c
@@ -102,7 +102,6 @@ static int Open(vlc_object_t *object,
vd->prepare = NULL;
vd->display = display;
vd->control = Control;
- vd->manage = NULL;
vout_display_DeleteWindow(vd, NULL);
diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index d0ff7160c1..1c57a82880 100644
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -219,7 +219,6 @@ static int Open(vlc_object_t *object)
vd->prepare = Prepare;
vd->display = Display;
vd->control = Control;
- vd->manage = NULL;
/* */
vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height);
diff --git a/modules/video_output/wayland/shm.c b/modules/video_output/wayland/shm.c
index 03e28362c1..053559a5cd 100644
--- a/modules/video_output/wayland/shm.c
+++ b/modules/video_output/wayland/shm.c
@@ -472,7 +472,6 @@ static int Open(vlc_object_t *obj)
vd->prepare = Prepare;
vd->display = Display;
vd->control = Control;
- vd->manage = NULL;
return VLC_SUCCESS;
diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index 2bd6d8c4a6..3009e4daa4 100644
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -304,7 +304,6 @@ found_format:;
vd->prepare = NULL;
vd->display = Display;
vd->control = Control;
- vd->manage = NULL;
return VLC_SUCCESS;
diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 387c768d28..c759627b7e 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -566,7 +566,6 @@ static int Open (vlc_object_t *obj)
vd->prepare = NULL;
vd->display = Display;
vd->control = Control;
- vd->manage = NULL;
return VLC_SUCCESS;
diff --git a/modules/video_output/yuv.c b/modules/video_output/yuv.c
index 1fcc9e9f05..888e44d6df 100644
--- a/modules/video_output/yuv.c
+++ b/modules/video_output/yuv.c
@@ -164,7 +164,6 @@ static int Open(vlc_object_t *object)
vd->prepare = NULL;
vd->display = Display;
vd->control = Control;
- vd->manage = NULL;
vout_display_DeleteWindow(vd, NULL);
return VLC_SUCCESS;
More information about the vlc-commits
mailing list