From 118d4d39f0de87ccf0f98387c75b9496fec4eafb Mon Sep 17 00:00:00 2001
From: David Partouche <david@manateedev.com>
Date: Tue, 5 Aug 2014 16:07:28 +0200
Subject: [PATCH] Fixed the video player not showing on iOS if it's not in
 FullScreen mode

---
 cocos/ui/UIVideoPlayerIOS.mm | 54 ++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/cocos/ui/UIVideoPlayerIOS.mm b/cocos/ui/UIVideoPlayerIOS.mm
index 16b40d89c9..b08fd3ffdb 100644
--- a/cocos/ui/UIVideoPlayerIOS.mm
+++ b/cocos/ui/UIVideoPlayerIOS.mm
@@ -64,7 +64,7 @@ using namespace cocos2d::experimental::ui;
     int _width;
     int _height;
     bool _keepRatioEnabled;
-    
+
     VideoPlayer* _videoPlayer;
 }
 
@@ -75,7 +75,7 @@ using namespace cocos2d::experimental::ui;
         _videoPlayer = (VideoPlayer*)videoPlayer;
         _keepRatioEnabled = false;
     }
-    
+
     return self;
 }
 
@@ -84,7 +84,7 @@ using namespace cocos2d::experimental::ui;
     if (self.moviePlayer != nullptr) {
         [[NSNotificationCenter defaultCenter] removeObserver:self name:MPMoviePlayerPlaybackDidFinishNotification object:self.moviePlayer];
         [[NSNotificationCenter defaultCenter] removeObserver:self name:MPMoviePlayerPlaybackStateDidChangeNotification object:self.moviePlayer];
-        
+
         [self.moviePlayer stop];
         [self.moviePlayer.view removeFromSuperview];
         self.moviePlayer = nullptr;
@@ -116,7 +116,7 @@ using namespace cocos2d::experimental::ui;
     if (self.moviePlayer != nullptr) {
         return [self.moviePlayer isFullscreen];
     }
-    
+
     return false;
 }
 
@@ -125,12 +125,12 @@ using namespace cocos2d::experimental::ui;
     if (self.moviePlayer != nullptr) {
         [[NSNotificationCenter defaultCenter] removeObserver:self name:MPMoviePlayerPlaybackDidFinishNotification object:self.moviePlayer];
         [[NSNotificationCenter defaultCenter] removeObserver:self name:MPMoviePlayerPlaybackStateDidChangeNotification object:self.moviePlayer];
-        
+
         [self.moviePlayer stop];
         [self.moviePlayer.view removeFromSuperview];
         self.moviePlayer = nullptr;
     }
-    
+
     if (videoSource == 1) {
         self.moviePlayer = [[[MPMoviePlayerController alloc] initWithContentURL:[NSURL URLWithString:@(videoUrl.c_str())]] autorelease];
         self.moviePlayer.movieSourceType = MPMovieSourceTypeStreaming;
@@ -142,24 +142,24 @@ using namespace cocos2d::experimental::ui;
     self.moviePlayer.allowsAirPlay = false;
     self.moviePlayer.controlStyle = MPMovieControlStyleEmbedded;
     self.moviePlayer.view.userInteractionEnabled = true;
-    
+
     auto clearColor = [UIColor clearColor];
     self.moviePlayer.backgroundView.backgroundColor = clearColor;
     self.moviePlayer.view.backgroundColor = clearColor;
     for (UIView * subView in self.moviePlayer.view.subviews) {
         subView.backgroundColor = clearColor;
     }
-    
+
     if (_keepRatioEnabled) {
         self.moviePlayer.scalingMode = MPMovieScalingModeAspectFit;
     } else {
         self.moviePlayer.scalingMode = MPMovieScalingModeFill;
     }
-    
+
     auto view = cocos2d::Director::getInstance()->getOpenGLView();
     auto eaglview = (CCEAGLView *) view->getEAGLView();
     [eaglview addSubview:self.moviePlayer.view];
-    
+
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(videoFinished:) name:MPMoviePlayerPlaybackDidFinishNotification object:self.moviePlayer];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(playStateChange) name:MPMoviePlayerPlaybackStateDidChangeNotification object:self.moviePlayer];
 }
