Skip to content

Commit 71a6813

Browse files
committed
[atv2] - rewrite the XBMCAppliance and XBMCController for using obj-c runtime class definition and hooking. This is needed for supporting atv2 on ios6 (see the comments in the impl.)
1 parent e49ab72 commit 71a6813

File tree

6 files changed

+1308
-746
lines changed

6 files changed

+1308
-746
lines changed

XBMC-ATV2.xcodeproj/project.pbxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@
896896
F56C7B89131EC155000AD0F6 /* Util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C780A131EC154000AD0F6 /* Util.cpp */; };
897897
F56C7B8B131EC155000AD0F6 /* XBApplicationEx.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C780E131EC154000AD0F6 /* XBApplicationEx.cpp */; };
898898
F56C7B9B131EC1B4000AD0F6 /* AutoPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = F56C7B9A131EC1B4000AD0F6 /* AutoPool.mm */; };
899-
F56C7BC9131EC2DB000AD0F6 /* XBMCAppliance.m in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BC2131EC2DB000AD0F6 /* XBMCAppliance.m */; };
899+
F56C7BC9131EC2DB000AD0F6 /* XBMCAppliance.mm in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BC2131EC2DB000AD0F6 /* XBMCAppliance.mm */; };
900900
F56C7BCA131EC2DB000AD0F6 /* XBMCController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BC5131EC2DB000AD0F6 /* XBMCController.mm */; };
901901
F56C7BD0131EC301000AD0F6 /* XBMC.png in Resources */ = {isa = PBXBuildFile; fileRef = F56C7BCD131EC301000AD0F6 /* XBMC.png */; };
902902
F56C7BDC131EC390000AD0F6 /* WinEventsIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BD9131EC390000AD0F6 /* WinEventsIOS.mm */; };
@@ -2973,7 +2973,7 @@
29732973
F56C780F131EC154000AD0F6 /* XBApplicationEx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBApplicationEx.h; sourceTree = "<group>"; };
29742974
F56C7B99131EC1B4000AD0F6 /* AutoPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoPool.h; sourceTree = "<group>"; };
29752975
F56C7B9A131EC1B4000AD0F6 /* AutoPool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AutoPool.mm; sourceTree = "<group>"; };
2976-
F56C7BC2131EC2DB000AD0F6 /* XBMCAppliance.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XBMCAppliance.m; sourceTree = "<group>"; };
2976+
F56C7BC2131EC2DB000AD0F6 /* XBMCAppliance.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = XBMCAppliance.mm; sourceTree = "<group>"; };
29772977
F56C7BC3131EC2DB000AD0F6 /* XBMCAppliance.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMCAppliance.h; sourceTree = "<group>"; };
29782978
F56C7BC4131EC2DB000AD0F6 /* XBMCController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMCController.h; sourceTree = "<group>"; };
29792979
F56C7BC5131EC2DB000AD0F6 /* XBMCController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = XBMCController.mm; sourceTree = "<group>"; };
@@ -6015,7 +6015,7 @@
60156015
F56C7F2D131F0BB4000AD0F6 /* English.lproj */,
60166016
F56C7BCD131EC301000AD0F6 /* XBMC.png */,
60176017
F56C7BC3131EC2DB000AD0F6 /* XBMCAppliance.h */,
6018-
F56C7BC2131EC2DB000AD0F6 /* XBMCAppliance.m */,
6018+
F56C7BC2131EC2DB000AD0F6 /* XBMCAppliance.mm */,
60196019
F56C7BCE131EC301000AD0F6 /* XBMCATV2-Info.plist */,
60206020
F56C7BC4131EC2DB000AD0F6 /* XBMCController.h */,
60216021
F56C7BC5131EC2DB000AD0F6 /* XBMCController.mm */,
@@ -7323,7 +7323,7 @@
73237323
F56C7B89131EC155000AD0F6 /* Util.cpp in Sources */,
73247324
F56C7B8B131EC155000AD0F6 /* XBApplicationEx.cpp in Sources */,
73257325
F56C7B9B131EC1B4000AD0F6 /* AutoPool.mm in Sources */,
7326-
F56C7BC9131EC2DB000AD0F6 /* XBMCAppliance.m in Sources */,
7326+
F56C7BC9131EC2DB000AD0F6 /* XBMCAppliance.mm in Sources */,
73277327
F56C7BCA131EC2DB000AD0F6 /* XBMCController.mm in Sources */,
73287328
F56C7BDC131EC390000AD0F6 /* WinEventsIOS.mm in Sources */,
73297329
F56C7BDD131EC390000AD0F6 /* WinSystemIOS.mm in Sources */,

xbmc/osx/atv2/XBMCAppliance.h

+6
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,10 @@
2828
XBMCTopShelfController *_topShelfController;
2929
}
3030
@property(nonatomic, readonly, retain) id topShelfController;
31+
32+
- (id) initWithApplianceInfo:(id) applianceInfo;
33+
- (void) setTopShelfController:(id) topShelfControl;
34+
- (void) setApplianceCategories:(id) applianceCategories;
35+
- (void) XBMCfixUIDevice;
36+
- (id) init;
3137
@end

xbmc/osx/atv2/XBMCAppliance.m

-218
This file was deleted.

0 commit comments

Comments
 (0)