Commit ba8fc0db authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

display: remove useless vout_DeleteDisplayWindow() argument

This function does nothing when the window argument is non-NULL.
This change removes the argument and removes calls where the argument
was not NULL.
parent 6bae19b4
......@@ -655,7 +655,8 @@ static void VoutDisplayDelWindow(vout_display_t *vd, vout_window_t *window)
if (window != NULL)
vout_display_window_Detach(window);
vout_DeleteDisplayWindow(osys->vout, window);
else
vout_DeleteDisplayWindow(osys->vout);
}
static void VoutDisplayFitWindow(vout_display_t *vd, bool default_size)
......
......@@ -34,7 +34,7 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout,
void vout_SendDisplayEventMouse(vout_thread_t *, const vlc_mouse_t *);
vout_window_t *vout_NewDisplayWindow(vout_thread_t *);
void vout_DeleteDisplayWindow(vout_thread_t *, vout_window_t *);
void vout_DeleteDisplayWindow(vout_thread_t *);
void vout_SetDisplayWindowSize(vout_thread_t *, unsigned, unsigned);
void vout_UpdateDisplaySourceProperties(vout_display_t *vd, const video_format_t *);
......@@ -613,13 +613,12 @@ vout_window_t *vout_NewDisplayWindow(vout_thread_t *vout)
return vout->p->window;
}
void vout_DeleteDisplayWindow(vout_thread_t *vout, vout_window_t *window)
void vout_DeleteDisplayWindow(vout_thread_t *vout)
{
if (window == NULL && vout->p->window != NULL) {
if (vout->p->window != NULL) {
vout_display_window_Delete(vout->p->window);
vout->p->window = NULL;
}
assert(vout->p->window == window);
}
void vout_SetDisplayWindowSize(vout_thread_t *vout,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment