[vlc-devel] commit: Updated vou display module after vout_display_SendEventDisplaySize change. (Laurent Aimar )

git version control git at videolan.org
Sun Sep 27 11:54:25 CEST 2009


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Sep 26 20:40:26 2009 +0200| [03a5ec2b92bb997dabba8061f22bf855eb696843] | committer: Laurent Aimar 

Updated vou display module after vout_display_SendEventDisplaySize change.

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

 modules/video_output/aa.c         |    4 ++--
 modules/video_output/caca.c       |    4 ++--
 modules/video_output/directfb.c   |    2 +-
 modules/video_output/fb.c         |    2 +-
 modules/video_output/sdl.c        |    6 +++---
 modules/video_output/vmem.c       |    2 +-
 modules/video_output/xcb/events.c |    2 +-
 modules/video_output/xcb/x11.c    |    2 +-
 modules/video_output/xcb/xvideo.c |    4 ++--
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/modules/video_output/aa.c b/modules/video_output/aa.c
index 3a4ea39..705b3c4 100644
--- a/modules/video_output/aa.c
+++ b/modules/video_output/aa.c
@@ -126,7 +126,7 @@ static int Open(vlc_object_t *object)
     sys->state = *vd->cfg;
     sys->state.is_fullscreen = false;
     vout_display_SendEventFullscreen(vd, false);
-    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height);
+    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, false);
 
     return VLC_SUCCESS;
 
@@ -284,7 +284,7 @@ static void Manage(vout_display_t *vd)
             aa_resize(sys->aa_context);
             vout_display_SendEventDisplaySize(vd,
                                               aa_imgwidth(sys->aa_context),
-                                              aa_imgheight(sys->aa_context));
+                                              aa_imgheight(sys->aa_context), false);
             break;
 
         /* TODO keys support to complete */
diff --git a/modules/video_output/caca.c b/modules/video_output/caca.c
index abded93..965b14e 100644
--- a/modules/video_output/caca.c
+++ b/modules/video_output/caca.c
@@ -341,7 +341,7 @@ static void Refresh(vout_display_t *vd)
 
     if (width  != vd->cfg->display.width ||
         height != vd->cfg->display.height)
-        vout_display_SendEventDisplaySize(vd, width, height);
+        vout_display_SendEventDisplaySize(vd, width, height, false);
 }
 
 /**
@@ -486,7 +486,7 @@ static void Manage(vout_display_t *vd)
         }
         case CACA_EVENT_RESIZE:
             vout_display_SendEventDisplaySize(vd, caca_get_event_resize_width(&ev),
-                                                  caca_get_event_resize_height(&ev));
+                                                  caca_get_event_resize_height(&ev), false);
             break;
         case CACA_EVENT_MOUSE_MOTION: {
             vout_display_place_t place;
diff --git a/modules/video_output/directfb.c b/modules/video_output/directfb.c
index 47d62da..2378e81 100644
--- a/modules/video_output/directfb.c
+++ b/modules/video_output/directfb.c
@@ -165,7 +165,7 @@ static int Open(vlc_object_t *object)
 
     /* */
     vout_display_SendEventFullscreen(vd, true);
-    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height);
+    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, true);
     return VLC_SUCCESS;
 }
 
diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index b860921..6c4a9ad 100644
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -269,7 +269,7 @@ static int Open(vlc_object_t *object)
 
     /* */
     vout_display_SendEventFullscreen(vd, true);
-    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height);
+    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, true);
     return VLC_SUCCESS;
 }
 
diff --git a/modules/video_output/sdl.c b/modules/video_output/sdl.c
index de79932..203b52b 100644
--- a/modules/video_output/sdl.c
+++ b/modules/video_output/sdl.c
@@ -344,7 +344,7 @@ static int Open(vlc_object_t *object)
     vd->manage  = Manage;
 
     /* */
-    vout_display_SendEventDisplaySize(vd, display_width, display_height);
+    vout_display_SendEventDisplaySize(vd, display_width, display_height, vd->cfg->is_fullscreen);
     return VLC_SUCCESS;
 
 error:
@@ -512,7 +512,7 @@ static int Control(vout_display_t *vd, int query, va_list args)
 
             vout_display_PlacePicture(&sys->place, &vd->source, &cfg, !sys->overlay);
         }
-        vout_display_SendEventDisplaySize(vd, cfg.display.width, cfg.display.height);
+        vout_display_SendEventDisplaySize(vd, cfg.display.width, cfg.display.height, cfg.is_fullscreen);
         return VLC_SUCCESS;
     }
     case VOUT_DISPLAY_CHANGE_ZOOM:
@@ -652,7 +652,7 @@ static void Manage(vout_display_t *vd)
         }
 
         case SDL_VIDEORESIZE:
-            vout_display_SendEventDisplaySize(vd, event.resize.w, event.resize.h);
+            vout_display_SendEventDisplaySize(vd, event.resize.w, event.resize.h, vd->cfg->is_fullscreen);
             break;
 
         default:
diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index 19e0778..5f9cbe0 100644
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -236,7 +236,7 @@ static int Open(vlc_object_t *object)
 
     /* */
     vout_display_SendEventFullscreen(vd, false);
-    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height);
+    vout_display_SendEventDisplaySize(vd, fmt.i_width, fmt.i_height, false);
     return VLC_SUCCESS;
 }
 
diff --git a/modules/video_output/xcb/events.c b/modules/video_output/xcb/events.c
index 7b79da9..af3b202 100644
--- a/modules/video_output/xcb/events.c
+++ b/modules/video_output/xcb/events.c
@@ -79,7 +79,7 @@ HandleParentStructure (vout_display_t *vd, xcb_configure_notify_event_t *ev)
 {
     if (ev->width  != vd->cfg->display.width ||
         ev->height != vd->cfg->display.height)
-        vout_display_SendEventDisplaySize (vd, ev->width, ev->height);
+        vout_display_SendEventDisplaySize (vd, ev->width, ev->height, vd->cfg->is_fullscreen);
 }
 
 /**
diff --git a/modules/video_output/xcb/x11.c b/modules/video_output/xcb/x11.c
index 5f71300..3f61d66 100644
--- a/modules/video_output/xcb/x11.c
+++ b/modules/video_output/xcb/x11.c
@@ -292,8 +292,8 @@ static int Open (vlc_object_t *obj)
     vd->manage = Manage;
 
     /* */
-    vout_display_SendEventDisplaySize (vd, width, height);
     vout_display_SendEventFullscreen (vd, false);
+    vout_display_SendEventDisplaySize (vd, width, height, false);
 
     return VLC_SUCCESS;
 
diff --git a/modules/video_output/xcb/xvideo.c b/modules/video_output/xcb/xvideo.c
index 6069d0d..a418d57 100644
--- a/modules/video_output/xcb/xvideo.c
+++ b/modules/video_output/xcb/xvideo.c
@@ -492,10 +492,10 @@ static int Open (vlc_object_t *obj)
     vd->manage = Manage;
 
     /* */
+    vout_display_SendEventFullscreen (vd, false);
     unsigned width, height;
     if (!GetWindowSize (p_sys->embed, conn, &width, &height))
-        vout_display_SendEventDisplaySize (vd, width, height);
-    vout_display_SendEventFullscreen (vd, false);
+        vout_display_SendEventDisplaySize (vd, width, height, false);
 
     return VLC_SUCCESS;
 




More information about the vlc-devel mailing list