[vlc-commits] vout: remove constant vout_ManageDisplay() parameter

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <***@remlab.net> | Sun Dec 9 11:19:44 2018 +0200| [07facc28848cbed15ffa385757c04520873c1d93] | committer: Rémi Denis-Courmont

vout: remove constant vout_ManageDisplay() parameter

http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=07facc28848cbed15ffa385757c04520873c1d93

---

src/video_output/display.c | 7 +++----
src/video_output/vout_wrapper.c | 2 +-
src/video_output/vout_wrapper.h | 2 +-
3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 7101d37e2c..7d1aee96ad 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -631,7 +631,7 @@ static void VoutDisplayCropRatio(int *left, int *top, int *right, int *bottom,
}
}

-bool vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
+bool vout_ManageDisplay(vout_display_t *vd)
{
vout_display_owner_sys_t *osys = vd->owner.sys;

@@ -670,8 +670,7 @@ bool vout_ManageDisplay(vout_display_t *vd, bool allow_reset_pictures)
}
#endif

- if (allow_reset_pictures
- && atomic_exchange(&osys->reset_pictures, false)) {
+ if (atomic_exchange(&osys->reset_pictures, false)) {
if (vout_display_Control(vd, VOUT_DISPLAY_RESET_PICTURES, &osys->cfg,
&vd->fmt)) {
/* FIXME what to do here ? */
@@ -1109,7 +1108,7 @@ static void SplitterManage(vout_display_t *vd)
vout_display_sys_t *sys = vd->sys;

for (int i = 0; i < sys->count; i++)
- vout_ManageDisplay(sys->display[i], true);
+ vout_ManageDisplay(sys->display[i]);
}

static int SplitterPictureNew(video_splitter_t *splitter, picture_t *picture[])
diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index 5625a920f6..0c52558dbb 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -185,7 +185,7 @@ void vout_ManageWrapper(vout_thread_t *vout)
vout_display_t *vd = sys->display.vd;

bool reset_display_pool = vout_AreDisplayPicturesInvalid(vd);
- reset_display_pool |= vout_ManageDisplay(vd, true);
+ reset_display_pool |= vout_ManageDisplay(vd);

if (reset_display_pool) {
sys->display.use_dr = !vout_IsDisplayFiltered(vd);
diff --git a/src/video_output/vout_wrapper.h b/src/video_output/vout_wrapper.h
index 7f57e2cbb7..fe1cc078f7 100644
--- a/src/video_output/vout_wrapper.h
+++ b/src/video_output/vout_wrapper.h
@@ -72,7 +72,7 @@ picture_t * vout_FilterDisplay(vout_display_t *, picture_t *);
void vout_FilterFlush(vout_display_t *);
bool vout_AreDisplayPicturesInvalid(vout_display_t *);

-bool vout_ManageDisplay(vout_display_t *, bool allow_reset_pictures);
+bool vout_ManageDisplay(vout_display_t *);

void vout_SetDisplaySize(vout_display_t *, unsigned width, unsigned height);
void vout_SetDisplayFilled(vout_display_t *, bool is_filled);