Ticket #126: next_step.patch

File next_step.patch, 4.4 kB (added by Stephan, 9 months ago)
Changes in Info.plist (PrefferedThing?=0), removed debug outputs, fixes SapphireMediaPreview? and SapphireApplicanceController? (to see this, you've to remove allImporter in SapphireApplianceController::recreateMenu)

SapphireFrappliance/SapphireAppliance.m

old	new
121	121
122	122	- (id)applianceController
123	123	{
124		~~NSLog(@"in -SapphireApplicance applianceController");~~
125	124	return ( [[[SapphireApplianceController alloc] initWithScene: nil] autorelease] );
126	125	}
127	126
…	…
135	134	* This implements the BRAppliance protocol from ATV2.
136	135	*/
137	136	-(id)applianceInfo {
138		~~NSLog(@"in -SapphireApplicance applianceInfo");~~
139
140	137	BRApplianceInfo* p = [BRApplianceInfo infoForApplianceBundle:[NSBundle bundleForClass:[self class]]];
141	138	NSMutableArray *categories = [NSMutableArray array];
142	139
…	…
145	142	while((obj = [enumerator nextObject]) != nil) {
146	143	BRApplianceCategory *category = [BRApplianceCategory categoryWithName:[obj valueForKey:@"name"] identifier:[obj valueForKey:@"identifier"] preferredOrder:[[obj valueForKey:@"preferred-order"] floatValue]];
147	144	[categories addObject:category];
148		~~NSLog(@"asdsa");~~
149	145	}
150	146	return [BRApplianceInfo infoForApplianceBundle:[NSBundle bundleForClass:[self class]]];
151	147	}
152	148
153	149	-(id)applianceCategories {
154		~~NSLog(@"in -SapphireApplicance applianceCategories");~~
155	150	NSMutableArray *categories = [NSMutableArray array];
156	151
157	152	NSEnumerator *enumerator = [[[self applianceInfo] applianceCategoryDescriptors] objectEnumerator];

old	new
28	28	* The directory may not always be the parent of the metadata. In the case of virtual directories, the parent is a virtual directory while the metadata is the actual file located elsewhere.
29	29	*/
30	30	@interface SapphireMediaPreview : BRMetadataPreviewController{
	31	char padding[128];
31	32	SapphireMetaData meta; /!< @brief The metadata to display in the preview*/
32	33	SapphireDirectoryMetaData dirMeta; /!< @brief The directory containing the metadata*/
33	34	}

old	new
40	40	}
41	41	@end
42	42
43		@interface SapphireMediaPreview (private)
44		- (void)doPopulation;
45		- (NSString *)coverArtForPath;
	43	/* There is no BRMetadataLayer class in ATV2.0 anymore, it seems to be BRMetadataControl now*/
	44	/* So just do the same stuff as above, but for BRMetadataControl*/
	45	@interface BRMetadataControl : NSObject
46	46	@end
47	47
	48	@implementation BRMetadataControl (protectedAccess)
	49	-(NSArray *)gimmieMetadataObjs {
	50	Class klass = [self class];
	51	Ivar ret = class_getInstanceVariable(klass, "_metadataObjs");
	52	return (NSArray )(((char )self)+ret->ivar_offset);
	53	}
	54	@end
	55
	56
48	57	@interface BRMetadataPreviewController (compat)
49	58	- (void)_updateMetadataLayer;
50	59	@end
…	…
63	72	}
64	73	@end
65	74
	75	@interface SapphireMediaPreview (private)
	76	- (void)doPopulation;
	77	- (NSString *)coverArtForPath;
	78	@end
	79
66	80	@implementation SapphireMediaPreview
67	81
68	82	/List of extensions to look for cover art/

old	new
25	25	<key>FRApplianceIconReflectionOffset</key>
26	26	<real>-0.20999999999999999</real>
27	27	<key>FRAppliancePreferedOrderValue</key>
28		<integer>-1</integer>
	28	<integer>0</integer>
29	29	<key>FRRemoteAppliance</key>
30	30	<true/>
31	31	<key>NSPrincipalClass</key>

old	new
179	179	[settings setListTitle: BRLocalizedString(@" Settings", @"Settings Menu Item")] ;
180	180	[settings setListIcon: [theme gem:GEAR_GEM_KEY]];
181	181	[[self list] setDatasource:self];
182		if([SapphireFrontRowCompat usingFrontRow])
	182	if([SapphireFrontRowCompat usingFrontRow] && ![SapphireFrontRowCompat usingTakeTwo])
183	183	{
184	184	NSString *myBundlePath = [[NSBundle bundleForClass:[self class]] bundlePath] ;
185	185	NSString *onlyPath = [myBundlePath stringByAppendingPathComponent:@"/Contents/Frameworks/LeopardOnly.framework"];