Changeset 1144 for branches

Timestamp:

02/18/10 18:59:01 (2 years ago)

Author:

gbooker

Message:

Added framework loader (and copying) code

Location:

branches/PlayerFramework/CommonMediaPlayer

Files:

• Classes/CMPDefines.h (added)
• Classes/CMPPlayerManager.h (modified) (1 diff)
• Classes/CMPTypesDefines.h (modified) (1 diff)
• CommonMediaPlayer.xcodeproj/project.pbxproj (modified) (6 diffs)
• Info.plist (modified) (1 diff)

branches/PlayerFramework/CommonMediaPlayer/Classes/CMPPlayerManager.h

@@ -40 +40 @@
 
 @end
+
+#ifdef FrameworkLoadDebug
+#define FrameworkLoadPrint(...) NSLog(__VA_ARGS__)
+#else
+#define FrameworkLoadPrint(...)
+#endif
+
+static inline BOOL needCopy(NSString *frameworkPath)
+{
+        NSFileManager *fm = [NSFileManager defaultManager];
+        BOOL isDir = NO;
+        FrameworkLoadPrint(@"Checking if dir exists");
+        if(![fm fileExistsAtPath:frameworkPath isDirectory:&isDir] || !isDir)
+                return YES;
+        
+        NSBundle *bundle = [NSBundle bundleWithPath:frameworkPath];
+        NSString *plistPath = [bundle pathForResource:@"Info" ofType:@"plist"];
+        NSDictionary *plist = [NSDictionary dictionaryWithContentsOfFile:plistPath];
+        
+        NSString *version = [plist objectForKey:@"CFBundleVersion"];
+        FrameworkLoadPrint(@"Version is %@:%d compared to %d", version, [version intValue], CMPVersion);
+        if([version intValue] < CMPVersion)
+                return YES;
+        
+        return NO;
+}
+
+static inline BOOL loadCMPFramework(NSString *frapPath)
+{
+        NSString *frameworkPath = [NSHomeDirectory() stringByAppendingPathComponent:@"Library/Frameworks/CommonMediaPlayer.framework"];
+        FrameworkLoadPrint(@"Path is at %@", frameworkPath);
+        BOOL neededCopy = needCopy(frameworkPath);
+        FrameworkLoadPrint(@"Need copy is %d", neededCopy);
+        if(neededCopy)
+        {
+                NSFileManager *fm = [NSFileManager defaultManager];
+                FrameworkLoadPrint(@"Going to copy %@", [frapPath stringByAppendingPathComponent:@"Contents/Frameworks/CommonMediaPlayer.framework"]);
+                BOOL success = [fm removeFileAtPath:frameworkPath handler:nil];
+                FrameworkLoadPrint(@"Delete success is %d", success);
+                success = [fm copyPath:[frapPath stringByAppendingPathComponent:@"Contents/Frameworks/CommonMediaPlayer.framework"] toPath:frameworkPath handler:nil];
+                FrameworkLoadPrint(@"Copy success is %d", success);
+                if(!success || needCopy(frameworkPath))
+                        //We failed in our copy too!
+                        return NO;
+        }
+        
+        NSBundle *framework = [NSBundle bundleWithPath:frameworkPath];
+        FrameworkLoadPrint(@"Bundle is %@", framework);
+        if([framework isLoaded] && neededCopy)
+        {
+                //We should restart here
+                FrameworkLoadPrint(@"Need to restart");
+                [[NSApplication sharedApplication] terminate:nil];
+        }
+        
+        FrameworkLoadPrint(@"Loading framework");
+        return [framework load];
+}

branches/PlayerFramework/CommonMediaPlayer/Classes/CMPTypesDefines.h

@@ -20 +20 @@
  */
 
+#import "CMPDefines.h"
+
 typedef enum{
         CMPPlayerManagerFileTypeQTCompatibleVideo = 0,

branches/PlayerFramework/CommonMediaPlayer/CommonMediaPlayer.xcodeproj/project.pbxproj

@@ -50 +50 @@
                 F595C652111A70CD00C6C322 /* CMPBaseMediaAsset.h in Headers */ = {isa = PBXBuildFile; fileRef = F595C650111A70CD00C6C322 /* CMPBaseMediaAsset.h */; };
                 F595C653111A70CD00C6C322 /* CMPBaseMediaAsset.m in Sources */ = {isa = PBXBuildFile; fileRef = F595C651111A70CD00C6C322 /* CMPBaseMediaAsset.m */; };
+                F5FE4F18112E11D1007EC309 /* CMPDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = F5FE4F17112E11D1007EC309 /* CMPDefines.h */; settings = {ATTRIBUTES = (Public, ); }; };
 /* End PBXBuildFile section */
 
@@ -110 +111 @@
                 F595C650111A70CD00C6C322 /* CMPBaseMediaAsset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMPBaseMediaAsset.h; sourceTree = "<group>"; };
                 F595C651111A70CD00C6C322 /* CMPBaseMediaAsset.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMPBaseMediaAsset.m; sourceTree = "<group>"; };
+                F5FE4F17112E11D1007EC309 /* CMPDefines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMPDefines.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -192 +194 @@
                                 F595C650111A70CD00C6C322 /* CMPBaseMediaAsset.h */,
                                 F595C651111A70CD00C6C322 /* CMPBaseMediaAsset.m */,
+                                F5FE4F17112E11D1007EC309 /* CMPDefines.h */,
                         );
                         path = Classes;
@@ -319 +322 @@
                                 8768EBDC112A563800318F1A /* CMPDVDImporter.h in Headers */,
                                 8768EC49112A5E4200318F1A /* AGProcess.h in Headers */,
+                                F5FE4F18112E11D1007EC309 /* CMPDefines.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -465 +469 @@
                                 GCC_PREFIX_HEADER = "General Headers/CommonMediaPlayer_Prefix.pch";
                                 INFOPLIST_FILE = Info.plist;
+                                INFOPLIST_PREFIX_HEADER = Classes/CMPDefines.h;
+                                INFOPLIST_PREPROCESS = YES;
                                 INSTALL_PATH = /System/Library/CoreServices/Finder.app/Contents/PlugIns/nitoTV.frappliance/Contents/Frameworks;
                                 OTHER_LDFLAGS = (
@@ -492 +498 @@
                                 GCC_PREFIX_HEADER = "General Headers/CommonMediaPlayer_Prefix.pch";
                                 INFOPLIST_FILE = Info.plist;
+                                INFOPLIST_PREFIX_HEADER = Classes/CMPDefines.h;
+                                INFOPLIST_PREPROCESS = YES;
                                 INSTALL_PATH = /System/Library/CoreServices/Finder.app/Contents/PlugIns/nitoTV.frappliance/Contents/Frameworks/;
                                 OTHER_LDFLAGS = (

branches/PlayerFramework/CommonMediaPlayer/Info.plist

@@ -7 +7 @@
         <key>CFBundleExecutable</key>
         <string>${EXECUTABLE_NAME}</string>
-        <key>CFBundleName</key>
-        <string>${PRODUCT_NAME}</string>
         <key>CFBundleIconFile</key>
         <string></string>
         <key>CFBundleIdentifier</key>
-        <string>com.yourcompany.${PRODUCT_NAME:rfc1034Identifier}</string>
+        <string>net.nanopi.appletv.CommonMediaPlayer</string>
         <key>CFBundleInfoDictionaryVersion</key>
         <string>6.0</string>
+        <key>CFBundleName</key>
+        <string>${PRODUCT_NAME}</string>
         <key>CFBundlePackageType</key>
         <string>FMWK</string>
+        <key>CFBundleShortVersionString</key>
+        <string>1.0</string>
         <key>CFBundleSignature</key>
         <string>????</string>
         <key>CFBundleVersion</key>
-        <string>1</string>
-        <key>CFBundleShortVersionString</key>
-        <string>1.0</string>
+        <string>CMPVersion</string>
         <key>NSPrincipalClass</key>
         <string></string>