[vlc-commits] macosx vout: fix behaviour when macosx-video-autoresize is false

[David Fuhrmann]

vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Mon Apr 16 10:24:36 2012 +0200| [654d89e8cadb207d409c1866a889729b1a818f82] | committer: Felix Paul Kühne

macosx vout: fix behaviour when macosx-video-autoresize is false

Should be now the same as it would be in fullscreen.
(cherry picked from commit 0d6fe822a85332701ab5052e5a460fd37b5ee9cd)

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

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

 modules/video_output/macosx.m |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 13bb2d0..13cbc9b 100644
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -395,6 +395,13 @@ static int Control (vout_display_t *vd, int query, va_list ap)
             if (cfg_tmp.display.height < windowMinSize.height)
                 cfg_tmp.display.height = windowMinSize.height;
 
+            NSRect bounds = [sys->glView bounds];
+            if (!config_GetInt(vd, "macosx-video-autoresize"))
+            {
+                cfg_tmp.display.width = bounds.size.width;
+                cfg_tmp.display.height = bounds.size.height;
+            }
+
             vout_display_PlacePicture (&place, source, &cfg_tmp, false);
 
                 vd->fmt.i_width  = vd->source.i_width  * place.width  / vd->source.i_visible_width;