fixed shelf compat in 5.0 GM

tomcool420 · Oct 17, 2011 · 66930c1 · 66930c1
1 parent 7ec3be5
commit 66930c1
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/SMFCompatibility.h b/SMFCompatibility.h
@@ -13,11 +13,13 @@
     BOOL _usingFourPointTwoPlus;
     BOOL _usingFourPointThreePlus;
     BOOL _usingFourPointFourPlus;
+	BOOL _usingFourPointFourGM;
 }
 +(SMFCompatibility *)compat;
 -(BOOL)usingFourPointTwoPlus;
 -(BOOL)usingFourPointThreePlus;
 -(BOOL)usingFourPointFourPlus;
+-(BOOL)usingFourPointFourGM;
 @end
 
 #define SMF_COMPAT [SMFCompatibility compat]
diff --git a/SMFCompatibility.m b/SMFCompatibility.m
@@ -25,7 +25,11 @@ -(id)init
         if (_usingFourPointTwoPlus && NSClassFromString(@"BRTableView")) {
             _usingFourPointThreePlus=YES;
         }
-        if (_usingFourPointThreePlus && NSClassFromString(@"BRProxyManager")) {
+        if (_usingFourPointThreePlus && NSClassFromString(@"ATVAudioOption"))
+		{
+			_usingFourPointFourGM=YES;
+		}
+		if (_usingFourPointThreePlus && NSClassFromString(@"BRProxyManager")) {
             _usingFourPointFourPlus=YES;
         }
     }
@@ -43,4 +47,8 @@ -(BOOL)usingFourPointFourPlus
 {
     return _usingFourPointFourPlus;
 }
+-(BOOL)usingFourPointFourGM
+{
+	return _usingFourPointFourGM;
+}
 @end
diff --git a/SMFMoviePreviewController.m b/SMFMoviePreviewController.m
@@ -522,6 +522,7 @@ -(void)reload
 
 -(void)reloadShelf
 {
+	NSLog(@"reloadShelf");
 
     if (_shelfControl!=nil) {
         [_shelfControl release];
@@ -530,7 +531,7 @@ -(void)reloadShelf
 
     CGRect masterFrame=[BRWindow interfaceFrame];
 
-    if(![SMF_COMPAT usingFourPointFourPlus])
+    if(![SMF_COMPAT usingFourPointFourPlus] && ![SMF_COMPAT usingFourPointFourGM])
     {
         _shelfControl = [[NSClassFromString(@"BRMediaShelfControl") alloc] init];
         [_shelfControl setProvider:[self getProviderForShelf]];

diff --git a/_/DEBIAN/control b/_/DEBIAN/control
@@ -1,9 +1,9 @@
 Package: org.tomcool.smframework
 Name: SMFramework
-Version: 0.7.8-1
+Version: 0.7.8-4
 Architecture: iphoneos-arm
 Description: Framework for most packages written by me
 Maintainer: Thomas Cool <thomas.cool@me.com>
 Author: Thomas Cool <thomas.cool@me.com>
 Section: Development
-Installed-Size: 740
+Installed-Size: 5092
diff --git a/_/Library/Frameworks/SMFramework.framework/Headers/SMFMenuItem.h b/_/Library/Frameworks/SMFramework.framework/Headers/SMFMenuItem.h
@@ -6,8 +6,9 @@
 //  Copyright 2010 tomcool.org. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import "Backrow/AppleTV.h"
-
+@class BRMenuItem;
 @interface SMFMenuItem : BRMenuItem {
 
 	BOOL centered;

diff --git a/_/Library/Frameworks/SMFramework.framework/SMFramework b/_/Library/Frameworks/SMFramework.framework/SMFramework