Changeset 1187

Timestamp:

02/26/2010 07:40:44 AM (2 years ago)

Author:

gbooker

Message:

Corrected some compile issue. While it's not functional, at least it compiles now.

Location:

trunk/CommonMediaPlayer/Update Classes

Files:

• CMPDownloadController.h (modified) (3 diffs)
• CMPDownloadController.m (modified) (2 diffs)
• CMPInstaller.h (modified) (2 diffs)
• CMPInstaller.m (modified) (1 diff)

trunk/CommonMediaPlayer/Update Classes/CMPDownloadController.h

@@ -66 +66 @@
 
 
-@interface CMPDownloadController : NSObject <CMPInstaller>
+@interface CMPDownloadController : NSObject
 {
         int             padding[16];
@@ -95 +95 @@
 - (void) deleteDownload;
 
-// stack callbacks
-- (void) wasPushed;
-- (void) willBePopped;
 - (BOOL) isNetworkDependent;
 
@@ -110 +107 @@
 - (void) storeResumeData;
 
-// NSURLDownload delegate methods
-- (void) download: (NSURLDownload *) download
-   decideDestinationWithSuggestedFilename: (NSString *) filename;
-- (void) download: (NSURLDownload *) download didFailWithError: (NSError *) error;
-- (void) download: (NSURLDownload *) download didReceiveDataOfLength: (unsigned) length;
-- (void) download: (NSURLDownload *) download didReceiveResponse: (NSURLResponse *) response;
-- (BOOL) download: (NSURLDownload *) download
-   shouldDecodeSourceDataOfMIMEType: (NSString *) encodingType;
-- (void) download: (NSURLDownload *) download
-   willResumeWithResponse: (NSURLResponse *) response
-                 fromByte: (long long) startingByte;
-- (void) downloadDidFinish: (NSURLDownload *) download;
-
 - (void)popTop;
 - (void)installUpdate:(NSString *)outputPath;

trunk/CommonMediaPlayer/Update Classes/CMPDownloadController.m

@@ -29 +29 @@
 #define myDomain                        (CFStringRef)@"??"
 
+@interface CMPDownloadController ()
++ (NSString *)atvVersion;
+@end
+
+@interface BRThemeInfo (SpecialAdditions)
+- (id)CMPParagraphTextAttributes;
+@end
+
 static NSString * const kDefaultURLString = @"nada";
 
@@ -474 +482 @@
 }
 
-- (void)installer:(id <CMPInstaller>)installer didEndWithSettings:(NSDictionary *)settings
+- (void)installer:(CMPInstaller *)installer didEndWithSettings:(NSDictionary *)settings
 {
         [installer autorelease];

trunk/CommonMediaPlayer/Update Classes/CMPInstaller.h

@@ -24 +24 @@
 #import "CMPDefines.h"
 
-@interface CMPInstaller : NSObject <CMPInstaller> {
-        
+@protocol CMPInstallerDelegate;
+
+@interface CMPInstaller : NSObject{
         NSString *_zipFile;
         id <CMPInstallerDelegate>       delegate;
-        
-        
 }
 
@@ -39 +38 @@
 - (BOOL)unzipFile:(NSString *)theFile toPath:(NSString *)newPath;
 @end
+
+@protocol CMPInstallerDelegate <NSObject> 
+- (void)installer:(CMPInstaller *)installer didEndWithSettings:(NSDictionary *)settings; 
+@end 

trunk/CommonMediaPlayer/Update Classes/CMPInstaller.m

@@ -47 +47 @@
         //NSLog(@"%@ %s", self, _cmd);
         
-        [[BRAppManager sharedApplication] terminate];
+        [[NSApplication sharedApplication] terminate:nil];
         AGProcess *finder = [AGProcess processForCommand:@"Finder"];
         if (finder != nil)