Commit f4aaab56 authored by David Fuhrmann's avatar David Fuhrmann Committed by Felix Paul Kühne

macosx: fix white fullscreen when video ended(close #6288)

Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
(cherry picked from commit be40ef554ab4d76d5ff221567940d0d4d5e3aa65)
parent d0db2161
...@@ -158,6 +158,7 @@ ...@@ -158,6 +158,7 @@
- (void)drawFancyGradientEffectForTimeSlider; - (void)drawFancyGradientEffectForTimeSlider;
- (id)videoView; - (id)videoView;
- (id)setupVideoView;
- (void)setVideoplayEnabled; - (void)setVideoplayEnabled;
- (void)resizeWindow; - (void)resizeWindow;
- (void)setNativeVideoSize:(NSSize)size; - (void)setNativeVideoSize:(NSSize)size;
......
...@@ -1273,8 +1273,12 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -1273,8 +1273,12 @@ static VLCMainWindow *_o_sharedInstance = nil;
#pragma mark - #pragma mark -
#pragma mark Video Output handling #pragma mark Video Output handling
- (id)videoView - (id)videoView
{
return o_video_view;
}
- (id)setupVideoView
{ {
vout_thread_t *p_vout = getVout(); vout_thread_t *p_vout = getVout();
if (config_GetInt( VLCIntf, "embedded-video" )) if (config_GetInt( VLCIntf, "embedded-video" ))
......
...@@ -1642,7 +1642,7 @@ unsigned int CocoaKeyToVLC( unichar i_key ) ...@@ -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)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]; NSRect videoRect = [videoView frame];
int i_x = (int)videoRect.origin.x; int i_x = (int)videoRect.origin.x;
int i_y = (int)videoRect.origin.y; int i_y = (int)videoRect.origin.y;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment