Changeset 1184

Timestamp:

02/26/2010 04:22:15 AM (2 years ago)

Author:

lechium

Message:

Added some classes for downloading and updating the framework, they currently don't work since i can't create a BRController without headers passed 2.x

Location:

trunk/CommonMediaPlayer

Files:

• Classes/CMPDefines.h (modified) (1 diff)
• Classes/CMPPlayerController.h (modified) (3 diffs)
• Classes/CMPPlayerManager.h (modified) (2 diffs)
• Classes/CMPPlayerManager.m (modified) (3 diffs)
• CommonMediaPlayer.xcodeproj/project.pbxproj (modified) (6 diffs)
• Update Classes (added)
• Update Classes/CMPDownloadController.h (added)
• Update Classes/CMPDownloadController.m (added)
• Update Classes/CMPInstaller.h (added)
• Update Classes/CMPInstaller.m (added)
• Update Classes/CMPProgressBarControl.h (added)
• Update Classes/CMPProgressBarControl.m (added)
• bin/unzip (added)

trunk/CommonMediaPlayer/Classes/CMPDefines.h

@@ -22 +22 @@
 //Note, only defines should ever be in this file!
 
-#define CMPVersion 2  //0x0000 0001
+#define CMPVersion 3  //0x0000 0001

trunk/CommonMediaPlayer/Classes/CMPPlayerController.h

@@ -22 +22 @@
 #import "CMPTypesDefines.h"
 
+@protocol CMPInstaller;
+
+@protocol CMPInstallerDelegate <NSObject>
+
+- (void)installer:(id <CMPInstaller>)installer didEndWithSettings:(NSDictionary *)settings;
+
+
+@end
+
+
 @protocol CMPPlayer, CMPPlayerController;
 
@@ -31 +41 @@
 @protocol CMPPlayerControllerDelegate <NSObject>
 
-- (void)controller:(id <CMPPlayerController>)controller didEndWithSettings:(NSDictionary *)settings;
+- (void)controller:(id <CMPPlayerController>)controlle:(NSDictionary *)settings;
 /*!
  * Information about the controller; currently no info is defined
@@ -62 +72 @@
 @end
 
+
+
+
 #define CMPPlayerAudioSampleRateKey @"sample rate"
 #define CMPPlayerAudioFormatKey @"audio format"

trunk/CommonMediaPlayer/Classes/CMPPlayerManager.h

@@ -151 +151 @@
         return success;
 }
+
+
 
 static inline BOOL loadCMPFramework(NSString *frapPath)
@@ -219 +221 @@
                         return NO;
         }
+
+        
         
         NSBundle *framework = [NSBundle bundleWithPath:frameworkPath];

trunk/CommonMediaPlayer/Classes/CMPPlayerManager.m

@@ -28 +28 @@
 #import "CMPISODVDPlayer.h"
 #import "CMPDVDImporter.h"
+#import "CMPInstaller.h"
 
 @implementation CMPPlayerManager
@@ -50 +51 @@
         if (self == nil)
                 return self;
-        
+        /*
+        
+         This was some testing code to get it to check for updates and to override showing the players to try and force a download and
+         install, this didn't work out because my download class basis has the superclass of BRController, and since we link to headers
+         that are older than dirt, BRController doesn't exist, and every single workaround i pushed towards miserably failed.
+         
+        if ([CMPInstaller checkForUpdate])
+        {
+                return nil;
+        }
+         
+        */
         knownPlayers = [[NSMutableSet alloc] init];
         knownControllers = [[NSMutableSet alloc] init];
@@ -64 +76 @@
         
         [self registerPlayer:[CMPDVDImporter class] forType:CMPPlayerManagerFileTypeDVDImport withExtensions:[NSArray arrayWithObject:@""]];
+        
         
         return self;

trunk/CommonMediaPlayer/CommonMediaPlayer.xcodeproj/project.pbxproj

@@ -8 +8 @@
 
 /* Begin PBXBuildFile section */