@@ -209,7 +209,7 @@ using namespace cocos2d::experimental::ui;
 -(void) setVisible:(bool)visible
 {
     if (self.moviePlayer != NULL) {
-        [self.moviePlayer.view setHidden:visible];
+        [self.moviePlayer.view setHidden:!visible];
     }
 }
 
@@ -264,17 +264,17 @@ using namespace cocos2d::experimental::ui;
     {
         return relPath;
     }
-    
+
     NSMutableArray *imagePathComponents = [NSMutableArray arrayWithArray:[relPath pathComponents]];
     NSString *file = [imagePathComponents lastObject];
-    
+
     [imagePathComponents removeLastObject];
     NSString *imageDirectory = [NSString pathWithComponents:imagePathComponents];
-    
+
     NSString *fullpath = [[NSBundle mainBundle] pathForResource:file ofType:nil inDirectory:imageDirectory];
     if (fullpath == nil)
         fullpath = relPath;
-    
+
     return fullpath;
 }
 @end
@@ -316,27 +316,27 @@ void VideoPlayer::setURL(const std::string& videoUrl)
 void VideoPlayer::draw(Renderer* renderer, const Mat4 &transform, uint32_t flags)
 {
     cocos2d::ui::Widget::draw(renderer,transform,flags);
-    
+
     if (flags & FLAGS_TRANSFORM_DIRTY)
     {
         auto directorInstance = Director::getInstance();
         auto glView = directorInstance->getOpenGLView();
         auto frameSize = glView->getFrameSize();
         auto scaleFactor = [static_cast<CCEAGLView *>(glView->getEAGLView()) contentScaleFactor];
-        
+
         auto winSize = directorInstance->getWinSize();
-        
+
         auto leftBottom = convertToWorldSpace(Vec2::ZERO);
         auto rightTop = convertToWorldSpace(Vec2(_contentSize.width,_contentSize.height));
-        
+
         auto uiLeft = (frameSize.width / 2 + (leftBottom.x - winSize.width / 2 ) * glView->getScaleX()) / scaleFactor;
         auto uiTop = (frameSize.height /2 - (rightTop.y - winSize.height / 2) * glView->getScaleY()) / scaleFactor;
-        
+
         [((UIVideoViewWrapperIos*)_videoView) setFrame :uiLeft :uiTop
                                                           :(rightTop.x - leftBottom.x) * glView->getScaleX() / scaleFactor
                                                           :( (rightTop.y - leftBottom.y) * glView->getScaleY()/scaleFactor)];
     }
-    
+
 #if CC_VIDEOPLAYER_DEBUG_DRAW
     _customDebugDrawCommand.init(_globalZOrder);
     _customDebugDrawCommand.func = CC_CALLBACK_0(VideoPlayer::drawDebugData, this);
@@ -371,9 +371,9 @@ void VideoPlayer::drawDebugData()
 
     director->pushMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
     director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW, _modelViewTransform);
-    
+
     auto size = getContentSize();
-    
+
     Point vertices[4]=
     {
         Point::ZERO,
@@ -381,9 +381,9 @@ void VideoPlayer::drawDebugData()
         Point(size.width, size.height),
         Point(0, size.height)
     };
-    
+
     DrawPrimitives::drawPoly(vertices, 4, true);
-    
+
     director->popMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_MODELVIEW);
 }
 #endif
@@ -436,7 +436,7 @@ bool VideoPlayer::isPlaying() const
 void VideoPlayer::setVisible(bool visible)
 {
     cocos2d::ui::Widget::setVisible(visible);
-    
+
     if (! _videoURL.empty())
     {
         [((UIVideoViewWrapperIos*)_videoView) setVisible:visible];
@@ -455,7 +455,7 @@ void VideoPlayer::onPlayEvent(int event)
     } else {
         _isPlaying = false;
     }
-    
+
     if (_eventCallback)
     {
         _eventCallback(this, (VideoPlayer::EventType)event);