@Montellese, @Memphiz, @jimfcarroll Replace the scripting engine with a codegenerated one.

1 files changed, 167 insertions, 230 deletions

diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj
index 458e9d4ec8..c539cc09dd 100644
--- a/XBMC-ATV2.xcodeproj/project.pbxproj
+++ b/XBMC-ATV2.xcodeproj/project.pbxproj
@@ -7,7 +7,6 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		1830216013B8E35300770920 /* controledit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1830215F13B8E35300770920 /* controledit.cpp */; };
 		18404DFD1396C44F00863BBA /* SlingboxLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18404DFC1396C44F00863BBA /* SlingboxLib.a */; };
 		1840B796139968DB007C848B /* JSONVariantParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1840B792139968DB007C848B /* JSONVariantParser.cpp */; };
 		1840B797139968DB007C848B /* JSONVariantWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1840B794139968DB007C848B /* JSONVariantWriter.cpp */; };
@@ -43,8 +42,6 @@
 		7CCFD9AA1514952700211D82 /* PCMCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CCFD9A81514952700211D82 /* PCMCodec.cpp */; };
 		7CEE2E6D13D6B7A8000ABF2A /* TimeSmoother.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CEE2E6B13D6B7A8000ABF2A /* TimeSmoother.cpp */; };
 		C807119F135DB842002F601B /* InputOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C807119D135DB842002F601B /* InputOperations.cpp */; };
-		C8936060152C86EC00812418 /* PythonMonitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C893605E152C86EC00812418 /* PythonMonitor.cpp */; };
-		C8936063152C86F500812418 /* monitor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8936061152C86F500812418 /* monitor.cpp */; };
 		C8B92A8215735D0300284190 /* Epg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8B92A7515735D0300284190 /* Epg.cpp */; };
 		C8B92A8315735D0300284190 /* EpgContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8B92A7715735D0300284190 /* EpgContainer.cpp */; };
 		C8B92A8415735D0300284190 /* EpgDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8B92A7915735D0300284190 /* EpgDatabase.cpp */; };
@@ -101,6 +98,7 @@
 		DF23461115FA671900A934F6 /* UPnPInternal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF23460915FA671900A934F6 /* UPnPInternal.cpp */; };
 		DF23461215FA671900A934F6 /* UPnPRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF23460B15FA671900A934F6 /* UPnPRenderer.cpp */; };
 		DF23461315FA671900A934F6 /* UPnPServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF23460D15FA671900A934F6 /* UPnPServer.cpp */; };
+		DF294E7915DAD78E004FDDEC /* addonbindings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF294E7815DAD78E004FDDEC /* addonbindings.a */; };
 		DF33C2A415509C1B0046CDCB /* XbmcContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF33C2A215509C1B0046CDCB /* XbmcContext.cpp */; };
 		DF33C2AE15509C5A0046CDCB /* ilog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF33C2AB15509C5A0046CDCB /* ilog.cpp */; };
 		DF34890913FD96390026A711 /* GUIAction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF34890713FD96390026A711 /* GUIAction.cpp */; };
@@ -612,44 +610,6 @@
 		F56C7A47131EC155000AD0F6 /* KeyboardStat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7558131EC152000AD0F6 /* KeyboardStat.cpp */; };
 		F56C7A48131EC155000AD0F6 /* MouseStat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C755A131EC152000AD0F6 /* MouseStat.cpp */; };
 		F56C7A49131EC155000AD0F6 /* SDLJoystick.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C755C131EC152000AD0F6 /* SDLJoystick.cpp */; };
-		F56C7A4B131EC155000AD0F6 /* xbmcvfsmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7567131EC152000AD0F6 /* xbmcvfsmodule.cpp */; };
-		F56C7A4C131EC155000AD0F6 /* PythonAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7568131EC152000AD0F6 /* PythonAddon.cpp */; };
-		F56C7A4D131EC155000AD0F6 /* xbmcaddonmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C756A131EC152000AD0F6 /* xbmcaddonmodule.cpp */; };
-		F56C7A4E131EC155000AD0F6 /* controlslider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C756B131EC152000AD0F6 /* controlslider.cpp */; };
-		F56C7A4F131EC155000AD0F6 /* controlradiobutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C756C131EC152000AD0F6 /* controlradiobutton.cpp */; };
-		F56C7A50131EC155000AD0F6 /* action.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C756D131EC152000AD0F6 /* action.cpp */; };
-		F56C7A51131EC155000AD0F6 /* control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C756F131EC152000AD0F6 /* control.cpp */; };
-		F56C7A52131EC155000AD0F6 /* controlbutton.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7571131EC152000AD0F6 /* controlbutton.cpp */; };
-		F56C7A53131EC155000AD0F6 /* controlcheckmark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7572131EC152000AD0F6 /* controlcheckmark.cpp */; };
-		F56C7A54131EC155000AD0F6 /* controlfadelabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7573131EC152000AD0F6 /* controlfadelabel.cpp */; };
-		F56C7A55131EC155000AD0F6 /* controlgroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7574131EC152000AD0F6 /* controlgroup.cpp */; };
-		F56C7A56131EC155000AD0F6 /* controlimage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7575131EC152000AD0F6 /* controlimage.cpp */; };
-		F56C7A57131EC155000AD0F6 /* controllabel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7576131EC152000AD0F6 /* controllabel.cpp */; };
-		F56C7A58131EC155000AD0F6 /* controllist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7577131EC152000AD0F6 /* controllist.cpp */; };
-		F56C7A59131EC155000AD0F6 /* controlprogress.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7578131EC152000AD0F6 /* controlprogress.cpp */; };
-		F56C7A5A131EC155000AD0F6 /* controlspin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7579131EC152000AD0F6 /* controlspin.cpp */; };
-		F56C7A5B131EC155000AD0F6 /* controltextbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C757A131EC152000AD0F6 /* controltextbox.cpp */; };
-		F56C7A5C131EC155000AD0F6 /* dialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C757B131EC152000AD0F6 /* dialog.cpp */; };
-		F56C7A5D131EC155000AD0F6 /* GUIPythonWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C757D131EC152000AD0F6 /* GUIPythonWindow.cpp */; };
-		F56C7A5E131EC155000AD0F6 /* GUIPythonWindowDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C757F131EC152000AD0F6 /* GUIPythonWindowDialog.cpp */; };
-		F56C7A5F131EC155000AD0F6 /* GUIPythonWindowXML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7581131EC152000AD0F6 /* GUIPythonWindowXML.cpp */; };
-		F56C7A60131EC155000AD0F6 /* GUIPythonWindowXMLDialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7583131EC152000AD0F6 /* GUIPythonWindowXMLDialog.cpp */; };
-		F56C7A61131EC155000AD0F6 /* infotagmusic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7585131EC152000AD0F6 /* infotagmusic.cpp */; };
-		F56C7A62131EC155000AD0F6 /* infotagvideo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7587131EC152000AD0F6 /* infotagvideo.cpp */; };
-		F56C7A63131EC155000AD0F6 /* keyboard.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7589131EC152000AD0F6 /* keyboard.cpp */; };
-		F56C7A64131EC155000AD0F6 /* listitem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C758B131EC152000AD0F6 /* listitem.cpp */; };
-		F56C7A65131EC155000AD0F6 /* player.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C758D131EC152000AD0F6 /* player.cpp */; };
-		F56C7A66131EC155000AD0F6 /* pyplaylist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C758F131EC152000AD0F6 /* pyplaylist.cpp */; };
-		F56C7A67131EC155000AD0F6 /* PythonPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7591131EC152000AD0F6 /* PythonPlayer.cpp */; };
-		F56C7A68131EC155000AD0F6 /* pyutil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7593131EC152000AD0F6 /* pyutil.cpp */; };
-		F56C7A69131EC155000AD0F6 /* window.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7595131EC152000AD0F6 /* window.cpp */; };
-		F56C7A6A131EC155000AD0F6 /* winxml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7597131EC152000AD0F6 /* winxml.cpp */; };
-		F56C7A6B131EC155000AD0F6 /* winxmldialog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7599131EC152000AD0F6 /* winxmldialog.cpp */; };
-		F56C7A6C131EC155000AD0F6 /* xbmcguimodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C759A131EC152000AD0F6 /* xbmcguimodule.cpp */; };
-		F56C7A6D131EC155000AD0F6 /* xbmcmodule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C759B131EC152000AD0F6 /* xbmcmodule.cpp */; };
-		F56C7A6E131EC155000AD0F6 /* xbmcplugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C759C131EC152000AD0F6 /* xbmcplugin.cpp */; };
-		F56C7A6F131EC155000AD0F6 /* XBPython.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C759D131EC152000AD0F6 /* XBPython.cpp */; };
-		F56C7A71131EC155000AD0F6 /* XBPyThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75A1131EC152000AD0F6 /* XBPyThread.cpp */; };
 		F56C7A72131EC155000AD0F6 /* AnnouncementManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75A3131EC152000AD0F6 /* AnnouncementManager.cpp */; };
 		F56C7A73131EC155000AD0F6 /* Builtins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75A5131EC153000AD0F6 /* Builtins.cpp */; };
 		F56C7A75131EC155000AD0F6 /* ConvUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75AD131EC153000AD0F6 /* ConvUtils.cpp */; };
