Navigation

← Previous Changeset
Next Changeset →

Changeset 703

Timestamp:

12/08/08 09:46:38 (1 month ago)

Author:

gbooker

Message:

Changed the method of campatibility with the stack calls. This method should still be compatibile, but avoid the noticable refresh on older ATVs and Leopard

Files:

trunk/SapphireCompatibilityClasses/SapphireCenteredMenuController.h (modified) (1 diff)
trunk/SapphireCompatibilityClasses/SapphireCenteredMenuController.m (modified) (1 diff)
trunk/SapphireCompatibilityClasses/SapphireCompatibilityClasses.xcodeproj/project.pbxproj (modified) (4 diffs)
trunk/SapphireCompatibilityClasses/SapphireMediaMenuController.h (modified) (1 diff)
trunk/SapphireCompatibilityClasses/SapphireMediaMenuController.m (modified) (1 diff)
trunk/SapphireCompatibilityClasses/SapphireStackControllerCompatFunctions.h (added)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/SapphireCompatibilityClasses/SapphireCenteredMenuController.h

r694	r703
46	46	}
47	47
	48	/*!
	49	* @brief Begin of the push
	50	*
	51	* On the ATV < 2.3, this takes the place of willBePushed. On ATV â¥ 2.3, this is the first part of wasPushed
	52	*/
	53	- (void)doInitialPush;
	54
	55	/*!
	56	* @brief Begin of the pop
	57	*
	58	* On the ATV < 2.3, this takes the place of willBePopped. On ATV â¥ 2.3, this is the first part of wasPopped
	59	*/
	60	- (void)doInitialPop;
	61
	62	/*!
	63	* @brief Begin of the bury
	64	*
	65	* On the ATV < 2.3, this takes the place of willBeBuried. On ATV â¥ 2.3, this is the first part of wasBuried
	66	*/
	67	- (void)doInitialBury;
	68	- (void)wasBuried;
	69
	70	/*!
	71	* @brief Begin of the exhume
	72	*
	73	* On the ATV < 2.3, this takes the place of willBeExhumed. On ATV â¥ 2.3, this is the first part of wasExhumed
	74	*/
	75	- (void)doInitialExhume;
	76	- (void)wasExhumed;
48	77	@end

trunk/SapphireCompatibilityClasses/SapphireCenteredMenuController.m

r694	r703
139	139	}
140	140
141		- (void)wasBuried
142		{
143		[self wasBuriedByPushingController:nil];
144		}
145
146		- (void) wasBuriedByPushingController: (BRLayerController *) controller
147		{
148		// The user chose an option and this controller is no longer on screen
149
150		// always call super
151		if([SapphireFrontRowCompat usingTakeTwoDotThree])
152		[super wasBuried];
153		else
154		[super wasBuriedByPushingController: controller];
155		}
156
157		- (void)wasExhumed
158		{
159		[self wasExhumedByPoppingController:nil];
160		}
161
162		- (void) wasExhumedByPoppingController: (BRLayerController *) controller
163		{
164		// handle being revealed when the user presses Menu
165
166		// always call super
167		if([SapphireFrontRowCompat usingTakeTwoDotThree])
168		[super wasExhumed];
169		else
170		[super wasExhumedByPoppingController: controller];
171		}
	141	#include "SapphireStackControllerCompatFunctions.h"
172	142
173	143	@end

trunk/SapphireCompatibilityClasses/SapphireCompatibilityClasses.xcodeproj/project.pbxproj

r694	r703
15	15	DCE6408F0E9DA53300D2AAED /* BRMusicPlayer.h in Headers / = {isa = PBXBuildFile; fileRef = DCE6408D0E9DA53300D2AAED / BRMusicPlayer.h */; };
16	16	DCE640900E9DA53300D2AAED /* BRMusicPlayer.m in Sources / = {isa = PBXBuildFile; fileRef = DCE6408E0E9DA53300D2AAED / BRMusicPlayer.m */; };
	17	F511E0C50EECB0B50034C4AA /* SapphireStackControllerCompatFunctions.h in Headers / = {isa = PBXBuildFile; fileRef = F511E0C40EECB0B50034C4AA / SapphireStackControllerCompatFunctions.h */; };
17	18	F51BFCE50D26BB3900E22363 /* SapphireCenteredMenuController.h in Headers / = {isa = PBXBuildFile; fileRef = F51BFCD70D26BB3900E22363 / SapphireCenteredMenuController.h */; settings = {ATTRIBUTES = (Public, ); }; };
18	19	F51BFCE60D26BB3900E22363 /* SapphireCenteredMenuController.m in Sources / = {isa = PBXBuildFile; fileRef = F51BFCD80D26BB3900E22363 / SapphireCenteredMenuController.m */; };
…	…
69	70	DCE6408D0E9DA53300D2AAED /* BRMusicPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BRMusicPlayer.h; sourceTree = "<group>"; };
70	71	DCE6408E0E9DA53300D2AAED /* BRMusicPlayer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BRMusicPlayer.m; sourceTree = "<group>"; };
	72	F511E0C40EECB0B50034C4AA /* SapphireStackControllerCompatFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireStackControllerCompatFunctions.h; sourceTree = "<group>"; };
71	73	F51BFCD10D26BAED00E22363 /* SapphireCompatClasses.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SapphireCompatClasses.framework; sourceTree = BUILT_PRODUCTS_DIR; };
72	74	F51BFCD70D26BB3900E22363 /* SapphireCenteredMenuController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireCenteredMenuController.h; sourceTree = "<group>"; };
…	…
192	194	DCE6408D0E9DA53300D2AAED /* BRMusicPlayer.h */,
193	195	DCE6408E0E9DA53300D2AAED /* BRMusicPlayer.m */,
	196	F511E0C40EECB0B50034C4AA /* SapphireStackControllerCompatFunctions.h */,
194	197	);
195	198	name = Classes;
…	…
244	247	F580E8740D31288400F2225A /* SapphireButtonControl.h in Headers */,
245	248	F59FF2900EDB97680052012E /* SapphireLayoutManager.h in Headers */,
	249	F511E0C50EECB0B50034C4AA /* SapphireStackControllerCompatFunctions.h in Headers */,
246	250	);
247	251	runOnlyForDeploymentPostprocessing = 0;

trunk/SapphireCompatibilityClasses/SapphireMediaMenuController.h

r694	r703
47	47	*/
48	48	- (void)setSelection:(int)sel;
	49
	50	/*!
	51	* @brief Begin of the push
	52	*
	53	* On the ATV < 2.3, this takes the place of willBePushed. On ATV â¥ 2.3, this is the first part of wasPushed
	54	*/
	55	- (void)doInitialPush;
	56
	57	/*!
	58	* @brief Begin of the pop
	59	*
	60	* On the ATV < 2.3, this takes the place of willBePopped. On ATV â¥ 2.3, this is the first part of wasPopped
	61	*/
	62	- (void)doInitialPop;
	63
	64	/*!
	65	* @brief Begin of the bury
	66	*
	67	* On the ATV < 2.3, this takes the place of willBeBuried. On ATV â¥ 2.3, this is the first part of wasBuried
	68	*/
	69	- (void)doInitialBury;
	70	- (void)wasBuried;
	71
	72	/*!
	73	* @brief Begin of the exhume
	74	*
	75	* On the ATV < 2.3, this takes the place of willBeExhumed. On ATV â¥ 2.3, this is the first part of wasExhumed
	76	*/
	77	- (void)doInitialExhume;
	78	- (void)wasExhumed;
49	79	@end

trunk/SapphireCompatibilityClasses/SapphireMediaMenuController.m

r694	r703
205	205	}
206	206
207		- (void) wasPushed
208		{
209		// We've just been put on screen, the user can see this controller's content now
210
211		// always call super
212		[super wasPushed];
213		}
214
215		- (void) wasPopped
216		{
217		// The user pressed Menu, removing us from the screen
218		// always call super
219
220		[super wasPopped];
221		}
222
223		- (void)wasBuried
224		{
225		[self wasBuriedByPushingController:nil];
226		}
227
228		- (void) wasBuriedByPushingController: (BRLayerController *) controller
229		{
230		// The user chose an option and this controller is no longer on screen
231
232		// always call super
233		if([SapphireFrontRowCompat usingTakeTwoDotThree])
234		[super wasBuried];
235		else
236		[super wasBuriedByPushingController: controller];
237		}
238
239		- (void)wasExhumed
240		{
241		[self wasExhumedByPoppingController:nil];
242		}
243
244		- (void) wasExhumedByPoppingController: (BRLayerController *) controller
245		{
246		// handle being revealed when the user presses Menu
247
248		// always call super
249		if([SapphireFrontRowCompat usingTakeTwoDotThree])
250		[super wasExhumed];
251		else
252		[super wasExhumedByPoppingController: controller];
253		}
254
255		@end
	207	#include "SapphireStackControllerCompatFunctions.h"
	208
	209	@end