vlc | branch: master | Rémi Denis-Courmont <r...@remlab.net> | Sun Aug  6 
10:37:34 2017 +0300| [733677402b40df9a26d15dfb5e3c5884019f3da2] | committer: 
Rémi Denis-Courmont

vout: make has_hide_mouse true by default

Most video output displays either defer mouse hiding to the window
provider plugin, or do not handle the mouse events at all.
So that ought to be the default.

Also kepe the default in those display plugins that don´t handle
cursor hiding (notably X11 ones).

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

 modules/hw/mmal/vout.c               | 1 -
 modules/video_output/aa.c            | 1 +
 modules/video_output/caca.c          | 1 +
 modules/video_output/caopengllayer.m | 1 -
 modules/video_output/decklink.cpp    | 1 -
 modules/video_output/fb.c            | 5 -----
 modules/video_output/macosx.m        | 1 -
 modules/video_output/vmem.c          | 5 -----
 modules/video_output/yuv.c           | 5 -----
 src/video_output/display.c           | 2 +-
 10 files changed, 3 insertions(+), 20 deletions(-)

diff --git a/modules/hw/mmal/vout.c b/modules/hw/mmal/vout.c
index 1d378e3aa1..edd2b767af 100644
--- a/modules/hw/mmal/vout.c
+++ b/modules/hw/mmal/vout.c
@@ -196,7 +196,6 @@ static int Open(vlc_object_t *object)
     sys->layer = var_InheritInteger(vd, MMAL_LAYER_NAME);
     bcm_host_init();
 
-    vd->info.has_hide_mouse = true;
     sys->opaque = vd->fmt.i_chroma == VLC_CODEC_MMAL_OPAQUE;
 
     status = mmal_component_create(MMAL_COMPONENT_DEFAULT_VIDEO_RENDERER, 
&sys->component);
diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c
index 6210aeefc5..b69ca15be7 100644
--- a/modules/video_output/aa.c
+++ b/modules/video_output/aa.c
@@ -129,6 +129,7 @@ static int Open(vlc_object_t *object)
     /* Setup vout_display now that everything is fine */
     vd->fmt = fmt;
     vd->info.has_pictures_invalid = true;
+    vd->info.has_hide_mouse = false;
 
     vd->pool    = Pool;
     vd->prepare = Prepare;
diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index 65d317cedc..5e3579e734 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -191,6 +191,7 @@ static int Open(vlc_object_t *object)
 
     /* Setup vout_display now that everything is fine */
     vd->fmt = fmt;
+    vd->info.has_hide_mouse = false;
 
     vd->pool    = Pool;
     vd->prepare = Prepare;
diff --git a/modules/video_output/caopengllayer.m 
b/modules/video_output/caopengllayer.m
index 7d129a9fc6..4232d29441 100644
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -198,7 +198,6 @@ static int Open (vlc_object_t *p_this)
         /* setup vout display */
         vout_display_info_t info = vd->info;
         info.subpicture_chromas = subpicture_chromas;
-        info.has_hide_mouse = true;
         vd->info = info;
 
         vd->pool    = Pool;
diff --git a/modules/video_output/decklink.cpp 
b/modules/video_output/decklink.cpp
index 2ec4126a54..7992b344c3 100644
--- a/modules/video_output/decklink.cpp
+++ b/modules/video_output/decklink.cpp
@@ -1066,7 +1066,6 @@ static int OpenVideo(vlc_object_t *p_this)
     video_format_Clean( &vd->fmt );
     video_format_Copy( &vd->fmt, &sys->video.currentfmt );
 
-    vd->info.has_hide_mouse = true;
     vd->pool    = PoolVideo;
     vd->prepare = PrepareVideo;
     vd->display = DisplayVideo;
diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 615b2c7663..765e01b1b7 100644
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -300,12 +300,7 @@ static int Open(vlc_object_t *object)
     fmt.i_visible_height = sys->height;
 
     /* */
-    vout_display_info_t info = vd->info;
-    info.has_hide_mouse = true;
-
-    /* */
     vd->fmt     = fmt;
-    vd->info    = info;
     vd->pool    = Pool;
     vd->prepare = NULL;
     vd->display = Display;
diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 2770c44305..9823809a97 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -237,7 +237,6 @@ static int Open (vlc_object_t *this)
         vout_display_info_t info = vd->info;
         info.has_pictures_invalid = false;
         info.subpicture_chromas = subpicture_chromas;
-        info.has_hide_mouse = true;
 
         /* Setup vout_display_t once everything is fine */
         vd->info = info;
diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index 1c57a82880..a046d7c33e 100644
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -208,13 +208,8 @@ static int Open(vlc_object_t *object)
     }
 
     /* */
-    vout_display_info_t info = vd->info;
-    info.has_hide_mouse = true;
-
-    /* */
     vd->sys     = sys;
     vd->fmt     = fmt;
-    vd->info    = info;
     vd->pool    = Pool;
     vd->prepare = Prepare;
     vd->display = Display;
diff --git a/modules/video_output/yuv.c b/modules/video_output/yuv.c
index 888e44d6df..ff2f737430 100644
--- a/modules/video_output/yuv.c
+++ b/modules/video_output/yuv.c
@@ -154,12 +154,7 @@ static int Open(vlc_object_t *object)
     video_format_FixRgb(&fmt);
 
     /* */
-    vout_display_info_t info = vd->info;
-    info.has_hide_mouse = true;
-
-    /* */
     vd->fmt     = fmt;
-    vd->info    = info;
     vd->pool    = Pool;
     vd->prepare = NULL;
     vd->display = Display;
diff --git a/src/video_output/display.c b/src/video_output/display.c
index 67b841c948..8c6753ead0 100644
--- a/src/video_output/display.c
+++ b/src/video_output/display.c
@@ -92,7 +92,7 @@ static vout_display_t *vout_display_New(vlc_object_t *obj,
 
     vd->info.is_slow = false;
     vd->info.has_double_click = false;
-    vd->info.has_hide_mouse = false;
+    vd->info.has_hide_mouse = true;
     vd->info.has_pictures_invalid = false;
     vd->info.subpicture_chromas = NULL;
 

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to