@@ -1034,7 +994,6 @@
 		F5E1132714357B6500175026 /* GUIDialogPeripheralManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E1131614357B6500175026 /* GUIDialogPeripheralManager.cpp */; };
 		F5E1132814357B6500175026 /* GUIDialogPeripheralSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E1131814357B6500175026 /* GUIDialogPeripheralSettings.cpp */; };
 		F5E1132914357B6500175026 /* Peripherals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E1131A14357B6500175026 /* Peripherals.cpp */; };
-		F5E113AD1435882400175026 /* pyrendercapture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E113AC1435882400175026 /* pyrendercapture.cpp */; };
 		F5E6209F13E9081400D5F2CD /* InfoBool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E6209D13E9081400D5F2CD /* InfoBool.cpp */; };
 		F5ED8D931551FAEA00842059 /* BlurayDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5ED8D911551FAEA00842059 /* BlurayDirectory.cpp */; };
 		F5ED90C91553994800842059 /* XBMCTinyXML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5ED90C71553994800842059 /* XBMCTinyXML.cpp */; };
@@ -1042,7 +1001,6 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
-		1830215F13B8E35300770920 /* controledit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controledit.cpp; sourceTree = "<group>"; };
 		18404DFC1396C44F00863BBA /* SlingboxLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = SlingboxLib.a; path = lib/SlingboxLib/SlingboxLib.a; sourceTree = "<group>"; };
 		1840B792139968DB007C848B /* JSONVariantParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONVariantParser.cpp; sourceTree = "<group>"; };
 		1840B793139968DB007C848B /* JSONVariantParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONVariantParser.h; sourceTree = "<group>"; };
@@ -1118,10 +1076,6 @@
 		8D576316048677EA00EA77CD /* XBMC.frappliance */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = XBMC.frappliance; sourceTree = BUILT_PRODUCTS_DIR; };
 		C807119D135DB842002F601B /* InputOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InputOperations.cpp; sourceTree = "<group>"; };
 		C807119E135DB842002F601B /* InputOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputOperations.h; sourceTree = "<group>"; };
-		C893605E152C86EC00812418 /* PythonMonitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PythonMonitor.cpp; sourceTree = "<group>"; };
-		C893605F152C86EC00812418 /* PythonMonitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PythonMonitor.h; sourceTree = "<group>"; };
-		C8936061152C86F500812418 /* monitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = monitor.cpp; sourceTree = "<group>"; };
-		C8936062152C86F500812418 /* monitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = monitor.h; sourceTree = "<group>"; };
 		C8B92A7515735D0300284190 /* Epg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Epg.cpp; sourceTree = "<group>"; };
 		C8B92A7615735D0300284190 /* Epg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Epg.h; sourceTree = "<group>"; };
 		C8B92A7715735D0300284190 /* EpgContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EpgContainer.cpp; sourceTree = "<group>"; };
@@ -1226,6 +1180,73 @@
 		DF08E84415829BA600058C77 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
 		DF0DF16A13A3AF82008ED511 /* NFSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSDirectory.cpp; sourceTree = "<group>"; };
 		DF0DF16B13A3AF82008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = "<group>"; };
+		DF1AD01615FCE5C600E10810 /* AddonModuleXbmc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonModuleXbmc.cpp; sourceTree = "<group>"; };
+		DF1AD01A15FCE5C600E10810 /* AddonModuleXbmcaddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonModuleXbmcaddon.cpp; sourceTree = "<group>"; };
+		DF1AD01E15FCE5C600E10810 /* AddonModuleXbmcgui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonModuleXbmcgui.cpp; sourceTree = "<group>"; };
+		DF1AD02215FCE5C600E10810 /* AddonModuleXbmcplugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonModuleXbmcplugin.cpp; sourceTree = "<group>"; };
+		DF1AD02615FCE5C600E10810 /* AddonModuleXbmcvfs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonModuleXbmcvfs.cpp; sourceTree = "<group>"; };
+		DF1AD02E15FCE62E00E10810 /* Addon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Addon.cpp; sourceTree = "<group>"; };
+		DF1AD02F15FCE62E00E10810 /* Addon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Addon.h; sourceTree = "<group>"; };
+		DF1AD03215FCE62E00E10810 /* AddonCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonCallback.cpp; sourceTree = "<group>"; };
+		DF1AD03315FCE62E00E10810 /* AddonCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonCallback.h; sourceTree = "<group>"; };
+		DF1AD03615FCE62E00E10810 /* AddonClass.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonClass.cpp; sourceTree = "<group>"; };
+		DF1AD03715FCE62E00E10810 /* AddonClass.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonClass.h; sourceTree = "<group>"; };
+		DF1AD03A15FCE62E00E10810 /* AddonString.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonString.h; sourceTree = "<group>"; };
+		DF1AD03B15FCE62E00E10810 /* AddonUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonUtils.cpp; sourceTree = "<group>"; };
+		DF1AD03C15FCE62E00E10810 /* AddonUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonUtils.h; sourceTree = "<group>"; };
+		DF1AD03F15FCE62E00E10810 /* Alternative.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Alternative.h; sourceTree = "<group>"; };
+		DF1AD04015FCE62E00E10810 /* aojsonrpc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = aojsonrpc.h; sourceTree = "<group>"; };
+		DF1AD04115FCE62E00E10810 /* CallbackFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CallbackFunction.cpp; sourceTree = "<group>"; };
+		DF1AD04215FCE62E00E10810 /* CallbackFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallbackFunction.h; sourceTree = "<group>"; };
+		DF1AD04515FCE62E00E10810 /* CallbackHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CallbackHandler.cpp; sourceTree = "<group>"; };
+		DF1AD04615FCE62E00E10810 /* CallbackHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallbackHandler.h; sourceTree = "<group>"; };
+		DF1AD04915FCE62E00E10810 /* Control.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Control.cpp; sourceTree = "<group>"; };
+		DF1AD04A15FCE62E00E10810 /* Control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Control.h; sourceTree = "<group>"; };
+		DF1AD04D15FCE62E00E10810 /* Dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Dialog.cpp; sourceTree = "<group>"; };
+		DF1AD04E15FCE62E00E10810 /* Dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Dialog.h; sourceTree = "<group>"; };
+		DF1AD05115FCE62E00E10810 /* Dictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Dictionary.h; sourceTree = "<group>"; };
+		DF1AD05215FCE62E00E10810 /* Exception.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Exception.h; sourceTree = "<group>"; };
+		DF1AD05315FCE62E00E10810 /* File.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = File.cpp; sourceTree = "<group>"; };
+		DF1AD05415FCE62E00E10810 /* File.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = File.h; sourceTree = "<group>"; };
+		DF1AD05715FCE62E00E10810 /* InfoTagMusic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InfoTagMusic.cpp; sourceTree = "<group>"; };
+		DF1AD05815FCE62E00E10810 /* InfoTagMusic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InfoTagMusic.h; sourceTree = "<group>"; };
+		DF1AD05B15FCE62E00E10810 /* InfoTagVideo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InfoTagVideo.cpp; sourceTree = "<group>"; };
+		DF1AD05C15FCE62E00E10810 /* InfoTagVideo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InfoTagVideo.h; sourceTree = "<group>"; };
+		DF1AD05F15FCE62E00E10810 /* Keyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Keyboard.cpp; sourceTree = "<group>"; };
+		DF1AD06015FCE62E00E10810 /* Keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Keyboard.h; sourceTree = "<group>"; };
+		DF1AD06315FCE62E00E10810 /* LanguageHook.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LanguageHook.cpp; sourceTree = "<group>"; };
+		DF1AD06415FCE62E00E10810 /* LanguageHook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LanguageHook.h; sourceTree = "<group>"; };
+		DF1AD06815FCE62E00E10810 /* List.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = List.h; sourceTree = "<group>"; };
+		DF1AD06915FCE62E00E10810 /* ListItem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ListItem.cpp; sourceTree = "<group>"; };
+		DF1AD06A15FCE62E00E10810 /* ListItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListItem.h; sourceTree = "<group>"; };
+		DF1AD06E15FCE62E00E10810 /* ModuleXbmc.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModuleXbmc.cpp; sourceTree = "<group>"; };
+		DF1AD06F15FCE62E00E10810 /* ModuleXbmc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleXbmc.h; sourceTree = "<group>"; };
+		DF1AD07215FCE62E00E10810 /* ModuleXbmcgui.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModuleXbmcgui.cpp; sourceTree = "<group>"; };
+		DF1AD07315FCE62E00E10810 /* ModuleXbmcgui.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleXbmcgui.h; sourceTree = "<group>"; };
+		DF1AD07615FCE62E00E10810 /* ModuleXbmcplugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModuleXbmcplugin.cpp; sourceTree = "<group>"; };
+		DF1AD07715FCE62E00E10810 /* ModuleXbmcplugin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleXbmcplugin.h; sourceTree = "<group>"; };
+		DF1AD07A15FCE62E00E10810 /* ModuleXbmcvfs.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ModuleXbmcvfs.cpp; sourceTree = "<group>"; };
+		DF1AD07B15FCE62E00E10810 /* ModuleXbmcvfs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModuleXbmcvfs.h; sourceTree = "<group>"; };
+		DF1AD07E15FCE62E00E10810 /* Monitor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Monitor.cpp; sourceTree = "<group>"; };
+		DF1AD07F15FCE62E00E10810 /* Monitor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Monitor.h; sourceTree = "<group>"; };
+		DF1AD08215FCE62E00E10810 /* Player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Player.cpp; sourceTree = "<group>"; };
+		DF1AD08315FCE62E00E10810 /* Player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Player.h; sourceTree = "<group>"; };
+		DF1AD08615FCE62E00E10810 /* PlayList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayList.cpp; sourceTree = "<group>"; };
+		DF1AD08715FCE62E00E10810 /* PlayList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayList.h; sourceTree = "<group>"; };
+		DF1AD08A15FCE62E00E10810 /* RenderCapture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RenderCapture.h; sourceTree = "<group>"; };
+		DF1AD08B15FCE62E00E10810 /* String.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = String.cpp; sourceTree = "<group>"; };
+		DF1AD08E15FCE62E00E10810 /* swighelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = swighelper.h; sourceTree = "<group>"; };
+		DF1AD08F15FCE62E00E10810 /* Tuple.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Tuple.h; sourceTree = "<group>"; };
+		DF1AD09015FCE62E00E10810 /* Window.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Window.cpp; sourceTree = "<group>"; };
+		DF1AD09115FCE62E00E10810 /* Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Window.h; sourceTree = "<group>"; };
+		DF1AD09415FCE62E00E10810 /* WindowDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowDialog.cpp; sourceTree = "<group>"; };
+		DF1AD09515FCE62E00E10810 /* WindowDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowDialog.h; sourceTree = "<group>"; };
+		DF1AD09815FCE62E00E10810 /* WindowDialogMixin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowDialogMixin.cpp; sourceTree = "<group>"; };
+		DF1AD09915FCE62E00E10810 /* WindowDialogMixin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowDialogMixin.h; sourceTree = "<group>"; };
+		DF1AD09C15FCE62E00E10810 /* WindowException.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowException.h; sourceTree = "<group>"; };
+		DF1AD09D15FCE62E00E10810 /* WindowInterceptor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowInterceptor.h; sourceTree = "<group>"; };
+		DF1AD09E15FCE62E00E10810 /* WindowXML.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WindowXML.cpp; sourceTree = "<group>"; };
+		DF1AD09F15FCE62E00E10810 /* WindowXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowXML.h; sourceTree = "<group>"; };
 		DF23460715FA671900A934F6 /* UPnP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UPnP.cpp; sourceTree = "<group>"; };
 		DF23460815FA671900A934F6 /* UPnP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnP.h; sourceTree = "<group>"; };
 		DF23460915FA671900A934F6 /* UPnPInternal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UPnPInternal.cpp; sourceTree = "<group>"; };
@@ -1234,6 +1255,7 @@
 		DF23460C15FA671900A934F6 /* UPnPRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnPRenderer.h; sourceTree = "<group>"; };
 		DF23460D15FA671900A934F6 /* UPnPServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UPnPServer.cpp; sourceTree = "<group>"; };
 		DF23460E15FA671900A934F6 /* UPnPServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UPnPServer.h; sourceTree = "<group>"; };
+		DF294E7815DAD78E004FDDEC /* addonbindings.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = addonbindings.a; path = xbmc/interfaces/addonbindings.a; sourceTree = "<group>"; };
 		DF33C2A215509C1B0046CDCB /* XbmcContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XbmcContext.cpp; sourceTree = "<group>"; };
 		DF33C2A315509C1B0046CDCB /* XbmcContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XbmcContext.h; sourceTree = "<group>"; };
 		DF33C2AB15509C5A0046CDCB /* ilog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ilog.cpp; sourceTree = "<group>"; };
@@ -2379,64 +2401,6 @@
 		F56C7560131EC152000AD0F6 /* XBMC_keysym.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_keysym.h; sourceTree = "<group>"; };
 		F56C7561131EC152000AD0F6 /* XBMC_mouse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_mouse.h; sourceTree = "<group>"; };
 		F56C7562131EC152000AD0F6 /* XBMC_vkeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_vkeys.h; sourceTree = "<group>"; };
-		F56C7567131EC152000AD0F6 /* xbmcvfsmodule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbmcvfsmodule.cpp; sourceTree = "<group>"; };
-		F56C7568131EC152000AD0F6 /* PythonAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PythonAddon.cpp; sourceTree = "<group>"; };
-		F56C7569131EC152000AD0F6 /* PythonAddon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PythonAddon.h; sourceTree = "<group>"; };
-		F56C756A131EC152000AD0F6 /* xbmcaddonmodule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbmcaddonmodule.cpp; sourceTree = "<group>"; };
-		F56C756B131EC152000AD0F6 /* controlslider.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controlslider.cpp; sourceTree = "<group>"; };
-		F56C756C131EC152000AD0F6 /* controlradiobutton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controlradiobutton.cpp; sourceTree = "<group>"; };
-		F56C756D131EC152000AD0F6 /* action.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = action.cpp; sourceTree = "<group>"; };
-		F56C756E131EC152000AD0F6 /* action.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = action.h; sourceTree = "<group>"; };
-		F56C756F131EC152000AD0F6 /* control.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = control.cpp; sourceTree = "<group>"; };
-		F56C7570131EC152000AD0F6 /* control.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = control.h; sourceTree = "<group>"; };
-		F56C7571131EC152000AD0F6 /* controlbutton.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controlbutton.cpp; sourceTree = "<group>"; };
-		F56C7572131EC152000AD0F6 /* controlcheckmark.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controlcheckmark.cpp; sourceTree = "<group>"; };
-		F56C7573131EC152000AD0F6 /* controlfadelabel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controlfadelabel.cpp; sourceTree = "<group>"; };
-		F56C7574131EC152000AD0F6 /* controlgroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controlgroup.cpp; sourceTree = "<group>"; };
-		F56C7575131EC152000AD0F6 /* controlimage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controlimage.cpp; sourceTree = "<group>"; };
-		F56C7576131EC152000AD0F6 /* controllabel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controllabel.cpp; sourceTree = "<group>"; };
-		F56C7577131EC152000AD0F6 /* controllist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controllist.cpp; sourceTree = "<group>"; };
-		F56C7578131EC152000AD0F6 /* controlprogress.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controlprogress.cpp; sourceTree = "<group>"; };
-		F56C7579131EC152000AD0F6 /* controlspin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controlspin.cpp; sourceTree = "<group>"; };
-		F56C757A131EC152000AD0F6 /* controltextbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controltextbox.cpp; sourceTree = "<group>"; };
-		F56C757B131EC152000AD0F6 /* dialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dialog.cpp; sourceTree = "<group>"; };
-		F56C757C131EC152000AD0F6 /* dialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = dialog.h; sourceTree = "<group>"; };
-		F56C757D131EC152000AD0F6 /* GUIPythonWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIPythonWindow.cpp; sourceTree = "<group>"; };
-		F56C757E131EC152000AD0F6 /* GUIPythonWindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIPythonWindow.h; sourceTree = "<group>"; };
-		F56C757F131EC152000AD0F6 /* GUIPythonWindowDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIPythonWindowDialog.cpp; sourceTree = "<group>"; };
-		F56C7580131EC152000AD0F6 /* GUIPythonWindowDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIPythonWindowDialog.h; sourceTree = "<group>"; };
-		F56C7581131EC152000AD0F6 /* GUIPythonWindowXML.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIPythonWindowXML.cpp; sourceTree = "<group>"; };
-		F56C7582131EC152000AD0F6 /* GUIPythonWindowXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIPythonWindowXML.h; sourceTree = "<group>"; };
-		F56C7583131EC152000AD0F6 /* GUIPythonWindowXMLDialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIPythonWindowXMLDialog.cpp; sourceTree = "<group>"; };
-		F56C7584131EC152000AD0F6 /* GUIPythonWindowXMLDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIPythonWindowXMLDialog.h; sourceTree = "<group>"; };
-		F56C7585131EC152000AD0F6 /* infotagmusic.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = infotagmusic.cpp; sourceTree = "<group>"; };
-		F56C7586131EC152000AD0F6 /* infotagmusic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = infotagmusic.h; sourceTree = "<group>"; };
-		F56C7587131EC152000AD0F6 /* infotagvideo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = infotagvideo.cpp; sourceTree = "<group>"; };
-		F56C7588131EC152000AD0F6 /* infotagvideo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = infotagvideo.h; sourceTree = "<group>"; };
-		F56C7589131EC152000AD0F6 /* keyboard.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = keyboard.cpp; sourceTree = "<group>"; };
-		F56C758A131EC152000AD0F6 /* keyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = keyboard.h; sourceTree = "<group>"; };
-		F56C758B131EC152000AD0F6 /* listitem.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = listitem.cpp; sourceTree = "<group>"; };
-		F56C758C131EC152000AD0F6 /* listitem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = listitem.h; sourceTree = "<group>"; };
-		F56C758D131EC152000AD0F6 /* player.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = player.cpp; sourceTree = "<group>"; };
-		F56C758E131EC152000AD0F6 /* player.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = player.h; sourceTree = "<group>"; };
-		F56C758F131EC152000AD0F6 /* pyplaylist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pyplaylist.cpp; sourceTree = "<group>"; };
-		F56C7590131EC152000AD0F6 /* pyplaylist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pyplaylist.h; sourceTree = "<group>"; };
-		F56C7591131EC152000AD0F6 /* PythonPlayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PythonPlayer.cpp; sourceTree = "<group>"; };
-		F56C7592131EC152000AD0F6 /* PythonPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PythonPlayer.h; sourceTree = "<group>"; };
-		F56C7593131EC152000AD0F6 /* pyutil.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pyutil.cpp; sourceTree = "<group>"; };
-		F56C7594131EC152000AD0F6 /* pyutil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pyutil.h; sourceTree = "<group>"; };
-		F56C7595131EC152000AD0F6 /* window.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = window.cpp; sourceTree = "<group>"; };
-		F56C7596131EC152000AD0F6 /* window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = window.h; sourceTree = "<group>"; };
-		F56C7597131EC152000AD0F6 /* winxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winxml.cpp; sourceTree = "<group>"; };
-		F56C7598131EC152000AD0F6 /* winxml.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = winxml.h; sourceTree = "<group>"; };
-		F56C7599131EC152000AD0F6 /* winxmldialog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = winxmldialog.cpp; sourceTree = "<group>"; };
-		F56C759A131EC152000AD0F6 /* xbmcguimodule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbmcguimodule.cpp; sourceTree = "<group>"; };
-		F56C759B131EC152000AD0F6 /* xbmcmodule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbmcmodule.cpp; sourceTree = "<group>"; };
-		F56C759C131EC152000AD0F6 /* xbmcplugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xbmcplugin.cpp; sourceTree = "<group>"; };
-		F56C759D131EC152000AD0F6 /* XBPython.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPython.cpp; sourceTree = "<group>"; };
-		F56C759E131EC152000AD0F6 /* XBPython.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPython.h; sourceTree = "<group>"; };
-		F56C75A1131EC152000AD0F6 /* XBPyThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBPyThread.cpp; sourceTree = "<group>"; };
-		F56C75A2131EC152000AD0F6 /* XBPyThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBPyThread.h; sourceTree = "<group>"; };
 		F56C75A3131EC152000AD0F6 /* AnnouncementManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnnouncementManager.cpp; sourceTree = "<group>"; };
 		F56C75A4131EC152000AD0F6 /* AnnouncementManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnnouncementManager.h; sourceTree = "<group>"; };
 		F56C75A5131EC153000AD0F6 /* Builtins.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Builtins.cpp; sourceTree = "<group>"; };
@@ -3237,8 +3201,6 @@
 		F5E1131A14357B6500175026 /* Peripherals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Peripherals.cpp; sourceTree = "<group>"; };
 		F5E1131B14357B6500175026 /* Peripherals.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Peripherals.h; sourceTree = "<group>"; };
 		F5E1131C14357B6500175026 /* PeripheralTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PeripheralTypes.h; sourceTree = "<group>"; };
-		F5E113AC1435882400175026 /* pyrendercapture.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = pyrendercapture.cpp; sourceTree = "<group>"; };
-		F5E113AE1435882900175026 /* pyrendercapture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = pyrendercapture.h; sourceTree = "<group>"; };
 		F5E6209D13E9081400D5F2CD /* InfoBool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InfoBool.cpp; sourceTree = "<group>"; };
 		F5E6209E13E9081400D5F2CD /* InfoBool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InfoBool.h; sourceTree = "<group>"; };
 		F5ED8D911551FAEA00842059 /* BlurayDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlurayDirectory.cpp; sourceTree = "<group>"; };
@@ -3276,6 +3238,7 @@
 				F56B161B12CD69DB009B4C96 /* ImageIO.framework in Frameworks */,
 				4D5D2E131301753F006ABC13 /* CFNetwork.framework in Frameworks */,
 				18404DFD1396C44F00863BBA /* SlingboxLib.a in Frameworks */,
