Changeset 496

Timestamp:

02/25/2008 07:48:21 PM (4 years ago)

Author:

gbooker

Message:

Patch from Stephan again. I changed the int to a real in the info.plist and the padding was too large, so I changed it to a value that is smaller (by half), but still large enough (by examining the classdump offsets).
Refs #126

Location:

trunk/SapphireFrappliance

Files:

• Info.plist (modified) (1 diff)
• SapphireAppliance.m (modified) (4 diffs)
• SapphireApplianceController.m (modified) (1 diff)
• SapphireMediaPreview.h (modified) (1 diff)
• SapphireMediaPreview.m (modified) (1 diff)

trunk/SapphireFrappliance/Info.plist

@@ -26 +26 @@
         <real>-0.20999999999999999</real>
         <key>FRAppliancePreferedOrderValue</key>
-        <integer>-1</integer>
+        <real>0.0</real>
         <key>FRRemoteAppliance</key>
         <true/>

trunk/SapphireFrappliance/SapphireAppliance.m

@@ -122 +122 @@
 - (id)applianceController
 {
-        NSLog(@"in -SapphireApplicance applianceController");
         return ( [[[SapphireApplianceController alloc] initWithScene: nil] autorelease] );
 }
@@ -136 +135 @@
  */
 -(id)applianceInfo {
-        NSLog(@"in -SapphireApplicance applianceInfo");
-        
         BRApplianceInfo* p = [BRApplianceInfo infoForApplianceBundle:[NSBundle bundleForClass:[self class]]];
         NSMutableArray *categories = [NSMutableArray array];
@@ -146 +143 @@
                 BRApplianceCategory *category = [BRApplianceCategory categoryWithName:[obj valueForKey:@"name"] identifier:[obj valueForKey:@"identifier"] preferredOrder:[[obj valueForKey:@"preferred-order"] floatValue]];
                 [categories addObject:category];
-                NSLog(@"asdsa");
         }
         return [BRApplianceInfo infoForApplianceBundle:[NSBundle bundleForClass:[self class]]];
@@ -152 +148 @@
 
 -(id)applianceCategories {
-        NSLog(@"in -SapphireApplicance applianceCategories");
         NSMutableArray *categories = [NSMutableArray array];
         

trunk/SapphireFrappliance/SapphireApplianceController.m

@@ -180 +180 @@
         [settings setListIcon:                                  [theme gem:GEAR_GEM_KEY]];
         [[self list] setDatasource:self];
-        if([SapphireFrontRowCompat usingFrontRow])
+        if([SapphireFrontRowCompat usingFrontRow] && ![SapphireFrontRowCompat usingTakeTwo])
         {
                 NSString *myBundlePath = [[NSBundle bundleForClass:[self class]] bundlePath] ;

trunk/SapphireFrappliance/SapphireMediaPreview.h

@@ -29 +29 @@
  */
 @interface SapphireMediaPreview : BRMetadataPreviewController{
+        int             padding[16];    /*!< @brief The classes are of different sizes.  This padding prevents a class compiled with one size to overlap when used with a class of a different size*/   
         SapphireMetaData                        *meta;                  /*!< @brief The metadata to display in the preview*/
         SapphireDirectoryMetaData       *dirMeta;               /*!< @brief The directory containing the metadata*/

trunk/SapphireFrappliance/SapphireMediaPreview.m

@@ -41 +41 @@
 @end
 
+/* There is no BRMetadataLayer class in ATV2.0 anymore, it seems to be BRMetadataControl now*/
+/* So just do the same stuff as above, but for BRMetadataControl*/
+@interface BRMetadataControl : NSObject
+@end
+
+@implementation BRMetadataControl (protectedAccess)
+        -(NSArray *)gimmieMetadataObjs {
+        Class klass = [self class];
+        Ivar ret = class_getInstanceVariable(klass, "_metadataObjs");
+        return *(NSArray * *)(((char *)self)+ret->ivar_offset);
+}
+@end
+
+
+@interface BRMetadataPreviewController (compat)
+- (void)_updateMetadataLayer;
+@end
+
+@interface BRMetadataPreviewController (protectedAccess)
+- (BRMetadataLayer *)gimmieMetadataLayer;
+@end
+
+@implementation BRMetadataPreviewController (protectedAccess)
+- (BRMetadataLayer *)gimmieMetadataLayer
+{
+        Class myClass = [self class];
+        Ivar ret = class_getInstanceVariable(myClass,"_metadataLayer");
+        
+        return *(BRMetadataLayer * *)(((char *)self)+ret->ivar_offset);
+}
+@end
+
 @interface SapphireMediaPreview (private)
 - (void)doPopulation;
 - (NSString *)coverArtForPath;
-@end
-
-@interface BRMetadataPreviewController (compat)
-- (void)_updateMetadataLayer;
-@end
-
-@interface BRMetadataPreviewController (protectedAccess)
-- (BRMetadataLayer *)gimmieMetadataLayer;
-@end
-
-@implementation BRMetadataPreviewController (protectedAccess)
-- (BRMetadataLayer *)gimmieMetadataLayer
-{
-        Class myClass = [self class];
-        Ivar ret = class_getInstanceVariable(myClass,"_metadataLayer");
-        
-        return *(BRMetadataLayer * *)(((char *)self)+ret->ivar_offset);
-}
 @end