[vlc-commits] macosx: fix white fullscreen when video ended(close #6288)
David Fuhrmann
git at videolan.org
Sun Mar 4 02:19:17 CET 2012
vlc/vlc-2.0 | branch: master | David Fuhrmann <david.fuhrmann at googlemail.com> | Sun Mar 4 02:17:53 2012 +0100| [f4aaab56c3a2148c0d375f19f817d87a8ff0fd1e] | committer: Felix Paul Kühne
macosx: fix white fullscreen when video ended(close #6288)
Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>
(cherry picked from commit be40ef554ab4d76d5ff221567940d0d4d5e3aa65)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=f4aaab56c3a2148c0d375f19f817d87a8ff0fd1e
---
modules/gui/macosx/MainWindow.h | 1 +
modules/gui/macosx/MainWindow.m | 6 +++++-
modules/gui/macosx/intf.m | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/modules/gui/macosx/MainWindow.h b/modules/gui/macosx/MainWindow.h
index 9bc63b2..015d418 100644
--- a/modules/gui/macosx/MainWindow.h
+++ b/modules/gui/macosx/MainWindow.h
@@ -158,6 +158,7 @@
- (void)drawFancyGradientEffectForTimeSlider;
- (id)videoView;
+- (id)setupVideoView;
- (void)setVideoplayEnabled;
- (void)resizeWindow;
- (void)setNativeVideoSize:(NSSize)size;
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 99775aa..2802a30 100644
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -1273,9 +1273,13 @@ static VLCMainWindow *_o_sharedInstance = nil;
#pragma mark -
#pragma mark Video Output handling
-
- (id)videoView
{
+ return o_video_view;
+}
+
+- (id)setupVideoView
+{
vout_thread_t *p_vout = getVout();
if (config_GetInt( VLCIntf, "embedded-video" ))
{
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index f94c77b..f382302 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -1642,7 +1642,7 @@ unsigned int CocoaKeyToVLC( unichar i_key )
- (id)getVideoViewAtPositionX: (int *)pi_x Y: (int *)pi_y withWidth: (unsigned int*)pi_width andHeight: (unsigned int*)pi_height
{
- id videoView = [o_mainwindow videoView];
+ id videoView = [o_mainwindow setupVideoView];
NSRect videoRect = [videoView frame];
int i_x = (int)videoRect.origin.x;
int i_y = (int)videoRect.origin.y;
More information about the vlc-commits
mailing list