+                870D75E81137AB8B007BD611 /* CMPDownloadController.h in Headers */ = {isa = PBXBuildFile; fileRef = 870D75E21137AB8B007BD611 /* CMPDownloadController.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                870D75E91137AB8B007BD611 /* CMPDownloadController.m in Sources */ = {isa = PBXBuildFile; fileRef = 870D75E31137AB8B007BD611 /* CMPDownloadController.m */; };
+                870D75EA1137AB8B007BD611 /* CMPInstaller.h in Headers */ = {isa = PBXBuildFile; fileRef = 870D75E41137AB8B007BD611 /* CMPInstaller.h */; settings = {ATTRIBUTES = (Public, ); }; };
+                870D75EB1137AB8B007BD611 /* CMPInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 870D75E51137AB8B007BD611 /* CMPInstaller.m */; };
+                870D75EC1137AB8B007BD611 /* CMPProgressBarControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 870D75E61137AB8B007BD611 /* CMPProgressBarControl.h */; };
+                870D75ED1137AB8B007BD611 /* CMPProgressBarControl.m in Sources */ = {isa = PBXBuildFile; fileRef = 870D75E71137AB8B007BD611 /* CMPProgressBarControl.m */; };
                 8768EBDC112A563800318F1A /* CMPDVDImporter.h in Headers */ = {isa = PBXBuildFile; fileRef = 8768EBDA112A563800318F1A /* CMPDVDImporter.h */; };
                 8768EBDD112A563800318F1A /* CMPDVDImporter.m in Sources */ = {isa = PBXBuildFile; fileRef = 8768EBDB112A563800318F1A /* CMPDVDImporter.m */; };
@@ -69 +75 @@
                 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
                 32DBCF5E0370ADEE00C91783 /* CommonMediaPlayer_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CommonMediaPlayer_Prefix.pch; sourceTree = "<group>"; };
+                870D75E21137AB8B007BD611 /* CMPDownloadController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CMPDownloadController.h; path = "Update Classes/CMPDownloadController.h"; sourceTree = "<group>"; };
+                870D75E31137AB8B007BD611 /* CMPDownloadController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CMPDownloadController.m; path = "Update Classes/CMPDownloadController.m"; sourceTree = "<group>"; };
+                870D75E41137AB8B007BD611 /* CMPInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CMPInstaller.h; path = "Update Classes/CMPInstaller.h"; sourceTree = "<group>"; };
+                870D75E51137AB8B007BD611 /* CMPInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CMPInstaller.m; path = "Update Classes/CMPInstaller.m"; sourceTree = "<group>"; };
+                870D75E61137AB8B007BD611 /* CMPProgressBarControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CMPProgressBarControl.h; path = "Update Classes/CMPProgressBarControl.h"; sourceTree = "<group>"; };
+                870D75E71137AB8B007BD611 /* CMPProgressBarControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CMPProgressBarControl.m; path = "Update Classes/CMPProgressBarControl.m"; sourceTree = "<group>"; };
                 8768EBDA112A563800318F1A /* CMPDVDImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CMPDVDImporter.h; sourceTree = "<group>"; };
                 8768EBDB112A563800318F1A /* CMPDVDImporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CMPDVDImporter.m; sourceTree = "<group>"; };
@@ -147 +159 @@
                         isa = PBXGroup;
                         children = (
+                                870D747E11379272007BD611 /* Update Classes */,
                                 08FB77AEFE84172EC02AAC07 /* Classes */,
                                 F50CCCF01118ECAD00213966 /* Media Players */,
@@ -222 +235 @@
                         );
                         name = "Other Sources";
+                        sourceTree = "<group>";
+                };
+                870D747E11379272007BD611 /* Update Classes */ = {
+                        isa = PBXGroup;
+                        children = (
+                                870D75E21137AB8B007BD611 /* CMPDownloadController.h */,
+                                870D75E31137AB8B007BD611 /* CMPDownloadController.m */,
+                                870D75E41137AB8B007BD611 /* CMPInstaller.h */,
+                                870D75E51137AB8B007BD611 /* CMPInstaller.m */,
+                                870D75E61137AB8B007BD611 /* CMPProgressBarControl.h */,
+                                870D75E71137AB8B007BD611 /* CMPProgressBarControl.m */,
+                        );
+                        name = "Update Classes";
                         sourceTree = "<group>";
                 };
@@ -323 +349 @@
                                 8768EC49112A5E4200318F1A /* AGProcess.h in Headers */,
                                 F5FE4F18112E11D1007EC309 /* CMPDefines.h in Headers */,
+                                870D75E81137AB8B007BD611 /* CMPDownloadController.h in Headers */,
+                                870D75EA1137AB8B007BD611 /* CMPInstaller.h in Headers */,
+                                870D75EC1137AB8B007BD611 /* CMPProgressBarControl.h in Headers */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -433 +462 @@
                                 8768EBDD112A563800318F1A /* CMPDVDImporter.m in Sources */,
                                 8768EC4A112A5E4200318F1A /* AGProcess.m in Sources */,
+                                870D75E91137AB8B007BD611 /* CMPDownloadController.m in Sources */,
+                                870D75EB1137AB8B007BD611 /* CMPInstaller.m in Sources */,
+                                870D75ED1137AB8B007BD611 /* CMPProgressBarControl.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;