Changeset 1169

Timestamp:

02/24/2010 05:43:12 PM (2 years ago)

Author:

gbooker

Message:

Added ability to show initial errors and warnings.

Files:

• branches/PlayerFramework/SapphireFrappliance/FRAppliance/SapphireAppliance.m (modified) (6 diffs)

branches/PlayerFramework/SapphireFrappliance/FRAppliance/SapphireAppliance.m

@@ -30 +30 @@
 #import <SapphireCompatClasses/BackRowUtils.h>
 #ifdef DEBUG
-#define FrameworkLoadDebug
+//#define FrameworkLoadDebug
 #define FrameworkAlwaysCopy
 #endif
@@ -66 +66 @@
 @end
 
+static NSString *initialError = nil;
 
 @implementation SapphireAppliance
+
+BOOL usingCategories = NO;
 
 + (void) initialize
@@ -74 +77 @@
         NSString *frameworkPath = [myBundlePath stringByAppendingPathComponent:@"Contents/Frameworks"];
         SapphireLoadFramework(frameworkPath);
-        loadCMPFramework(myBundlePath);
+        if(!loadCMPFramework(myBundlePath))
+                initialError = BRLocalizedString(@"Error loading common player framework.  Continuing is not recomended", @"Error string for loading common player framework");
+        else if([CMPPlayerManager version] != CMPVersion)
+                initialError = BRLocalizedString(@"Common player framework is newer than expected.  You may wish to check if a newer version of Sapphire is available.  You may attempt to continue if you like.", @"Warning string for common player framework being newer than Sapphire");
         Class cls = NSClassFromString( @"BRFeatureManager" );
         if ( cls == Nil )
@@ -162 +168 @@
 - (id) applianceControllerWithScene: (id) scene
 {
+        if(initialError && !usingCategories)
+        {
+                BRAlertController *controller = [SapphireFrontRowCompat alertOfType:0 titled:@"Error" primaryText:@"Framework Error" secondaryText:initialError withScene:nil];
+                initialError = nil;
+                return controller;
+        }
         // this function is called when your item is selected on the main menu
         @try {
@@ -186 +198 @@
         NSMutableArray *categories = [NSMutableArray array];
         
+        usingCategories = YES;
         if([SapphireApplianceController upgradeNeeded])
         {
@@ -235 +248 @@
 -(id)controllerForIdentifier:(id)ident
 {
+        if(initialError)
+        {
+                BRAlertController *controller = [SapphireFrontRowCompat alertOfType:0 titled:@"Error" primaryText:@"Framework Error" secondaryText:initialError withScene:nil];
+                initialError = nil;
+                return controller;
+        }
         NSString *identifier = (NSString *)ident;
         if([identifier isEqualToString:UPGRADE_IDENTIFIER])