Merge pull request #9858 from Memphiz/mrmc_backports

Mrmc backports
xbmc · Jun 3, 2016 · 7ffbade · 7ffbade
2 parents d77bc24 + c51bc8e
commit 7ffbade
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 14 deletions.
diff --git a/xbmc/network/TCPServer.cpp b/xbmc/network/TCPServer.cpp
@@ -67,7 +67,20 @@ bool CTCPServer::StartServer(int port, bool nonlocal)
   ServerInstance = new CTCPServer(port, nonlocal);
   if (ServerInstance->Initialize())
   {
-    ServerInstance->Create();
+    size_t thread_stacksize = 0;
+#if defined(TARGET_DARWIN_TVOS)
+    void *stack_addr;
+    pthread_attr_t attr;
+    pthread_attr_init(&attr);
+    pthread_attr_getstack(&attr, &stack_addr, &thread_stacksize);
+    pthread_attr_destroy(&attr);
+    // double the stack size under tvos, not sure why yet
+    // but it stoped crashing using Kodi json -> play video.
+    // non-tvos will pass a value of zero which means 'system default'
+    thread_stacksize *= 2;
+  CLog::Log(LOGDEBUG, "CTCPServer: increasing thread stack to %zu", thread_stacksize);
+#endif
+    ServerInstance->Create(false, thread_stacksize);
     return true;
   }
   else

diff --git a/xbmc/platform/darwin/ios/Info.plist.in b/xbmc/platform/darwin/ios/Info.plist.in
@@ -51,11 +51,6 @@
 	<array>
 		<string>iPhoneOS</string>
 	</array>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
 	<key>BuildMachineOSBuild</key>
 	<string>15E65</string>
 	<key>DTPlatformBuild</key>
@@ -152,5 +147,23 @@
 	<string>iphoneos</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
+	<key>UIRequiresFullScreen</key>
+	<true/>
+	<key>UIRequiresPersistentWiFi</key>
+	<string>YES</string>
+	<key>UIStatusBarHidden</key>
+	<true/>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
 </dict>
 </plist>
diff --git a/xbmc/platform/darwin/ios/XBMCController.mm b/xbmc/platform/darwin/ios/XBMCController.mm
@@ -360,7 +360,7 @@ - (void) deactivateKeyboard:(UIView *)view
 //--------------------------------------------------------------
 -(void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
 {
-  if( [m_glView isXBMCAlive] )//NO GESTURES BEFORE WE ARE UP AND RUNNING
+  if( m_glView && [m_glView isXBMCAlive] )//NO GESTURES BEFORE WE ARE UP AND RUNNING
   {
     UITouch *touch = (UITouch *)[[touches allObjects] objectAtIndex:0];
     CGPoint point = [touch locationInView:m_glView];
@@ -372,7 +372,7 @@ -(void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
 //--------------------------------------------------------------
 -(void)handlePinch:(UIPinchGestureRecognizer*)sender
 {
-  if( [m_glView isXBMCAlive] )//NO GESTURES BEFORE WE ARE UP AND RUNNING
+  if( m_glView && [m_glView isXBMCAlive] && sender.numberOfTouches )//NO GESTURES BEFORE WE ARE UP AND RUNNING
   {
     CGPoint point = [sender locationOfTouch:0 inView:m_glView];  
     point.x *= screenScale;
@@ -398,7 +398,7 @@ -(void)handlePinch:(UIPinchGestureRecognizer*)sender
 //--------------------------------------------------------------
 -(void)handleRotate:(UIRotationGestureRecognizer*)sender
 {
-  if( [m_glView isXBMCAlive] )//NO GESTURES BEFORE WE ARE UP AND RUNNING
+  if( m_glView && [m_glView isXBMCAlive] && sender.numberOfTouches )//NO GESTURES BEFORE WE ARE UP AND RUNNING
   {
     CGPoint point = [sender locationOfTouch:0 inView:m_glView];
     point.x *= screenScale;
@@ -423,11 +423,11 @@ -(void)handleRotate:(UIRotationGestureRecognizer*)sender
 //--------------------------------------------------------------
 - (IBAction)handlePan:(UIPanGestureRecognizer *)sender 
 {
-  if( [m_glView isXBMCAlive] )//NO GESTURES BEFORE WE ARE UP AND RUNNING
+  if( m_glView && [m_glView isXBMCAlive] )//NO GESTURES BEFORE WE ARE UP AND RUNNING
   { 
     CGPoint velocity = [sender velocityInView:m_glView];
 
-    if( [sender state] == UIGestureRecognizerStateBegan )
+    if( [sender state] == UIGestureRecognizerStateBegan && sender.numberOfTouches )
     {
       CGPoint point = [sender locationOfTouch:0 inView:m_glView];
       point.x *= screenScale;
@@ -436,7 +436,7 @@ - (IBAction)handlePan:(UIPanGestureRecognizer *)sender
       lastGesturePoint = point;
     }
 
-    if( [sender state] == UIGestureRecognizerStateChanged )
+    if( [sender state] == UIGestureRecognizerStateChanged && sender.numberOfTouches )
     {
       CGPoint point = [sender locationOfTouch:0 inView:m_glView];
       point.x *= screenScale;
@@ -484,7 +484,7 @@ - (IBAction)handlePan:(UIPanGestureRecognizer *)sender
 //--------------------------------------------------------------
 - (IBAction)handleSwipe:(UISwipeGestureRecognizer *)sender
 {
-  if( [m_glView isXBMCAlive] )//NO GESTURES BEFORE WE ARE UP AND RUNNING
+  if( m_glView && [m_glView isXBMCAlive] && sender.numberOfTouches )//NO GESTURES BEFORE WE ARE UP AND RUNNING
   {
 
 
@@ -534,7 +534,7 @@ - (IBAction)handleTap:(UIGestureRecognizer *)sender
 //--------------------------------------------------------------
 - (IBAction)handleSingleFingerSingleLongTap:(UIGestureRecognizer *)sender
 {
-  if( [m_glView isXBMCAlive] )//NO GESTURES BEFORE WE ARE UP AND RUNNING
+  if( m_glView && [m_glView isXBMCAlive] && sender.numberOfTouches)//NO GESTURES BEFORE WE ARE UP AND RUNNING
   {
     CGPoint point = [sender locationOfTouch:0 inView:m_glView];
     point.x *= screenScale;
@@ -567,6 +567,8 @@ - (id)initWithFrame:(CGRect)frame withScreen:(UIScreen *)screen
   if ( !self )
     return ( nil );
 
+  m_glView = NULL;
+
   m_isPlayingBeforeInactive = NO;
   m_bgTask = UIBackgroundTaskInvalid;
   m_playbackState = IOS_PLAYBACK_STOPPED;