aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMemphiz <memphis@machzwo.de>2011-07-04 20:22:08 +0200
committerMemphiz <memphis@machzwo.de>2011-07-04 20:22:08 +0200
commitf5d76dfbc2612d4de65b9a6a8469218cd3611df9 (patch)
treedfa308d26fa2e6200b7a68ad86d37b57d957c5a8
parentb36d070bcfcbe612e6771c65518c434ce87b0984 (diff)
[add] - added flag to XBMCEAGLView.mm indicating if we are up and running (needed for the gesturecontroller to know when usage of g_application is save)
-rw-r--r--xbmc/osx/ios/XBMCEAGLView.h2
-rw-r--r--xbmc/osx/ios/XBMCEAGLView.mm3
2 files changed, 5 insertions, 0 deletions
diff --git a/xbmc/osx/ios/XBMCEAGLView.h b/xbmc/osx/ios/XBMCEAGLView.h
index 84768d2d9a..51368bbbd9 100644
--- a/xbmc/osx/ios/XBMCEAGLView.h
+++ b/xbmc/osx/ios/XBMCEAGLView.h
@@ -41,6 +41,7 @@
GLfloat rotz;
BOOL animating;
+ BOOL xbmcAlive;
BOOL pause;
NSConditionLock* animationThreadLock;
NSThread* animationThread;
@@ -52,6 +53,7 @@
BOOL displayLinkSupported;
}
@property (readonly, nonatomic, getter=isAnimating) BOOL animating;
+@property (readonly, nonatomic, getter=isXBMCAlive) BOOL xbmcAlive;
@property (readonly, nonatomic, getter=isPause) BOOL pause;
- (void) initDisplayLink;
diff --git a/xbmc/osx/ios/XBMCEAGLView.mm b/xbmc/osx/ios/XBMCEAGLView.mm
index 11a555d7bd..aed5173894 100644
--- a/xbmc/osx/ios/XBMCEAGLView.mm
+++ b/xbmc/osx/ios/XBMCEAGLView.mm
@@ -54,6 +54,7 @@
@implementation XBMCEAGLView
@synthesize animating;
+@synthesize xbmcAlive;
@synthesize pause;
// You must implement this method
@@ -90,6 +91,7 @@
[aContext release];
animating = FALSE;
+ xbmcAlive = FALSE;
pause = FALSE;
[self setContext:context];
[self createFramebuffer];
@@ -310,6 +312,7 @@
g_application.Preflight();
if (g_application.Create())
{
+ xbmcAlive = TRUE;
try
{
CCocoaAutoPool innerpool;