Changeset 1145

Timestamp:

02/18/2010 06:59:37 PM (2 years ago)

Author:

gbooker

Message:

With framework loading code in place, now use it instead.

Location:

branches/PlayerFramework/SapphireFrappliance

Files:

• Browser/SapphireBrowser.m (modified) (1 diff)
• FRAppliance/SapphireAppliance.m (modified) (2 diffs)

branches/PlayerFramework/SapphireFrappliance/Browser/SapphireBrowser.m

@@ -60 +60 @@
 
 @implementation SapphireBrowser
-
-+ (void)initialize
-{
-        NSString *myBundlePath = [[NSBundle bundleForClass:[self class]] bundlePath];
-        NSString *frameworkPath = [myBundlePath stringByAppendingPathComponent:@"Contents/Frameworks/CommonMediaPlayer.framework"];
-        [[NSBundle bundleWithPath:frameworkPath] load];
-}
 
 - (id) initWithScene: (BRRenderScene *) scene metaData:(id <SapphireDirectory>)meta

branches/PlayerFramework/SapphireFrappliance/FRAppliance/SapphireAppliance.m

@@ -29 +29 @@
 
 #import <SapphireCompatClasses/BackRowUtils.h>
+#define FrameworkLoadDebug
+#import <CommonMediaPlayer/CMPPlayerManager.h>
 
 #define TV_SHOW_IDENTIFIER      @"tv-shows"
@@ -69 +71 @@
         NSString *frameworkPath = [myBundlePath stringByAppendingPathComponent:@"Contents/Frameworks"];
         SapphireLoadFramework(frameworkPath);
+        loadCMPFramework(myBundlePath);
         Class cls = NSClassFromString( @"BRFeatureManager" );
         if ( cls == Nil )