+				DF294E7915DAD78E004FDDEC /* addonbindings.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3449,6 +3412,96 @@
 			path = windows;
 			sourceTree = "<group>";
 		};
+		DF1AD01415FCE5AF00E10810 /* python */ = {
+			isa = PBXGroup;
+			children = (
+				DF1AD01515FCE5C600E10810 /* generated */,
+			);
+			name = python;
+			sourceTree = "<group>";
+		};
+		DF1AD01515FCE5C600E10810 /* generated */ = {
+			isa = PBXGroup;
+			children = (
+				DF1AD01615FCE5C600E10810 /* AddonModuleXbmc.cpp */,
+				DF1AD01A15FCE5C600E10810 /* AddonModuleXbmcaddon.cpp */,
+				DF1AD01E15FCE5C600E10810 /* AddonModuleXbmcgui.cpp */,
+				DF1AD02215FCE5C600E10810 /* AddonModuleXbmcplugin.cpp */,
+				DF1AD02615FCE5C600E10810 /* AddonModuleXbmcvfs.cpp */,
+			);
+			name = generated;
+			path = python/generated;
+			sourceTree = "<group>";
+		};
+		DF1AD02D15FCE62E00E10810 /* legacy */ = {
+			isa = PBXGroup;
+			children = (
+				DF1AD02E15FCE62E00E10810 /* Addon.cpp */,
+				DF1AD02F15FCE62E00E10810 /* Addon.h */,
+				DF1AD03215FCE62E00E10810 /* AddonCallback.cpp */,
+				DF1AD03315FCE62E00E10810 /* AddonCallback.h */,
+				DF1AD03615FCE62E00E10810 /* AddonClass.cpp */,
+				DF1AD03715FCE62E00E10810 /* AddonClass.h */,
+				DF1AD03A15FCE62E00E10810 /* AddonString.h */,
+				DF1AD03B15FCE62E00E10810 /* AddonUtils.cpp */,
+				DF1AD03C15FCE62E00E10810 /* AddonUtils.h */,
+				DF1AD03F15FCE62E00E10810 /* Alternative.h */,
+				DF1AD04015FCE62E00E10810 /* aojsonrpc.h */,
+				DF1AD04115FCE62E00E10810 /* CallbackFunction.cpp */,
+				DF1AD04215FCE62E00E10810 /* CallbackFunction.h */,
+				DF1AD04515FCE62E00E10810 /* CallbackHandler.cpp */,
+				DF1AD04615FCE62E00E10810 /* CallbackHandler.h */,
+				DF1AD04915FCE62E00E10810 /* Control.cpp */,
+				DF1AD04A15FCE62E00E10810 /* Control.h */,
+				DF1AD04D15FCE62E00E10810 /* Dialog.cpp */,
+				DF1AD04E15FCE62E00E10810 /* Dialog.h */,
+				DF1AD05115FCE62E00E10810 /* Dictionary.h */,
+				DF1AD05215FCE62E00E10810 /* Exception.h */,
+				DF1AD05315FCE62E00E10810 /* File.cpp */,
+				DF1AD05415FCE62E00E10810 /* File.h */,
+				DF1AD05715FCE62E00E10810 /* InfoTagMusic.cpp */,
+				DF1AD05815FCE62E00E10810 /* InfoTagMusic.h */,
+				DF1AD05B15FCE62E00E10810 /* InfoTagVideo.cpp */,
+				DF1AD05C15FCE62E00E10810 /* InfoTagVideo.h */,
+				DF1AD05F15FCE62E00E10810 /* Keyboard.cpp */,
+				DF1AD06015FCE62E00E10810 /* Keyboard.h */,
+				DF1AD06315FCE62E00E10810 /* LanguageHook.cpp */,
+				DF1AD06415FCE62E00E10810 /* LanguageHook.h */,
+				DF1AD06815FCE62E00E10810 /* List.h */,
+				DF1AD06915FCE62E00E10810 /* ListItem.cpp */,
+				DF1AD06A15FCE62E00E10810 /* ListItem.h */,
+				DF1AD06E15FCE62E00E10810 /* ModuleXbmc.cpp */,
+				DF1AD06F15FCE62E00E10810 /* ModuleXbmc.h */,
+				DF1AD07215FCE62E00E10810 /* ModuleXbmcgui.cpp */,
+				DF1AD07315FCE62E00E10810 /* ModuleXbmcgui.h */,
+				DF1AD07615FCE62E00E10810 /* ModuleXbmcplugin.cpp */,
+				DF1AD07715FCE62E00E10810 /* ModuleXbmcplugin.h */,
+				DF1AD07A15FCE62E00E10810 /* ModuleXbmcvfs.cpp */,
+				DF1AD07B15FCE62E00E10810 /* ModuleXbmcvfs.h */,
+				DF1AD07E15FCE62E00E10810 /* Monitor.cpp */,
+				DF1AD07F15FCE62E00E10810 /* Monitor.h */,
+				DF1AD08215FCE62E00E10810 /* Player.cpp */,
+				DF1AD08315FCE62E00E10810 /* Player.h */,
+				DF1AD08615FCE62E00E10810 /* PlayList.cpp */,
+				DF1AD08715FCE62E00E10810 /* PlayList.h */,
+				DF1AD08A15FCE62E00E10810 /* RenderCapture.h */,
+				DF1AD08B15FCE62E00E10810 /* String.cpp */,
+				DF1AD08E15FCE62E00E10810 /* swighelper.h */,
+				DF1AD08F15FCE62E00E10810 /* Tuple.h */,
+				DF1AD09015FCE62E00E10810 /* Window.cpp */,
+				DF1AD09115FCE62E00E10810 /* Window.h */,
+				DF1AD09415FCE62E00E10810 /* WindowDialog.cpp */,
+				DF1AD09515FCE62E00E10810 /* WindowDialog.h */,
+				DF1AD09815FCE62E00E10810 /* WindowDialogMixin.cpp */,
+				DF1AD09915FCE62E00E10810 /* WindowDialogMixin.h */,
+				DF1AD09C15FCE62E00E10810 /* WindowException.h */,
+				DF1AD09D15FCE62E00E10810 /* WindowInterceptor.h */,
+				DF1AD09E15FCE62E00E10810 /* WindowXML.cpp */,
+				DF1AD09F15FCE62E00E10810 /* WindowXML.h */,
+			);
+			path = legacy;
+			sourceTree = "<group>";
+		};
 		DF23460515FA671900A934F6 /* upnp */ = {
 			isa = PBXGroup;
 			children = (
@@ -5146,7 +5199,8 @@
 				F5AE40E5134175160004BD79 /* http-api */,
 				F5E6209C13E9081400D5F2CD /* info */,
 				F5AE40EC1341751E0004BD79 /* json-rpc */,
-				F56C7564131EC152000AD0F6 /* python */,
+				DF1AD02D15FCE62E00E10810 /* legacy */,
+				DF1AD01415FCE5AF00E10810 /* python */,
 				F56C75A3131EC152000AD0F6 /* AnnouncementManager.cpp */,
 				F56C75A4131EC152000AD0F6 /* AnnouncementManager.h */,
 				F56C75A5131EC153000AD0F6 /* Builtins.cpp */,
@@ -5156,86 +5210,6 @@
 			path = interfaces;
 			sourceTree = "<group>";
 		};
-		F56C7564131EC152000AD0F6 /* python */ = {
-			isa = PBXGroup;
-			children = (
-				F56C7566131EC152000AD0F6 /* xbmcmodule */,
-				F56C759D131EC152000AD0F6 /* XBPython.cpp */,
-				F56C759E131EC152000AD0F6 /* XBPython.h */,
-				F56C75A1131EC152000AD0F6 /* XBPyThread.cpp */,
-				F56C75A2131EC152000AD0F6 /* XBPyThread.h */,
-			);
-			path = python;
-			sourceTree = "<group>";
-		};
-		F56C7566131EC152000AD0F6 /* xbmcmodule */ = {
-			isa = PBXGroup;
-			children = (
-				F56C756D131EC152000AD0F6 /* action.cpp */,
-				F56C756E131EC152000AD0F6 /* action.h */,
-				F56C756F131EC152000AD0F6 /* control.cpp */,
-				F56C7570131EC152000AD0F6 /* control.h */,
-				F56C7571131EC152000AD0F6 /* controlbutton.cpp */,
-				F56C7572131EC152000AD0F6 /* controlcheckmark.cpp */,
-				1830215F13B8E35300770920 /* controledit.cpp */,
-				F56C7573131EC152000AD0F6 /* controlfadelabel.cpp */,
-				F56C7574131EC152000AD0F6 /* controlgroup.cpp */,
-				F56C7575131EC152000AD0F6 /* controlimage.cpp */,
-				F56C7576131EC152000AD0F6 /* controllabel.cpp */,
-				F56C7577131EC152000AD0F6 /* controllist.cpp */,
-				F56C7578131EC152000AD0F6 /* controlprogress.cpp */,
-				F56C756C131EC152000AD0F6 /* controlradiobutton.cpp */,
-				F56C756B131EC152000AD0F6 /* controlslider.cpp */,
-				F56C7579131EC152000AD0F6 /* controlspin.cpp */,
-				F56C757A131EC152000AD0F6 /* controltextbox.cpp */,
-				F56C757B131EC152000AD0F6 /* dialog.cpp */,
-				F56C757C131EC152000AD0F6 /* dialog.h */,
-				F56C757D131EC152000AD0F6 /* GUIPythonWindow.cpp */,
-				F56C757E131EC152000AD0F6 /* GUIPythonWindow.h */,
-				F56C757F131EC152000AD0F6 /* GUIPythonWindowDialog.cpp */,
-				F56C7580131EC152000AD0F6 /* GUIPythonWindowDialog.h */,
-				F56C7581131EC152000AD0F6 /* GUIPythonWindowXML.cpp */,
-				F56C7582131EC152000AD0F6 /* GUIPythonWindowXML.h */,
-				F56C7583131EC152000AD0F6 /* GUIPythonWindowXMLDialog.cpp */,
-				F56C7584131EC152000AD0F6 /* GUIPythonWindowXMLDialog.h */,
-				F56C7585131EC152000AD0F6 /* infotagmusic.cpp */,
-				F56C7586131EC152000AD0F6 /* infotagmusic.h */,
-				F56C7587131EC152000AD0F6 /* infotagvideo.cpp */,
-				F56C7588131EC152000AD0F6 /* infotagvideo.h */,
-				F56C7589131EC152000AD0F6 /* keyboard.cpp */,
-				F56C758A131EC152000AD0F6 /* keyboard.h */,
-				F56C758B131EC152000AD0F6 /* listitem.cpp */,
-				F56C758C131EC152000AD0F6 /* listitem.h */,
-				C8936061152C86F500812418 /* monitor.cpp */,
-				C8936062152C86F500812418 /* monitor.h */,
-				F56C758D131EC152000AD0F6 /* player.cpp */,
-				F56C758E131EC152000AD0F6 /* player.h */,
-				F56C758F131EC152000AD0F6 /* pyplaylist.cpp */,
-				F56C7590131EC152000AD0F6 /* pyplaylist.h */,
-				F5E113AC1435882400175026 /* pyrendercapture.cpp */,
-				F5E113AE1435882900175026 /* pyrendercapture.h */,
-				F56C7568131EC152000AD0F6 /* PythonAddon.cpp */,
-				F56C7569131EC152000AD0F6 /* PythonAddon.h */,
-				C893605E152C86EC00812418 /* PythonMonitor.cpp */,
-				C893605F152C86EC00812418 /* PythonMonitor.h */,
-				F56C7591131EC152000AD0F6 /* PythonPlayer.cpp */,
-				F56C7592131EC152000AD0F6 /* PythonPlayer.h */,
-				F56C7593131EC152000AD0F6 /* pyutil.cpp */,
-				F56C7594131EC152000AD0F6 /* pyutil.h */,
-				F56C7595131EC152000AD0F6 /* window.cpp */,
-				F56C7596131EC152000AD0F6 /* window.h */,
-				F56C7597131EC152000AD0F6 /* winxml.cpp */,
-				F56C7598131EC152000AD0F6 /* winxml.h */,
-				F56C7599131EC152000AD0F6 /* winxmldialog.cpp */,
-				F56C756A131EC152000AD0F6 /* xbmcaddonmodule.cpp */,
-				F56C759A131EC152000AD0F6 /* xbmcguimodule.cpp */,
-				F56C759B131EC152000AD0F6 /* xbmcmodule.cpp */,
-				F56C759C131EC152000AD0F6 /* xbmcplugin.cpp */,
-				F56C7567131EC152000AD0F6 /* xbmcvfsmodule.cpp */,
-			);
-			path = xbmcmodule;
-			sourceTree = "<group>";
-		};
 		F56C75A8131EC153000AD0F6 /* linux */ = {
 			isa = PBXGroup;
 			children = (
@@ -6399,6 +6373,7 @@
 		F589AE6D12890B6700D8079E /* Internal Libs */ = {
 			isa = PBXGroup;
 			children = (
+				DF294E7815DAD78E004FDDEC /* addonbindings.a */,
 				F589AE7012890B9E00D8079E /* libapetag.a */,
 				F589AE7E12890BEF00D8079E /* librtv.a */,
 				F589AE7D12890BEF00D8079E /* libsquish.a */,
@@ -7066,44 +7041,6 @@
 				F56C7A47131EC155000AD0F6 /* KeyboardStat.cpp in Sources */,
 				F56C7A48131EC155000AD0F6 /* MouseStat.cpp in Sources */,
 				F56C7A49131EC155000AD0F6 /* SDLJoystick.cpp in Sources */,
-				F56C7A4B131EC155000AD0F6 /* xbmcvfsmodule.cpp in Sources */,
-				F56C7A4C131EC155000AD0F6 /* PythonAddon.cpp in Sources */,
-				F56C7A4D131EC155000AD0F6 /* xbmcaddonmodule.cpp in Sources */,
-				F56C7A4E131EC155000AD0F6 /* controlslider.cpp in Sources */,
-				F56C7A4F131EC155000AD0F6 /* controlradiobutton.cpp in Sources */,
-				F56C7A50131EC155000AD0F6 /* action.cpp in Sources */,
-				F56C7A51131EC155000AD0F6 /* control.cpp in Sources */,
-				F56C7A52131EC155000AD0F6 /* controlbutton.cpp in Sources */,
-				F56C7A53131EC155000AD0F6 /* controlcheckmark.cpp in Sources */,
-				F56C7A54131EC155000AD0F6 /* controlfadelabel.cpp in Sources */,
-				F56C7A55131EC155000AD0F6 /* controlgroup.cpp in Sources */,
-				F56C7A56131EC155000AD0F6 /* controlimage.cpp in Sources */,
-				F56C7A57131EC155000AD0F6 /* controllabel.cpp in Sources */,
-				F56C7A58131EC155000AD0F6 /* controllist.cpp in Sources */,
-				F56C7A59131EC155000AD0F6 /* controlprogress.cpp in Sources */,
-				F56C7A5A131EC155000AD0F6 /* controlspin.cpp in Sources */,
-				F56C7A5B131EC155000AD0F6 /* controltextbox.cpp in Sources */,
-				F56C7A5C131EC155000AD0F6 /* dialog.cpp in Sources */,
-				F56C7A5D131EC155000AD0F6 /* GUIPythonWindow.cpp in Sources */,
-				F56C7A5E131EC155000AD0F6 /* GUIPythonWindowDialog.cpp in Sources */,
-				F56C7A5F131EC155000AD0F6 /* GUIPythonWindowXML.cpp in Sources */,
-				F56C7A60131EC155000AD0F6 /* GUIPythonWindowXMLDialog.cpp in Sources */,
-				F56C7A61131EC155000AD0F6 /* infotagmusic.cpp in Sources */,
-				F56C7A62131EC155000AD0F6 /* infotagvideo.cpp in Sources */,
-				F56C7A63131EC155000AD0F6 /* keyboard.cpp in Sources */,
-				F56C7A64131EC155000AD0F6 /* listitem.cpp in Sources */,
-				F56C7A65131EC155000AD0F6 /* player.cpp in Sources */,
-				F56C7A66131EC155000AD0F6 /* pyplaylist.cpp in Sources */,
-				F56C7A67131EC155000AD0F6 /* PythonPlayer.cpp in Sources */,
-				F56C7A68131EC155000AD0F6 /* pyutil.cpp in Sources */,
-				F56C7A69131EC155000AD0F6 /* window.cpp in Sources */,
-				F56C7A6A131EC155000AD0F6 /* winxml.cpp in Sources */,
-				F56C7A6B131EC155000AD0F6 /* winxmldialog.cpp in Sources */,
-				F56C7A6C131EC155000AD0F6 /* xbmcguimodule.cpp in Sources */,
-				F56C7A6D131EC155000AD0F6 /* xbmcmodule.cpp in Sources */,
-				F56C7A6E131EC155000AD0F6 /* xbmcplugin.cpp in Sources */,
-				F56C7A6F131EC155000AD0F6 /* XBPython.cpp in Sources */,
-				F56C7A71131EC155000AD0F6 /* XBPyThread.cpp in Sources */,
 				F56C7A72131EC155000AD0F6 /* AnnouncementManager.cpp in Sources */,
 				F56C7A73131EC155000AD0F6 /* Builtins.cpp in Sources */,
 				F56C7A75131EC155000AD0F6 /* ConvUtils.cpp in Sources */,
@@ -7469,7 +7406,6 @@
 				7C0A7FCC13A9E76E00AFC2BD /* GUIWindowDebugInfo.cpp in Sources */,
 				DF0DF16D13A3AF82008ED511 /* NFSDirectory.cpp in Sources */,
 				7C89627013B702F3003631FE /* GUIWindowScreensaverDim.cpp in Sources */,
-				1830216013B8E35300770920 /* controledit.cpp in Sources */,
 				18ECC9AA13CF17EB00A9ED6C /* StreamUtils.cpp in Sources */,
 				F5CEE72C13D3F9AC00225F72 /* DVDOverlayCodecTX3G.cpp in Sources */,
 				DFD4D22013D7286E00A47C47 /* Implementation.cpp in Sources */,
@@ -7500,7 +7436,6 @@
 				F5E1132714357B6500175026 /* GUIDialogPeripheralManager.cpp in Sources */,
 				F5E1132814357B6500175026 /* GUIDialogPeripheralSettings.cpp in Sources */,
 				F5E1132914357B6500175026 /* Peripherals.cpp in Sources */,
-				F5E113AD1435882400175026 /* pyrendercapture.cpp in Sources */,
 				F5BD033A148D4923001B5583 /* CryptThreading.cpp in Sources */,
 				7CCFD9AA1514952700211D82 /* PCMCodec.cpp in Sources */,
 				DF527780151BAFD600B5B63B /* WebSocket.cpp in Sources */,
@@ -7550,8 +7485,6 @@
 				DFDB004B1516408F005079A4 /* FileCache.cpp in Sources */,
 				DFDB004C1516408F005079A4 /* MemBufferCache.cpp in Sources */,
 				7C1A89BB152671FB00C63311 /* TextureCacheJob.cpp in Sources */,
-				C8936060152C86EC00812418 /* PythonMonitor.cpp in Sources */,
-				C8936063152C86F500812418 /* monitor.cpp in Sources */,
 				DFFD594F1506B6300088DE4B /* IOSEAGLView.mm in Sources */,
 				DFFEFBDB151606CB001294DC /* IOSScreenManager.mm in Sources */,
 				DFFEFC2215160927001294DC /* IOSExternalTouchController.mm in Sources */,
@@ -7749,6 +7682,8 @@
 					"\"$(SRCROOT)/lib/ffmpeg/libswresample\"",
 					"\"$(SRCROOT)/lib/ffmpeg/libpostproc\"",
 					"\"$(SRCROOT)/lib/ffmpeg/libswscale\"",
+					"\"$(SRCROOT)/xbmc/interfaces\"",
+					"\"$(SRCROOT)/xbmc/interfaces/legacy\"",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",
@@ -7870,6 +7805,8 @@
 					"\"$(SRCROOT)/lib/ffmpeg/libswresample\"",
 					"\"$(SRCROOT)/lib/ffmpeg/libpostproc\"",
 					"\"$(SRCROOT)/lib/ffmpeg/libswscale\"",
+					"\"$(SRCROOT)/xbmc/interfaces\"",
+					"\"$(SRCROOT)/xbmc/interfaces/legacy\"",
 				);
 				OTHER_CPLUSPLUSFLAGS = (
 					"$(OTHER_CFLAGS)",