[vlc-commits] vout: remove unused x/y settings in window configuration
Rémi Denis-Courmont
git at videolan.org
Thu Oct 16 19:25:56 CEST 2014
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Oct 9 22:41:55 2014 +0300| [1e8170454bbf691b97e1c45b6444181e9fb0932f] | committer: Rémi Denis-Courmont
vout: remove unused x/y settings in window configuration
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1e8170454bbf691b97e1c45b6444181e9fb0932f
---
modules/video_output/gl.c | 2 --
modules/video_output/kva.c | 2 --
modules/video_output/msw/events.c | 2 --
modules/video_output/xcb/events.c | 2 --
modules/video_splitter/wall.c | 2 +-
5 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
index 3d1d19a..a2f4aa3 100644
--- a/modules/video_output/gl.c
+++ b/modules/video_output/gl.c
@@ -96,8 +96,6 @@ static int Control (vout_display_t *, int, va_list);
static vout_window_t *MakeWindow (vout_display_t *vd)
{
vout_window_cfg_t cfg = {
- .x = var_InheritInteger (vd, "video-x"),
- .y = var_InheritInteger (vd, "video-y"),
.width = vd->cfg->display.width,
.height = vd->cfg->display.height,
};
diff --git a/modules/video_output/kva.c b/modules/video_output/kva.c
index b90f431..96f0a63 100644
--- a/modules/video_output/kva.c
+++ b/modules/video_output/kva.c
@@ -180,8 +180,6 @@ static void PMThread( void *arg )
wnd_cfg.is_standalone = false;
wnd_cfg.type = VOUT_WINDOW_TYPE_HWND;
- wnd_cfg.x = var_InheritInteger(vd, "video-x");
- wnd_cfg.y = var_InheritInteger(vd, "video-y");
wnd_cfg.width = vd->cfg->display.width;
wnd_cfg.height = vd->cfg->display.height;
diff --git a/modules/video_output/msw/events.c b/modules/video_output/msw/events.c
index 934f0fe..8fc8021 100644
--- a/modules/video_output/msw/events.c
+++ b/modules/video_output/msw/events.c
@@ -687,8 +687,6 @@ static int Win32VoutCreateWindow( event_thread_t *p_event )
#endif
vout_window_cfg_t wnd_cfg = {
.type = VOUT_WINDOW_TYPE_HWND,
- .x = p_event->x,
- .y = p_event->y,
.width = p_event->width,
.height = p_event->height,
};
diff --git a/modules/video_output/xcb/events.c b/modules/video_output/xcb/events.c
index efb3adb..ba83de8 100644
--- a/modules/video_output/xcb/events.c
+++ b/modules/video_output/xcb/events.c
@@ -133,8 +133,6 @@ vout_window_t *XCB_parent_Create (vout_display_t *vd,
{
vout_window_cfg_t cfg = {
.type = VOUT_WINDOW_TYPE_XID,
- .x = var_InheritInteger (vd, "video-x"),
- .y = var_InheritInteger (vd, "video-y"),
.width = vd->cfg->display.width,
.height = vd->cfg->display.height,
};
diff --git a/modules/video_splitter/wall.c b/modules/video_splitter/wall.c
index 5be60dc..9a9829a 100644
--- a/modules/video_splitter/wall.c
+++ b/modules/video_splitter/wall.c
@@ -361,7 +361,7 @@ static int Open( vlc_object_t *p_this )
p_cfg->fmt.i_height = p_output->i_height;
p_cfg->fmt.i_sar_num = (int64_t)i_aspect * i_target_height;
p_cfg->fmt.i_sar_den = VOUT_ASPECT_FACTOR * i_target_width;
- p_cfg->window.i_x = p_output->i_left; /* FIXME relative to video-x/y (TODO in wrapper.c) ? */
+ p_cfg->window.i_x = p_output->i_left;
p_cfg->window.i_y = p_output->i_top;
p_cfg->window.i_align = p_output->i_align;
p_cfg->psz_module = NULL;
More information about the vlc-commits
mailing list