[vlc-commits] display: export vout_display_SetSize() (refs #21604)
Rémi Denis-Courmont
git at videolan.org
Sat Jan 12 15:46:43 CET 2019
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Jan 12 16:43:18 2019 +0200| [7c4a70dfdec41b38c155eccc0cd9526b31e98999] | committer: Rémi Denis-Courmont
display: export vout_display_SetSize() (refs #21604)
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7c4a70dfdec41b38c155eccc0cd9526b31e98999
---
include/vlc_vout_display.h | 3 +++
src/libvlccore.sym | 1 +
src/video_output/display.c | 2 +-
src/video_output/video_output.c | 4 ++--
src/video_output/vout_wrapper.h | 1 -
5 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/include/vlc_vout_display.h b/include/vlc_vout_display.h
index 04dc010e3b..125f532b2f 100644
--- a/include/vlc_vout_display.h
+++ b/include/vlc_vout_display.h
@@ -345,6 +345,9 @@ static inline void vout_display_Display(vout_display_t *vd, picture_t *picture)
picture_Release(picture);
}
+VLC_API
+void vout_display_SetSize(vout_display_t *vd, unsigned width, unsigned height);
+
static inline int vout_display_Control(vout_display_t *vd, int query, ...)
{
va_list ap;
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 4551406515..fe69d7b5eb 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -753,6 +753,7 @@ vout_display_SendMouseMovedDisplayCoordinates
vout_display_New
vout_display_Delete
vout_display_Prepare
+vout_display_SetSize
xml_Create
text_style_Copy
text_style_Create
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 9b2d9fe0ce..b9fefdcec3 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -596,7 +596,7 @@ void vout_UpdateDisplaySourceProperties(vout_display_t *vd, const video_format_t
vout_display_Reset(vd);
}
-void vout_SetDisplaySize(vout_display_t *vd, unsigned width, unsigned height)
+void vout_display_SetSize(vout_display_t *vd, unsigned width, unsigned height)
{
vout_display_priv_t *osys = container_of(vd, vout_display_priv_t, display);
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 688be82940..65d1b7d16d 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -1596,8 +1596,8 @@ static int ThreadControl(vout_thread_t *vout, vout_control_cmd_t cmd)
ThreadProcessMouseState(vout, &cmd.mouse);
break;
case VOUT_CONTROL_DISPLAY_SIZE:
- vout_SetDisplaySize(vout->p->display,
- cmd.window.width, cmd.window.height);
+ vout_display_SetSize(vout->p->display,
+ cmd.window.width, cmd.window.height);
break;
case VOUT_CONTROL_DISPLAY_FILLED:
vout_SetDisplayFilled(vout->p->display, cmd.boolean);
diff --git a/src/video_output/vout_wrapper.h b/src/video_output/vout_wrapper.h
index 182bd3b46d..33007d2a25 100644
--- a/src/video_output/vout_wrapper.h
+++ b/src/video_output/vout_wrapper.h
@@ -38,7 +38,6 @@ bool vout_IsDisplayFiltered(vout_display_t *);
picture_t * vout_FilterDisplay(vout_display_t *, picture_t *);
void vout_FilterFlush(vout_display_t *);
-void vout_SetDisplaySize(vout_display_t *, unsigned width, unsigned height);
void vout_SetDisplayFilled(vout_display_t *, bool is_filled);
void vout_SetDisplayZoom(vout_display_t *, unsigned num, unsigned den);
void vout_SetDisplayAspect(vout_display_t *, unsigned num, unsigned den);
More information about the vlc-commits
mailing list