[vlc-commits] vout: remove unused parameters in vout_*DisplayWindow()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Oct  9 21:38:57 2014 +0300| [bab5ed2b1acdde49eb0e34cce8e1cae8286f8d37] | committer: Rémi Denis-Courmont

vout: remove unused parameters in vout_*DisplayWindow()

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

 src/video_output/display.c      |   11 +++++++----
 src/video_output/display.h      |    4 ++--
 src/video_output/video_output.c |    7 ++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/video_output/display.c b/src/video_output/display.c
index 03b889f..0e01061 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -749,8 +749,9 @@ static vout_window_t *VoutDisplayNewWindow(vout_display_t *vd, const vout_window
         return vout_window_New(VLC_OBJECT(osys->vout), "$window", &cfg_override);
     }
 #endif
-    return vout_NewDisplayWindow(osys->vout, vd, cfg);
+    return vout_NewDisplayWindow(osys->vout, cfg);
 }
+
 static void VoutDisplayDelWindow(vout_display_t *vd, vout_window_t *window)
 {
     vout_display_owner_sys_t *osys = vd->owner.sys;
@@ -762,7 +763,7 @@ static void VoutDisplayDelWindow(vout_display_t *vd, vout_window_t *window)
         return;
     }
 #endif
-    vout_DeleteDisplayWindow(osys->vout, vd, window);
+    vout_DeleteDisplayWindow(osys->vout, window);
 }
 
 static void VoutDisplayFitWindow(vout_display_t *vd, bool default_size)
@@ -1446,14 +1447,16 @@ static vout_window_t *SplitterNewWindow(vout_display_t *vd, const vout_window_cf
     cfg.x += 0;//output->window.i_x; FIXME
     cfg.y += 0;//output->window.i_y;
 
-    return vout_NewDisplayWindow(osys->vout, vd, &cfg);
+    return vout_NewDisplayWindow(osys->vout, &cfg);
 }
+
 static void SplitterDelWindow(vout_display_t *vd, vout_window_t *window)
 {
     vout_display_owner_sys_t *osys = vd->owner.sys;
 
-    vout_DeleteDisplayWindow(osys->vout, vd, window);
+    vout_DeleteDisplayWindow(osys->vout, window);
 }
+
 static void SplitterEvent(vout_display_t *vd, int event, va_list args)
 {
     //vout_display_owner_sys_t *osys = vd->owner.sys;
diff --git a/src/video_output/display.h b/src/video_output/display.h
index 1c22918..11daef2 100644
--- a/src/video_output/display.h
+++ b/src/video_output/display.h
@@ -33,7 +33,7 @@ vout_display_t *vout_NewSplitter(vout_thread_t *vout,
 
 /* FIXME should not be there */
 void vout_SendDisplayEventMouse(vout_thread_t *, const vlc_mouse_t *);
-vout_window_t *vout_NewDisplayWindow(vout_thread_t *, vout_display_t *, const vout_window_cfg_t *);
-void vout_DeleteDisplayWindow(vout_thread_t *, vout_display_t *, vout_window_t *);
+vout_window_t *vout_NewDisplayWindow(vout_thread_t *, const vout_window_cfg_t *);
+void vout_DeleteDisplayWindow(vout_thread_t *, vout_window_t *);
 void vout_UpdateDisplaySourceProperties(vout_display_t *vd, const video_format_t *);
 
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 51a32b7..23a0978 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -609,10 +609,9 @@ static void VoutGetDisplayCfg(vout_thread_t *vout, vout_display_cfg_t *cfg, cons
         cfg->align.vertical = VOUT_DISPLAY_ALIGN_BOTTOM;
 }
 
-vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
+vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout,
                                       const vout_window_cfg_t *cfg)
 {
-    VLC_UNUSED(vd);
     vout_window_cfg_t cfg_override = *cfg;
 
     if (!var_InheritBool( vout, "embedded-video"))
@@ -651,10 +650,8 @@ vout_window_t * vout_NewDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
     return window;
 }
 
-void vout_DeleteDisplayWindow(vout_thread_t *vout, vout_display_t *vd,
-                              vout_window_t *window)
+void vout_DeleteDisplayWindow(vout_thread_t *vout, vout_window_t *window)
 {
-    VLC_UNUSED(vd);
     if (!vout->p->window.is_unused && vout->p->window.object == window) {
         vout->p->window.is_unused = true;
     } else if (vout->p->window.is_unused && vout->p->window.object && !window) {