[ios/atv2/osx] - clean xcode projects - fixed sorting - synced optimisations on ios/atv2 (Debug - none, Release -O2)

1 files changed, 292 insertions, 303 deletions

diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj
index 291ef4be37..1aac19c2a6 100644
--- a/XBMC-IOS.xcodeproj/project.pbxproj
+++ b/XBMC-IOS.xcodeproj/project.pbxproj
@@ -45,7 +45,6 @@
 		DFD4D1E213D725ED00A47C47 /* Implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D1D813D725ED00A47C47 /* Implementation.cpp */; };
 		DFD4D1E713D7263000A47C47 /* README.platform in Resources */ = {isa = PBXBuildFile; fileRef = DFD4D1E613D7263000A47C47 /* README.platform */; };
 		DFD4D1FE13D7283500A47C47 /* SystemClock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D1FC13D7283500A47C47 /* SystemClock.cpp */; };
-		F54D9E8112B713F8006870F9 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F54D9E8012B713F8006870F9 /* libc.dylib */; };
 		F56B143412CAF279009B4C96 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B143312CAF279009B4C96 /* CoreVideo.framework */; };
 		F56B14A512CAF523009B4C96 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B14A412CAF523009B4C96 /* AudioToolbox.framework */; };
 		F56B15D512CD67A9009B4C96 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15D412CD67A9009B4C96 /* CoreGraphics.framework */; };
@@ -1027,7 +1026,6 @@
 		DFD4D1E613D7263000A47C47 /* README.platform */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.platform; sourceTree = "<group>"; };
 		DFD4D1FC13D7283500A47C47 /* SystemClock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SystemClock.cpp; sourceTree = "<group>"; };
 		DFD4D1FD13D7283500A47C47 /* SystemClock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SystemClock.h; sourceTree = "<group>"; };
-		F54D9E8012B713F8006870F9 /* libc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libc.dylib; path = usr/lib/libc.dylib; sourceTree = SDKROOT; };
 		F558F60613AFDC1700631E12 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
 		F558F61013AFDC3000631E12 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
 		F56B143312CAF279009B4C96 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
@@ -2969,7 +2967,6 @@
 				F5A29EC312A7221B003A610C /* CoreMedia.framework in Frameworks */,
 				F5A29F2712A72246003A610C /* VideoToolbox.framework in Frameworks */,
 				3255316612B2D02400837CD2 /* CoreAudio.framework in Frameworks */,
-				F54D9E8112B713F8006870F9 /* libc.dylib in Frameworks */,
 				F56B143412CAF279009B4C96 /* CoreVideo.framework in Frameworks */,
 				F56B14A512CAF523009B4C96 /* AudioToolbox.framework in Frameworks */,
 				F56B15D512CD67A9009B4C96 /* CoreGraphics.framework in Frameworks */,
@@ -2990,10 +2987,10 @@
 			isa = PBXGroup;
 			children = (
 				83D619BA13C0D23400418A0F /* Documentation */,
-				F56C8034131F42E5000AD0F6 /* Source */,
 				F589AE6D12890B6700D8079E /* Internal Libs */,
-				F5899DC91287212700D8079E /* System Libs and Frameworks */,
 				19C28FB6FE9D52B211CA2CBB /* Products */,
+				F56C8034131F42E5000AD0F6 /* Source */,
+				F5899DC91287212700D8079E /* System Libs and Frameworks */,
 			);
 			name = "XBMC-frapp";
 			sourceTree = "<group>";
@@ -3017,10 +3014,10 @@
 		DFD4D1D013D725ED00A47C47 /* platform */ = {
 			isa = PBXGroup;
 			children = (
-				DFD4D1E613D7263000A47C47 /* README.platform */,
+				DFD4D1D513D725ED00A47C47 /* pthreads */,
 				DFD4D1D113D725ED00A47C47 /* Condition.h */,
 				DFD4D1D213D725ED00A47C47 /* CriticalSection.h */,
-				DFD4D1D513D725ED00A47C47 /* pthreads */,
+				DFD4D1E613D7263000A47C47 /* README.platform */,
 				DFD4D1DB13D725ED00A47C47 /* ThreadLocal.h */,
 			);
 			path = platform;
@@ -3049,15 +3046,6 @@
 		F56C8035131F42E5000AD0F6 /* lib */ = {
 			isa = PBXGroup;
 			children = (
-				F56C8036131F42E5000AD0F6 /* DllAdpcm.h */,
-				F56C8037131F42E5000AD0F6 /* DllASAP.h */,
-				F56C8038131F42E5000AD0F6 /* DllLibFlac.h */,
-				F56C8039131F42E5000AD0F6 /* DllNosefart.h */,
-				F56C803A131F42E5000AD0F6 /* DllSidplay2.h */,
-				F56C803B131F42E5000AD0F6 /* DllStSound.h */,
-				F56C803C131F42E5000AD0F6 /* DllTimidity.h */,
-				F56C803D131F42E5000AD0F6 /* DllVorbisfile.h */,
-				F56C803F131F42E5000AD0F6 /* tinyXML */,
 				F56C8046131F42E5000AD0F6 /* libexif */,
 				F56C8048131F42E5000AD0F6 /* libhdhomerun */,
 				F56C8051131F42E5000AD0F6 /* libhts */,
@@ -3066,7 +3054,16 @@
 				F56C806E131F42E5000AD0F6 /* libsquish */,
 				F56C8070131F42E5000AD0F6 /* libUPnP */,
 				F56C8146131F42E6000AD0F6 /* libXDAAP */,
+				F56C803F131F42E5000AD0F6 /* tinyXML */,
 				F56C814C131F42E6000AD0F6 /* UnrarXLib */,
+				F56C8036131F42E5000AD0F6 /* DllAdpcm.h */,
+				F56C8037131F42E5000AD0F6 /* DllASAP.h */,
+				F56C8038131F42E5000AD0F6 /* DllLibFlac.h */,
+				F56C8039131F42E5000AD0F6 /* DllNosefart.h */,
+				F56C803A131F42E5000AD0F6 /* DllSidplay2.h */,
+				F56C803B131F42E5000AD0F6 /* DllStSound.h */,
+				F56C803C131F42E5000AD0F6 /* DllTimidity.h */,
+				F56C803D131F42E5000AD0F6 /* DllVorbisfile.h */,
 			);
 			path = lib;
 			sourceTree = "<group>";
@@ -3165,9 +3162,9 @@
 		F56C8070131F42E5000AD0F6 /* libUPnP */ = {
 			isa = PBXGroup;
 			children = (
+				F56C8073131F42E5000AD0F6 /* Platinum */,
 				F56C8071131F42E5000AD0F6 /* README.txt */,
 				F56C8072131F42E5000AD0F6 /* SConstruct */,
-				F56C8073131F42E5000AD0F6 /* Platinum */,
 			);
 			path = libUPnP;
 			sourceTree = "<group>";
@@ -3175,11 +3172,11 @@
 		F56C8073131F42E5000AD0F6 /* Platinum */ = {
 			isa = PBXGroup;
 			children = (
+				F56C8078131F42E5000AD0F6 /* Source */,
 				F56C8074131F42E5000AD0F6 /* CHANGELOG.txt */,
 				F56C8075131F42E5000AD0F6 /* LICENSE.txt */,
 				F56C8076131F42E5000AD0F6 /* README.txt */,
 				F56C8077131F42E5000AD0F6 /* SConstruct */,
-				F56C8078131F42E5000AD0F6 /* Source */,
 			);
 			path = Platinum;
 			sourceTree = "<group>";
@@ -3187,15 +3184,15 @@
 		F56C8078131F42E5000AD0F6 /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				F56C80CB131F42E5000AD0F6 /* Platinum.h */,
-				F56C80CC131F42E5000AD0F6 /* PltVersion.h */,
 				F56C80CD131F42E5000AD0F6 /* Apps */,
 				F56C80D5131F42E6000AD0F6 /* Core */,
 				F56C810F131F42E6000AD0F6 /* Devices */,
+				F56C8079131F42E5000AD0F6 /* System */,
 				F56C8138131F42E6000AD0F6 /* Tests */,
 				F56C8140131F42E6000AD0F6 /* Tools */,
+				F56C80CB131F42E5000AD0F6 /* Platinum.h */,
 				F56C8144131F42E6000AD0F6 /* PltSvnVersion.h */,
-				F56C8079131F42E5000AD0F6 /* System */,
+				F56C80CC131F42E5000AD0F6 /* PltVersion.h */,
 			);
 			path = Source;
 			sourceTree = "<group>";
@@ -3536,8 +3533,6 @@
 		F56C814C131F42E6000AD0F6 /* UnrarXLib */ = {
 			isa = PBXGroup;
 			children = (
-				F56C814D131F42E6000AD0F6 /* rar.cpp */,
-				F56C814E131F42E6000AD0F6 /* unpack.cpp */,
 				F56C814F131F42E6000AD0F6 /* archive.cpp */,
 				F56C8150131F42E6000AD0F6 /* archive.hpp */,
 				F56C8151131F42E6000AD0F6 /* arcread.cpp */,
@@ -3594,6 +3589,7 @@
 				F56C8184131F42E6000AD0F6 /* os.hpp */,
 				F56C8185131F42E6000AD0F6 /* pathfn.cpp */,
 				F56C8186131F42E6000AD0F6 /* pathfn.hpp */,
+				F56C814D131F42E6000AD0F6 /* rar.cpp */,
 				F56C8187131F42E6000AD0F6 /* rar.hpp */,
 				F56C8188131F42E6000AD0F6 /* rardefs.hpp */,
 				F56C8189131F42E6000AD0F6 /* rarfn.hpp */,
@@ -3636,6 +3632,7 @@
 				F56C81AE131F42E6000AD0F6 /* ulinks.hpp */,
 				F56C81AF131F42E6000AD0F6 /* unicode.cpp */,
 				F56C81B0131F42E6000AD0F6 /* unicode.hpp */,
+				F56C814E131F42E6000AD0F6 /* unpack.cpp */,
 				F56C81B1131F42E6000AD0F6 /* unpack.hpp */,
 				F56C81B2131F42E6000AD0F6 /* unrar.h */,
 				F56C81B3131F42E6000AD0F6 /* UnrarX.hpp */,
@@ -3678,9 +3675,6 @@
 				F56C8768131F42EC000AD0F6 /* video */,
 				F56C879A131F42EC000AD0F6 /* windowing */,
 				F56C87A5131F42EC000AD0F6 /* windows */,
-				F56C87B8131F42ED000AD0F6 /* config.h */,
-				F56C87B9131F42ED000AD0F6 /* SystemGlobals.cpp */,
-				F56C87BA131F42ED000AD0F6 /* ViewState.h */,
 				F56C87BB131F42ED000AD0F6 /* Application.cpp */,
 				F56C87BC131F42ED000AD0F6 /* Application.h */,
 				F56C87BD131F42ED000AD0F6 /* ApplicationMessenger.cpp */,
@@ -3691,10 +3685,9 @@
 				F56C87C2131F42ED000AD0F6 /* AutoSwitch.h */,
 				F56C87C3131F42ED000AD0F6 /* BackgroundInfoLoader.cpp */,
 				F56C87C4131F42ED000AD0F6 /* BackgroundInfoLoader.h */,
+				F56C87B8131F42ED000AD0F6 /* config.h */,
 				F56C87C5131F42ED000AD0F6 /* CueDocument.cpp */,
 				F56C87C6131F42ED000AD0F6 /* CueDocument.h */,
-				F56C87C7131F42ED000AD0F6 /* XBDateTime.cpp */,
-				F56C87C8131F42ED000AD0F6 /* XBDateTime.h */,
 				F56C87C9131F42ED000AD0F6 /* DynamicDll.cpp */,
 				F56C87CA131F42ED000AD0F6 /* DynamicDll.h */,
 				F56C87CB131F42ED000AD0F6 /* Favourites.cpp */,
@@ -3719,16 +3712,17 @@
 				F56C87DE131F42ED000AD0F6 /* MediaSource.h */,
 				F56C87DF131F42ED000AD0F6 /* NfoFile.cpp */,
 				F56C87E0131F42ED000AD0F6 /* NfoFile.h */,
-				F56C87E1131F42ED000AD0F6 /* PasswordManager.cpp */,
-				F56C87E2131F42ED000AD0F6 /* PasswordManager.h */,
 				F56C87E3131F42ED000AD0F6 /* PartyModeManager.cpp */,
 				F56C87E4131F42ED000AD0F6 /* PartyModeManager.h */,
+				F56C87E1131F42ED000AD0F6 /* PasswordManager.cpp */,
+				F56C87E2131F42ED000AD0F6 /* PasswordManager.h */,
 				F56C87E5131F42ED000AD0F6 /* PlayListPlayer.cpp */,
 				F56C87E6131F42ED000AD0F6 /* PlayListPlayer.h */,
 				F56C87E7131F42ED000AD0F6 /* SectionLoader.cpp */,
 				F56C87E8131F42ED000AD0F6 /* SectionLoader.h */,
 				F56C87E9131F42ED000AD0F6 /* SortFileItem.cpp */,
 				F56C87EA131F42ED000AD0F6 /* SortFileItem.h */,
+				F56C87B9131F42ED000AD0F6 /* SystemGlobals.cpp */,
 				F56C87EB131F42ED000AD0F6 /* Temperature.cpp */,
 				F56C87EC131F42ED000AD0F6 /* Temperature.h */,
 				F56C87ED131F42ED000AD0F6 /* TextureCache.cpp */,
@@ -3745,8 +3739,11 @@
 				F56C87F8131F42ED000AD0F6 /* Util.h */,
 				F56C87F9131F42ED000AD0F6 /* ViewDatabase.cpp */,
 				F56C87FA131F42ED000AD0F6 /* ViewDatabase.h */,
+				F56C87BA131F42ED000AD0F6 /* ViewState.h */,
 				F56C87FB131F42ED000AD0F6 /* XBApplicationEx.cpp */,
 				F56C87FC131F42ED000AD0F6 /* XBApplicationEx.h */,
+				F56C87C7131F42ED000AD0F6 /* XBDateTime.cpp */,
+				F56C87C8131F42ED000AD0F6 /* XBDateTime.h */,
 			);
 			path = xbmc;
 			sourceTree = "<group>";
@@ -3754,24 +3751,10 @@
 		F56C81BA131F42E6000AD0F6 /* addons */ = {
 			isa = PBXGroup;
 			children = (
-				F56C81BB131F42E6000AD0F6 /* Service.cpp */,
-				F56C81BC131F42E6000AD0F6 /* Service.h */,
-				F56C81BD131F42E6000AD0F6 /* GUIWindowAddonBrowser.cpp */,
-				F56C81BE131F42E6000AD0F6 /* GUIWindowAddonBrowser.h */,
-				F56C81BF131F42E6000AD0F6 /* GUIDialogAddonSettings.cpp */,
-				F56C81C0131F42E6000AD0F6 /* GUIDialogAddonSettings.h */,
-				F56C81C1131F42E6000AD0F6 /* GUIDialogAddonInfo.cpp */,
-				F56C81C2131F42E6000AD0F6 /* GUIDialogAddonInfo.h */,
-				F56C81C3131F42E6000AD0F6 /* GUIViewStateAddonBrowser.cpp */,
-				F56C81C4131F42E6000AD0F6 /* GUIViewStateAddonBrowser.h */,
-				F56C81C5131F42E6000AD0F6 /* AddonDatabase.cpp */,
-				F56C81C6131F42E6000AD0F6 /* AddonDatabase.h */,
-				F56C81C7131F42E6000AD0F6 /* Repository.cpp */,
-				F56C81C8131F42E6000AD0F6 /* Repository.h */,
-				F56C81C9131F42E6000AD0F6 /* PluginSource.cpp */,
-				F56C81CA131F42E6000AD0F6 /* PluginSource.h */,
 				F56C81CB131F42E6000AD0F6 /* Addon.cpp */,
 				F56C81CC131F42E6000AD0F6 /* Addon.h */,
+				F56C81C5131F42E6000AD0F6 /* AddonDatabase.cpp */,
+				F56C81C6131F42E6000AD0F6 /* AddonDatabase.h */,
 				F56C81CD131F42E6000AD0F6 /* AddonDll.h */,
 				F56C81CE131F42E6000AD0F6 /* AddonInstaller.cpp */,
 				F56C81CF131F42E6000AD0F6 /* AddonInstaller.h */,
@@ -3782,11 +3765,25 @@
 				18B700F413A6A7850009C1AF /* AddonVersion.cpp */,
 				18B700F513A6A7850009C1AF /* AddonVersion.h */,
 				F56C81D4131F42E6000AD0F6 /* DllAddon.h */,
+				F56C81C1131F42E6000AD0F6 /* GUIDialogAddonInfo.cpp */,
+				F56C81C2131F42E6000AD0F6 /* GUIDialogAddonInfo.h */,
+				F56C81BF131F42E6000AD0F6 /* GUIDialogAddonSettings.cpp */,
+				F56C81C0131F42E6000AD0F6 /* GUIDialogAddonSettings.h */,
+				F56C81C3131F42E6000AD0F6 /* GUIViewStateAddonBrowser.cpp */,
+				F56C81C4131F42E6000AD0F6 /* GUIViewStateAddonBrowser.h */,
+				F56C81BD131F42E6000AD0F6 /* GUIWindowAddonBrowser.cpp */,
+				F56C81BE131F42E6000AD0F6 /* GUIWindowAddonBrowser.h */,
 				F56C81D7131F42E6000AD0F6 /* IAddon.h */,
+				F56C81C9131F42E6000AD0F6 /* PluginSource.cpp */,
+				F56C81CA131F42E6000AD0F6 /* PluginSource.h */,
+				F56C81C7131F42E6000AD0F6 /* Repository.cpp */,
+				F56C81C8131F42E6000AD0F6 /* Repository.h */,
 				F56C81D8131F42E6000AD0F6 /* Scraper.cpp */,
 				F56C81D9131F42E6000AD0F6 /* Scraper.h */,
 				F56C81DA131F42E6000AD0F6 /* ScreenSaver.cpp */,
 				F56C81DB131F42E6000AD0F6 /* ScreenSaver.h */,
+				F56C81BB131F42E6000AD0F6 /* Service.cpp */,
+				F56C81BC131F42E6000AD0F6 /* Service.h */,
 				F56C81DC131F42E6000AD0F6 /* Skin.cpp */,
 				F56C81DD131F42E6000AD0F6 /* Skin.h */,
 				F56C81DE131F42E6000AD0F6 /* Visualisation.cpp */,
@@ -3798,6 +3795,7 @@
 		F56C81E0131F42E6000AD0F6 /* cdrip */ = {
 			isa = PBXGroup;
 			children = (
+				F56C81F5131F42E6000AD0F6 /* lame */,
 				F56C81E1131F42E6000AD0F6 /* CDDAReader.cpp */,
 				F56C81E2131F42E6000AD0F6 /* CDDAReader.h */,
 				F56C81E3131F42E6000AD0F6 /* CDDARipper.cpp */,
@@ -3818,8 +3816,6 @@
 				F56C81F2131F42E6000AD0F6 /* EncoderVorbis.h */,
 				F56C81F3131F42E6000AD0F6 /* EncoderWav.cpp */,
 				F56C81F4131F42E6000AD0F6 /* EncoderWav.h */,
-				F56C81F5131F42E6000AD0F6 /* lame */,
-				F56C81F7131F42E6000AD0F6 /* oggvorbis */,
 			);
 			path = cdrip;
 			sourceTree = "<group>";
@@ -3832,27 +3828,20 @@
 			path = lame;
 			sourceTree = "<group>";
 		};
-		F56C81F7131F42E6000AD0F6 /* oggvorbis */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = oggvorbis;
-			sourceTree = "<group>";
-		};
 		F56C81FD131F42E6000AD0F6 /* cores */ = {
 			isa = PBXGroup;
 			children = (
 				F56C81FE131F42E6000AD0F6 /* AudioRenderers */,
 				F56C8206131F42E6000AD0F6 /* DllLoader */,
-				F56C822C131F42E6000AD0F6 /* DummyVideoPlayer.cpp */,
-				F56C822D131F42E6000AD0F6 /* DummyVideoPlayer.h */,
 				F56C822E131F42E6000AD0F6 /* dvdplayer */,
-				F56C82E4131F42E7000AD0F6 /* IAudioCallback.h */,
 				F56C82E5131F42E7000AD0F6 /* ExternalPlayer */,
-				F56C82E8131F42E7000AD0F6 /* IPlayer.h */,
-				F56C82E9131F42E7000AD0F6 /* VideoRenderers */,
 				F56C8305131F42E7000AD0F6 /* paplayer */,
 				F56C8334131F42E7000AD0F6 /* playercorefactory */,
+				F56C82E9131F42E7000AD0F6 /* VideoRenderers */,
+				F56C822C131F42E6000AD0F6 /* DummyVideoPlayer.cpp */,
+				F56C822D131F42E6000AD0F6 /* DummyVideoPlayer.h */,
+				F56C82E4131F42E7000AD0F6 /* IAudioCallback.h */,
+				F56C82E8131F42E7000AD0F6 /* IPlayer.h */,
 			);
 			path = cores;
 			sourceTree = "<group>";
@@ -3860,12 +3849,12 @@
 		F56C81FE131F42E6000AD0F6 /* AudioRenderers */ = {
 			isa = PBXGroup;
 			children = (
+				F56C8203131F42E6000AD0F6 /* AudioRendererFactory.cpp */,
+				F56C8202131F42E6000AD0F6 /* AudioRendererFactory.h */,
+				F56C8201131F42E6000AD0F6 /* IAudioRenderer.h */,
 				F56C81FF131F42E6000AD0F6 /* IOSAudioRenderer.cpp */,
 				F56C8200131F42E6000AD0F6 /* IOSAudioRenderer.h */,
 				F5AE539813673FC70004BD79 /* IOSAudioRingBuffer.h */,
-				F56C8201131F42E6000AD0F6 /* IAudioRenderer.h */,
-				F56C8202131F42E6000AD0F6 /* AudioRendererFactory.h */,
-				F56C8203131F42E6000AD0F6 /* AudioRendererFactory.cpp */,
 				F56C8204131F42E6000AD0F6 /* NullDirectSound.cpp */,
 				F56C8205131F42E6000AD0F6 /* NullDirectSound.h */,
 			);
@@ -3875,6 +3864,7 @@
 		F56C8206131F42E6000AD0F6 /* DllLoader */ = {
 			isa = PBXGroup;
 			children = (
+				F56C8218131F42E6000AD0F6 /* exports */,
 				F56C8207131F42E6000AD0F6 /* coff.cpp */,
 				F56C8208131F42E6000AD0F6 /* coff.h */,
 				F56C8209131F42E6000AD0F6 /* coffldr.h */,
@@ -3892,7 +3882,6 @@
 				F56C8215131F42E6000AD0F6 /* DllLoader.h */,
 				F56C8216131F42E6000AD0F6 /* DllLoaderContainer.cpp */,
 				F56C8217131F42E6000AD0F6 /* DllLoaderContainer.h */,
-				F56C8218131F42E6000AD0F6 /* exports */,
 				F56C8224131F42E6000AD0F6 /* ldt_keeper.c */,
 				F56C8225131F42E6000AD0F6 /* ldt_keeper.h */,
 				F56C8226131F42E6000AD0F6 /* LibraryLoader.cpp */,
@@ -3908,13 +3897,13 @@
 		F56C8218131F42E6000AD0F6 /* exports */ = {
 			isa = PBXGroup;
 			children = (
+				F56C8220131F42E6000AD0F6 /* util */,
 				F56C8219131F42E6000AD0F6 /* emu_dummy.cpp */,
 				F56C821A131F42E6000AD0F6 /* emu_dummy.h */,
 				F56C821B131F42E6000AD0F6 /* emu_kernel32.cpp */,
 				F56C821C131F42E6000AD0F6 /* emu_kernel32.h */,
 				F56C821D131F42E6000AD0F6 /* emu_msvcrt.cpp */,
 				F56C821E131F42E6000AD0F6 /* emu_msvcrt.h */,
-				F56C8220131F42E6000AD0F6 /* util */,
 				F56C8223131F42E6000AD0F6 /* wrapper.c */,
 			);
 			path = exports;
@@ -3932,22 +3921,19 @@
 		F56C822E131F42E6000AD0F6 /* dvdplayer */ = {
 			isa = PBXGroup;
 			children = (
-				F56C822F131F42E6000AD0F6 /* Edl.cpp */,
-				F56C8230131F42E6000AD0F6 /* Edl.h */,
-				F56C8231131F42E6000AD0F6 /* DVDTSCorrection.cpp */,
-				F56C8232131F42E6000AD0F6 /* DVDTSCorrection.h */,
+				F56C8238131F42E6000AD0F6 /* DVDCodecs */,
+				F56C8277131F42E7000AD0F6 /* DVDDemuxers */,
+				F56C8288131F42E7000AD0F6 /* DVDInputStreams */,
+				F56C82C8131F42E7000AD0F6 /* DVDSubtitles */,
 				F56C8233131F42E6000AD0F6 /* dvd_config.h */,
 				F56C8234131F42E6000AD0F6 /* DVDAudio.cpp */,
 				F56C8235131F42E6000AD0F6 /* DVDAudio.h */,
 				F56C8236131F42E6000AD0F6 /* DVDClock.cpp */,
 				F56C8237131F42E6000AD0F6 /* DVDClock.h */,
-				F56C8238131F42E6000AD0F6 /* DVDCodecs */,
-				F56C8277131F42E7000AD0F6 /* DVDDemuxers */,
 				F56C8284131F42E7000AD0F6 /* DVDDemuxSPU.cpp */,
 				F56C8285131F42E7000AD0F6 /* DVDDemuxSPU.h */,
 				F56C8286131F42E7000AD0F6 /* DVDFileInfo.cpp */,
 				F56C8287131F42E7000AD0F6 /* DVDFileInfo.h */,
-				F56C8288131F42E7000AD0F6 /* DVDInputStreams */,
 				F56C82AE131F42E7000AD0F6 /* DVDMessage.cpp */,
 				F56C82AF131F42E7000AD0F6 /* DVDMessage.h */,
 				F56C82B0131F42E7000AD0F6 /* DVDMessageQueue.cpp */,
@@ -3974,7 +3960,10 @@
 				F56C82C5131F42E7000AD0F6 /* DVDPlayerVideo.h */,
 				F56C82C6131F42E7000AD0F6 /* DVDStreamInfo.cpp */,
 				F56C82C7131F42E7000AD0F6 /* DVDStreamInfo.h */,
-				F56C82C8131F42E7000AD0F6 /* DVDSubtitles */,
+				F56C8231131F42E6000AD0F6 /* DVDTSCorrection.cpp */,
+				F56C8232131F42E6000AD0F6 /* DVDTSCorrection.h */,
+				F56C822F131F42E6000AD0F6 /* Edl.cpp */,
+				F56C8230131F42E6000AD0F6 /* Edl.h */,
 				F56C82E3131F42E7000AD0F6 /* IDVDPlayer.h */,
 			);
 			path = dvdplayer;
@@ -3984,13 +3973,13 @@
 			isa = PBXGroup;
 			children = (
 				F56C8239131F42E6000AD0F6 /* Audio */,
+				F56C8251131F42E6000AD0F6 /* Overlay */,
+				F56C8263131F42E7000AD0F6 /* Video */,
 				F56C824C131F42E6000AD0F6 /* DVDCodecs.h */,
 				F56C824D131F42E6000AD0F6 /* DVDCodecUtils.cpp */,
 				F56C824E131F42E6000AD0F6 /* DVDCodecUtils.h */,
 				F56C824F131F42E6000AD0F6 /* DVDFactoryCodec.cpp */,
 				F56C8250131F42E6000AD0F6 /* DVDFactoryCodec.h */,
-				F56C8251131F42E6000AD0F6 /* Overlay */,
-				F56C8263131F42E7000AD0F6 /* Video */,
 			);
 			path = DVDCodecs;
 			sourceTree = "<group>";
@@ -3998,6 +3987,8 @@
 		F56C8239131F42E6000AD0F6 /* Audio */ = {
 			isa = PBXGroup;
 			children = (
+				F56C823A131F42E6000AD0F6 /* Encoders */,
+				F56C8249131F42E6000AD0F6 /* libmad */,
 				F56C823E131F42E6000AD0F6 /* DllLibMad.h */,
 				F56C823F131F42E6000AD0F6 /* DVDAudioCodec.h */,
 				F56C8240131F42E6000AD0F6 /* DVDAudioCodecFFmpeg.cpp */,
@@ -4009,9 +4000,7 @@
 				F56C8246131F42E6000AD0F6 /* DVDAudioCodecPassthroughFFmpeg.cpp */,
 				F56C8247131F42E6000AD0F6 /* DVDAudioCodecPassthroughFFmpeg.h */,
 				F56C8248131F42E6000AD0F6 /* DVDAudioCodecPcm.cpp */,
-				F56C8249131F42E6000AD0F6 /* libmad */,
 				F56C824B131F42E6000AD0F6 /* DVDAudioCodecPcm.h */,
-				F56C823A131F42E6000AD0F6 /* Encoders */,
 			);
 			path = Audio;
 			sourceTree = "<group>";
@@ -4037,23 +4026,23 @@
 		F56C8251131F42E6000AD0F6 /* Overlay */ = {
 			isa = PBXGroup;
 			children = (
-				F56C8252131F42E6000AD0F6 /* DVDOverlayCodecSSA.cpp */,
-				F56C8253131F42E6000AD0F6 /* DVDOverlayCodecSSA.h */,
-				F56C8254131F42E6000AD0F6 /* DVDOverlaySSA.h */,
+				F56C8260131F42E7000AD0F6 /* libspucc */,
 				F56C8255131F42E6000AD0F6 /* DVDOverlay.h */,
 				F56C8256131F42E6000AD0F6 /* DVDOverlayCodec.h */,
 				F56C8257131F42E6000AD0F6 /* DVDOverlayCodecCC.cpp */,
 				F56C8258131F42E6000AD0F6 /* DVDOverlayCodecCC.h */,
 				F56C8259131F42E6000AD0F6 /* DVDOverlayCodecFFmpeg.cpp */,
 				F56C825A131F42E6000AD0F6 /* DVDOverlayCodecFFmpeg.h */,
+				F56C8252131F42E6000AD0F6 /* DVDOverlayCodecSSA.cpp */,
+				F56C8253131F42E6000AD0F6 /* DVDOverlayCodecSSA.h */,
 				F56C825B131F42E6000AD0F6 /* DVDOverlayCodecText.cpp */,
 				F56C825C131F42E6000AD0F6 /* DVDOverlayCodecText.h */,
 				F5CEE72F13D3F9D100225F72 /* DVDOverlayCodecTX3G.cpp */,
 				F5CEE73113D3F9D800225F72 /* DVDOverlayCodecTX3G.h */,
 				F56C825D131F42E6000AD0F6 /* DVDOverlayImage.h */,
 				F56C825E131F42E7000AD0F6 /* DVDOverlaySpu.h */,
+				F56C8254131F42E6000AD0F6 /* DVDOverlaySSA.h */,
 				F56C825F131F42E7000AD0F6 /* DVDOverlayText.h */,
-				F56C8260131F42E7000AD0F6 /* libspucc */,
 			);
 			path = Overlay;
 			sourceTree = "<group>";
@@ -4070,23 +4059,23 @@
 		F56C8263131F42E7000AD0F6 /* Video */ = {
 			isa = PBXGroup;
 			children = (
-				F56C8264131F42E7000AD0F6 /* DllLibMpeg2.h */,
-				F56C8265131F42E7000AD0F6 /* DVDVideoCodec.h */,
+				F56C8274131F42E7000AD0F6 /* libmpeg2 */,
 				F56C8266131F42E7000AD0F6 /* CrystalHD.cpp */,
 				F56C8267131F42E7000AD0F6 /* CrystalHD.h */,
+				F56C8264131F42E7000AD0F6 /* DllLibMpeg2.h */,
+				F56C8265131F42E7000AD0F6 /* DVDVideoCodec.h */,
 				F56C8268131F42E7000AD0F6 /* DVDVideoCodecCrystalHD.cpp */,
 				F56C8269131F42E7000AD0F6 /* DVDVideoCodecCrystalHD.h */,
-				F56C826A131F42E7000AD0F6 /* DVDVideoCodecVDA.cpp */,
-				F56C826B131F42E7000AD0F6 /* DVDVideoCodecVDA.h */,
-				F56C826C131F42E7000AD0F6 /* DVDVideoCodecVideoToolBox.cpp */,
-				F56C826D131F42E7000AD0F6 /* DVDVideoCodecVideoToolBox.h */,
 				F56C826E131F42E7000AD0F6 /* DVDVideoCodecFFmpeg.cpp */,
 				F56C826F131F42E7000AD0F6 /* DVDVideoCodecFFmpeg.h */,
 				F56C8270131F42E7000AD0F6 /* DVDVideoCodecLibMpeg2.cpp */,
 				F56C8271131F42E7000AD0F6 /* DVDVideoCodecLibMpeg2.h */,
+				F56C826A131F42E7000AD0F6 /* DVDVideoCodecVDA.cpp */,
+				F56C826B131F42E7000AD0F6 /* DVDVideoCodecVDA.h */,
+				F56C826C131F42E7000AD0F6 /* DVDVideoCodecVideoToolBox.cpp */,
+				F56C826D131F42E7000AD0F6 /* DVDVideoCodecVideoToolBox.h */,
 				F56C8272131F42E7000AD0F6 /* DVDVideoPPFFmpeg.cpp */,
 				F56C8273131F42E7000AD0F6 /* DVDVideoPPFFmpeg.h */,
-				F56C8274131F42E7000AD0F6 /* libmpeg2 */,
 			);
 			path = Video;
 			sourceTree = "<group>";
@@ -4103,18 +4092,18 @@
 		F56C8277131F42E7000AD0F6 /* DVDDemuxers */ = {
 			isa = PBXGroup;
 			children = (
-				F56C8278131F42E7000AD0F6 /* DVDDemuxVobsub.cpp */,
-				F56C8279131F42E7000AD0F6 /* DVDFactoryDemuxer.cpp */,
+				F56C827E131F42E7000AD0F6 /* DVDDemux.cpp */,
+				F56C827F131F42E7000AD0F6 /* DVDDemux.h */,
 				F56C827A131F42E7000AD0F6 /* DVDDemuxFFmpeg.cpp */,
 				F56C827B131F42E7000AD0F6 /* DVDDemuxFFmpeg.h */,
 				F56C827C131F42E7000AD0F6 /* DVDDemuxHTSP.cpp */,
 				F56C827D131F42E7000AD0F6 /* DVDDemuxHTSP.h */,
-				F56C827E131F42E7000AD0F6 /* DVDDemux.cpp */,
-				F56C827F131F42E7000AD0F6 /* DVDDemux.h */,
 				F56C8280131F42E7000AD0F6 /* DVDDemuxShoutcast.cpp */,
 				F56C8281131F42E7000AD0F6 /* DVDDemuxShoutcast.h */,
 				F56C8282131F42E7000AD0F6 /* DVDDemuxUtils.cpp */,
 				F56C8283131F42E7000AD0F6 /* DVDDemuxUtils.h */,
+				F56C8278131F42E7000AD0F6 /* DVDDemuxVobsub.cpp */,
+				F56C8279131F42E7000AD0F6 /* DVDFactoryDemuxer.cpp */,
 			);
 			path = DVDDemuxers;
 			sourceTree = "<group>";
@@ -4122,10 +4111,7 @@
 		F56C8288131F42E7000AD0F6 /* DVDInputStreams */ = {
 			isa = PBXGroup;
 			children = (
-				F56C8289131F42E7000AD0F6 /* DVDInputStreamRTMP.cpp */,
-				F56C828A131F42E7000AD0F6 /* DVDInputStreamRTMP.h */,
-				F56C828B131F42E7000AD0F6 /* DVDInputStreamTV.cpp */,
-				F56C828C131F42E7000AD0F6 /* DVDInputStreamTV.h */,
+				F56C82A0131F42E7000AD0F6 /* dvdnav */,
 				F56C828D131F42E7000AD0F6 /* DllDvdNav.h */,
 				F56C828E131F42E7000AD0F6 /* DVDFactoryInputStream.cpp */,
 				F56C828F131F42E7000AD0F6 /* DVDFactoryInputStream.h */,
@@ -4145,7 +4131,10 @@
 				F56C829D131F42E7000AD0F6 /* DVDInputStreamMemory.h */,
 				F56C829E131F42E7000AD0F6 /* DVDInputStreamNavigator.cpp */,
 				F56C829F131F42E7000AD0F6 /* DVDInputStreamNavigator.h */,
-				F56C82A0131F42E7000AD0F6 /* dvdnav */,
+				F56C8289131F42E7000AD0F6 /* DVDInputStreamRTMP.cpp */,
+				F56C828A131F42E7000AD0F6 /* DVDInputStreamRTMP.h */,
+				F56C828B131F42E7000AD0F6 /* DVDInputStreamTV.cpp */,
+				F56C828C131F42E7000AD0F6 /* DVDInputStreamTV.h */,
 				F56C82AC131F42E7000AD0F6 /* DVDStateSerializer.cpp */,
 				F56C82AD131F42E7000AD0F6 /* DVDStateSerializer.h */,
 			);
@@ -4174,25 +4163,25 @@
 			isa = PBXGroup;
 			children = (
 				F56C82C9131F42E7000AD0F6 /* DllLibass.h */,
-				F56C82CA131F42E7000AD0F6 /* DVDSubtitleParserSSA.cpp */,
-				F56C82CB131F42E7000AD0F6 /* DVDSubtitleParserSSA.h */,
-				F56C82CC131F42E7000AD0F6 /* DVDSubtitlesLibass.cpp */,
-				F56C82CD131F42E7000AD0F6 /* DVDSubtitlesLibass.h */,
+				F56C82D4131F42E7000AD0F6 /* DVDFactorySubtitle.cpp */,
+				F56C82D5131F42E7000AD0F6 /* DVDFactorySubtitle.h */,
+				F56C82D6131F42E7000AD0F6 /* DVDSubtitleLineCollection.cpp */,
+				F56C82D7131F42E7000AD0F6 /* DVDSubtitleLineCollection.h */,
+				F56C82D8131F42E7000AD0F6 /* DVDSubtitleParser.h */,
 				F56C82CE131F42E7000AD0F6 /* DVDSubtitleParserMicroDVD.cpp */,
 				F56C82CF131F42E7000AD0F6 /* DVDSubtitleParserMicroDVD.h */,
 				F56C82D0131F42E7000AD0F6 /* DVDSubtitleParserMPL2.cpp */,
 				F56C82D1131F42E7000AD0F6 /* DVDSubtitleParserMPL2.h */,
 				F56C82D2131F42E7000AD0F6 /* DVDSubtitleParserSami.cpp */,
 				F56C82D3131F42E7000AD0F6 /* DVDSubtitleParserSami.h */,
-				F56C82D4131F42E7000AD0F6 /* DVDFactorySubtitle.cpp */,
-				F56C82D5131F42E7000AD0F6 /* DVDFactorySubtitle.h */,
-				F56C82D6131F42E7000AD0F6 /* DVDSubtitleLineCollection.cpp */,
-				F56C82D7131F42E7000AD0F6 /* DVDSubtitleLineCollection.h */,
-				F56C82D8131F42E7000AD0F6 /* DVDSubtitleParser.h */,
+				F56C82CA131F42E7000AD0F6 /* DVDSubtitleParserSSA.cpp */,
+				F56C82CB131F42E7000AD0F6 /* DVDSubtitleParserSSA.h */,
 				F56C82D9131F42E7000AD0F6 /* DVDSubtitleParserSubrip.cpp */,
 				F56C82DA131F42E7000AD0F6 /* DVDSubtitleParserSubrip.h */,
 				F56C82DB131F42E7000AD0F6 /* DVDSubtitleParserVplayer.cpp */,
 				F56C82DC131F42E7000AD0F6 /* DVDSubtitleParserVplayer.h */,
+				F56C82CC131F42E7000AD0F6 /* DVDSubtitlesLibass.cpp */,
+				F56C82CD131F42E7000AD0F6 /* DVDSubtitlesLibass.h */,
 				F56C82DD131F42E7000AD0F6 /* DVDSubtitleStream.cpp */,
 				F56C82DE131F42E7000AD0F6 /* DVDSubtitleStream.h */,
 				F56C82DF131F42E7000AD0F6 /* DVDSubtitleTagMicroDVD.cpp */,
@@ -4215,24 +4204,24 @@
 		F56C82E9131F42E7000AD0F6 /* VideoRenderers */ = {
 			isa = PBXGroup;
 			children = (
+				F56C82FA131F42E7000AD0F6 /* VideoShaders */,
 				F56C82EA131F42E7000AD0F6 /* BaseRenderer.cpp */,
 				F56C82EB131F42E7000AD0F6 /* BaseRenderer.h */,
 				F56C82EE131F42E7000AD0F6 /* LinuxRendererGLES.cpp */,
 				F56C82EF131F42E7000AD0F6 /* LinuxRendererGLES.h */,
-				F56C82F0131F42E7000AD0F6 /* OverlayRendererGL.cpp */,
-				F56C82F1131F42E7000AD0F6 /* OverlayRendererGL.h */,
 				F56C82F2131F42E7000AD0F6 /* OverlayRenderer.cpp */,
 				F56C82F3131F42E7000AD0F6 /* OverlayRenderer.h */,
+				F56C82F0131F42E7000AD0F6 /* OverlayRendererGL.cpp */,
+				F56C82F1131F42E7000AD0F6 /* OverlayRendererGL.h */,
 				F56C82F4131F42E7000AD0F6 /* OverlayRendererUtil.cpp */,
 				F56C82F5131F42E7000AD0F6 /* OverlayRendererUtil.h */,
 				F56C82F6131F42E7000AD0F6 /* RenderCapture.cpp */,
 				F56C82F7131F42E7000AD0F6 /* RenderCapture.h */,
 				F56C82F8131F42E7000AD0F6 /* RenderManager.cpp */,
 				F56C82F9131F42E7000AD0F6 /* RenderManager.h */,
-				F56C82FA131F42E7000AD0F6 /* VideoShaders */,
 				F56C8301131F42E7000AD0F6 /* WinRenderer.h */,
-				F56C8303131F42E7000AD0F6 /* yuv2rgb.neon.S */,
 				F56C8304131F42E7000AD0F6 /* yuv2rgb.neon.h */,
+				F56C8303131F42E7000AD0F6 /* yuv2rgb.neon.S */,
 			);
 			path = VideoRenderers;
 			sourceTree = "<group>";
@@ -4240,8 +4229,8 @@
 		F56C82FA131F42E7000AD0F6 /* VideoShaders */ = {
 			isa = PBXGroup;
 			children = (
-				F56C82FB131F42E7000AD0F6 /* ConvolutionKernels.h */,
 				F56C82FC131F42E7000AD0F6 /* ConvolutionKernels.cpp */,
+				F56C82FB131F42E7000AD0F6 /* ConvolutionKernels.h */,
 				F56C82FD131F42E7000AD0F6 /* VideoFilterShader.cpp */,
 				F56C82FE131F42E7000AD0F6 /* VideoFilterShader.h */,
 				F56C82FF131F42E7000AD0F6 /* YUV2RGBShader.cpp */,
@@ -4253,12 +4242,10 @@
 		F56C8305131F42E7000AD0F6 /* paplayer */ = {
 			isa = PBXGroup;
 			children = (
-				F56C8306131F42E7000AD0F6 /* ASAPCodec.cpp */,
-				F56C8307131F42E7000AD0F6 /* ASAPCodec.h */,
-				F56C8308131F42E7000AD0F6 /* DVDPlayerCodec.cpp */,
-				F56C8309131F42E7000AD0F6 /* DVDPlayerCodec.h */,
 				F56C830A131F42E7000AD0F6 /* ADPCMCodec.cpp */,
 				F56C830B131F42E7000AD0F6 /* ADPCMCodec.h */,
+				F56C8306131F42E7000AD0F6 /* ASAPCodec.cpp */,
+				F56C8307131F42E7000AD0F6 /* ASAPCodec.h */,
 				F56C830E131F42E7000AD0F6 /* AudioDecoder.cpp */,
 				F56C830F131F42E7000AD0F6 /* AudioDecoder.h */,
 				DF44856A140065C60069344B /* BXAcodec.cpp */,
@@ -4268,8 +4255,8 @@
 				F56C8312131F42E7000AD0F6 /* CDDAcodec.h */,
 				F56C8313131F42E7000AD0F6 /* CodecFactory.cpp */,
 				F56C8314131F42E7000AD0F6 /* CodecFactory.h */,
-				F56C8315131F42E7000AD0F6 /* VGMCodec.cpp */,
-				F56C8316131F42E7000AD0F6 /* VGMCodec.h */,
+				F56C8308131F42E7000AD0F6 /* DVDPlayerCodec.cpp */,
+				F56C8309131F42E7000AD0F6 /* DVDPlayerCodec.h */,
 				F56C8317131F42E7000AD0F6 /* FLACcodec.cpp */,
 				F56C8318131F42E7000AD0F6 /* FLACcodec.h */,
 				F56C8319131F42E7000AD0F6 /* ICodec.h */,
@@ -4293,6 +4280,8 @@
 				F56C832B131F42E7000AD0F6 /* SPCCodec.h */,
 				F56C832C131F42E7000AD0F6 /* TimidityCodec.cpp */,
 				F56C832D131F42E7000AD0F6 /* TimidityCodec.h */,
+				F56C8315131F42E7000AD0F6 /* VGMCodec.cpp */,
+				F56C8316131F42E7000AD0F6 /* VGMCodec.h */,
 				F56C832E131F42E7000AD0F6 /* WAVcodec.cpp */,
 				F56C832F131F42E7000AD0F6 /* WAVcodec.h */,
 				F56C8332131F42E7000AD0F6 /* YMCodec.cpp */,
@@ -4392,35 +4381,14 @@
 		F56C8378131F42E8000AD0F6 /* filesystem */ = {
 			isa = PBXGroup;
 			children = (
+				F56C83EA131F42E8000AD0F6 /* MusicDatabaseDirectory */,
+				F56C8444131F42E8000AD0F6 /* VideoDatabaseDirectory */,
+				F56C8381131F42E8000AD0F6 /* AddonsDirectory.cpp */,
+				F56C8380131F42E8000AD0F6 /* AddonsDirectory.h */,
 				DFCFC5261413F7D60004D0BF /* AFPDirectory.cpp */,
 				DFCFC5271413F7D60004D0BF /* AFPDirectory.h */,
-				F57A1DB61329FAF700498CC7 /* SourcesDirectory.cpp */,
-				DF0DF17B13A3AF9F008ED511 /* FileNFS.cpp */,
-				DF0DF17C13A3AF9F008ED511 /* FileNFS.h */,
-				DF0DF17D13A3AF9F008ED511 /* NFSDirectory.cpp */,
-				DF0DF17E13A3AF9F008ED511 /* NFSDirectory.h */,
-				F57A1DB71329FAF700498CC7 /* SourcesDirectory.h */,
-				F56C8379131F42E8000AD0F6 /* SpecialProtocol.cpp */,
-				F56C837A131F42E8000AD0F6 /* SpecialProtocol.h */,
-				F56C837B131F42E8000AD0F6 /* SpecialProtocolDirectory.cpp */,
-				F56C837C131F42E8000AD0F6 /* SpecialProtocolDirectory.h */,
-				F56C837D131F42E8000AD0F6 /* NptXbmcFile.cpp */,
-				F56C837E131F42E8000AD0F6 /* RSSDirectory.cpp */,
-				F56C837F131F42E8000AD0F6 /* RSSDirectory.h */,
-				F56C8380131F42E8000AD0F6 /* AddonsDirectory.h */,
-				F56C8381131F42E8000AD0F6 /* AddonsDirectory.cpp */,
 				F56C8382131F42E8000AD0F6 /* ASAPFileDirectory.cpp */,
 				F56C8383131F42E8000AD0F6 /* ASAPFileDirectory.h */,
-				F56C8384131F42E8000AD0F6 /* MusicFileDirectory.cpp */,
-				F56C8385131F42E8000AD0F6 /* MusicFileDirectory.h */,
-				F56C8386131F42E8000AD0F6 /* MythSession.cpp */,
-				F56C8387131F42E8000AD0F6 /* FileSmb.cpp */,
-				F56C8388131F42E8000AD0F6 /* SMBDirectory.cpp */,
-				F56C8389131F42E8000AD0F6 /* MythDirectory.cpp */,
-				F56C838A131F42E8000AD0F6 /* MythDirectory.h */,
-				F56C838B131F42E8000AD0F6 /* MythFile.cpp */,
-				F56C838C131F42E8000AD0F6 /* MythFile.h */,
-				F56C838D131F42E8000AD0F6 /* FileShoutcast.cpp */,
 				7C99B6E7133D36E200FC2B16 /* CacheCircular.cpp */,
 				7C99B6E8133D36E200FC2B16 /* CacheCircular.h */,
 				F56C838E131F42E8000AD0F6 /* CacheMemBuffer.cpp */,
@@ -4471,6 +4439,8 @@
 				F56C83B9131F42E8000AD0F6 /* FileLastFM.h */,
 				F56C83BA131F42E8000AD0F6 /* FileMusicDatabase.cpp */,
 				F56C83BB131F42E8000AD0F6 /* FileMusicDatabase.h */,
+				DF0DF17B13A3AF9F008ED511 /* FileNFS.cpp */,
+				DF0DF17C13A3AF9F008ED511 /* FileNFS.h */,
 				DF44856D140065E10069344B /* FilePipe.cpp */,
 				DF44856E140065E10069344B /* FilePipe.h */,
 				F56C83BC131F42E8000AD0F6 /* FileRar.cpp */,
@@ -4479,6 +4449,8 @@
 				F56C83BF131F42E8000AD0F6 /* FileRTV.h */,
 				F56C83C0131F42E8000AD0F6 /* FileSFTP.cpp */,
 				F56C83C1131F42E8000AD0F6 /* FileSFTP.h */,
+				F56C838D131F42E8000AD0F6 /* FileShoutcast.cpp */,
+				F56C8387131F42E8000AD0F6 /* FileSmb.cpp */,
 				F56C83C2131F42E8000AD0F6 /* FileSmb.h */,
 				F56C83C3131F42E8000AD0F6 /* FileSpecialProtocol.cpp */,
 				F56C83C4131F42E8000AD0F6 /* FileSpecialProtocol.h */,
@@ -4496,12 +4468,12 @@
 				F56C83D2131F42E8000AD0F6 /* HDDirectory.h */,
 				F56C83D3131F42E8000AD0F6 /* HDHomeRun.cpp */,
 				F56C83D4131F42E8000AD0F6 /* HDHomeRun.h */,
-				F56C83D5131F42E8000AD0F6 /* HTSPDirectory.h */,
 				F56C83D6131F42E8000AD0F6 /* HTSPDirectory.cpp */,
-				F56C83D7131F42E8000AD0F6 /* HTSPSession.h */,
+				F56C83D5131F42E8000AD0F6 /* HTSPDirectory.h */,
 				F56C83D8131F42E8000AD0F6 /* HTSPSession.cpp */,
-				F56C83D9131F42E8000AD0F6 /* HTTPDirectory.h */,
+				F56C83D7131F42E8000AD0F6 /* HTSPSession.h */,
 				F56C83DA131F42E8000AD0F6 /* HTTPDirectory.cpp */,
+				F56C83D9131F42E8000AD0F6 /* HTTPDirectory.h */,
 				F56C83DB131F42E8000AD0F6 /* IDirectory.cpp */,
 				F56C83DC131F42E8000AD0F6 /* IDirectory.h */,
 				F56C83DD131F42E8000AD0F6 /* IFile.cpp */,
@@ -4517,11 +4489,20 @@
 				F56C83E7131F42E8000AD0F6 /* MultiPathDirectory.h */,
 				F56C83E8131F42E8000AD0F6 /* MultiPathFile.cpp */,
 				F56C83E9131F42E8000AD0F6 /* MultiPathFile.h */,
-				F56C83EA131F42E8000AD0F6 /* MusicDatabaseDirectory */,
 				F56C8417131F42E8000AD0F6 /* MusicDatabaseDirectory.cpp */,
 				F56C8418131F42E8000AD0F6 /* MusicDatabaseDirectory.h */,
+				F56C8384131F42E8000AD0F6 /* MusicFileDirectory.cpp */,
+				F56C8385131F42E8000AD0F6 /* MusicFileDirectory.h */,
 				F56C8419131F42E8000AD0F6 /* MusicSearchDirectory.cpp */,
 				F56C841A131F42E8000AD0F6 /* MusicSearchDirectory.h */,
+				F56C8389131F42E8000AD0F6 /* MythDirectory.cpp */,
+				F56C838A131F42E8000AD0F6 /* MythDirectory.h */,
+				F56C838B131F42E8000AD0F6 /* MythFile.cpp */,
+				F56C838C131F42E8000AD0F6 /* MythFile.h */,
+				F56C8386131F42E8000AD0F6 /* MythSession.cpp */,
+				DF0DF17D13A3AF9F008ED511 /* NFSDirectory.cpp */,
+				DF0DF17E13A3AF9F008ED511 /* NFSDirectory.h */,
+				F56C837D131F42E8000AD0F6 /* NptXbmcFile.cpp */,
 				F56C841B131F42E8000AD0F6 /* NSFFileDirectory.cpp */,
 				F56C841C131F42E8000AD0F6 /* NSFFileDirectory.h */,
 				F56C841D131F42E8000AD0F6 /* OGGFileDirectory.cpp */,
@@ -4538,12 +4519,14 @@
 				F56C8426131F42E8000AD0F6 /* RarDirectory.h */,
 				F56C8427131F42E8000AD0F6 /* RarManager.cpp */,
 				F56C8428131F42E8000AD0F6 /* RarManager.h */,
+				F56C837E131F42E8000AD0F6 /* RSSDirectory.cpp */,
+				F56C837F131F42E8000AD0F6 /* RSSDirectory.h */,
 				F56C8429131F42E8000AD0F6 /* RTVDirectory.cpp */,
 				F56C842A131F42E8000AD0F6 /* RTVDirectory.h */,
-				F56C842B131F42E8000AD0F6 /* SAPDirectory.h */,
 				F56C842C131F42E8000AD0F6 /* SAPDirectory.cpp */,
-				F56C842D131F42E8000AD0F6 /* SAPFile.h */,
+				F56C842B131F42E8000AD0F6 /* SAPDirectory.h */,
 				F56C842E131F42E8000AD0F6 /* SAPFile.cpp */,
+				F56C842D131F42E8000AD0F6 /* SAPFile.h */,
 				F56C842F131F42E8000AD0F6 /* SFTPDirectory.cpp */,
 				F56C8430131F42E8000AD0F6 /* SFTPDirectory.h */,
 				F56C8431131F42E8000AD0F6 /* SIDFileDirectory.cpp */,
@@ -4552,7 +4535,14 @@
 				18404DD51396C3F300863BBA /* Slingbox.h */,
 				F56C8433131F42E8000AD0F6 /* SmartPlaylistDirectory.cpp */,
 				F56C8434131F42E8000AD0F6 /* SmartPlaylistDirectory.h */,
+				F56C8388131F42E8000AD0F6 /* SMBDirectory.cpp */,
 				F56C8435131F42E8000AD0F6 /* SMBDirectory.h */,
+				F57A1DB61329FAF700498CC7 /* SourcesDirectory.cpp */,
+				F57A1DB71329FAF700498CC7 /* SourcesDirectory.h */,
+				F56C8379131F42E8000AD0F6 /* SpecialProtocol.cpp */,
+				F56C837A131F42E8000AD0F6 /* SpecialProtocol.h */,
+				F56C837B131F42E8000AD0F6 /* SpecialProtocolDirectory.cpp */,
+				F56C837C131F42E8000AD0F6 /* SpecialProtocolDirectory.h */,
 				F56C8436131F42E8000AD0F6 /* StackDirectory.cpp */,
 				F56C8437131F42E8000AD0F6 /* StackDirectory.h */,
 				F56C8438131F42E8000AD0F6 /* udf25.cpp */,
@@ -4561,19 +4551,18 @@
 				F56C843B131F42E8000AD0F6 /* UDFDirectory.h */,
 				F56C843C131F42E8000AD0F6 /* UPnPDirectory.cpp */,
 				F56C843D131F42E8000AD0F6 /* UPnPDirectory.h */,
+				F56C8473131F42E8000AD0F6 /* VideoDatabaseDirectory.cpp */,
+				F56C8474131F42E8000AD0F6 /* VideoDatabaseDirectory.h */,
+				F56C8475131F42E8000AD0F6 /* VirtualDirectory.cpp */,
+				F56C8476131F42E8000AD0F6 /* VirtualDirectory.h */,
 				F56C843E131F42E8000AD0F6 /* VTPDirectory.cpp */,
 				F56C843F131F42E8000AD0F6 /* VTPDirectory.h */,
 				F56C8440131F42E8000AD0F6 /* VTPFile.cpp */,
 				F56C8441131F42E8000AD0F6 /* VTPFile.h */,
 				F56C8442131F42E8000AD0F6 /* VTPSession.cpp */,
 				F56C8443131F42E8000AD0F6 /* VTPSession.h */,
-				F56C8444131F42E8000AD0F6 /* VideoDatabaseDirectory */,
-				F56C8473131F42E8000AD0F6 /* VideoDatabaseDirectory.cpp */,
-				F56C8474131F42E8000AD0F6 /* VideoDatabaseDirectory.h */,
-				F56C8475131F42E8000AD0F6 /* VirtualDirectory.cpp */,
-				F56C8476131F42E8000AD0F6 /* VirtualDirectory.h */,
-				F56C847B131F42E9000AD0F6 /* ZeroconfDirectory.h */,
 				F56C847C131F42E9000AD0F6 /* ZeroconfDirectory.cpp */,
+				F56C847B131F42E9000AD0F6 /* ZeroconfDirectory.h */,
 				F56C847E131F42E9000AD0F6 /* ZipDirectory.cpp */,
 				F56C847F131F42E9000AD0F6 /* ZipDirectory.h */,
 				F56C8480131F42E9000AD0F6 /* ZipManager.cpp */,
@@ -4636,12 +4625,12 @@
 		F56C8444131F42E8000AD0F6 /* VideoDatabaseDirectory */ = {
 			isa = PBXGroup;
 			children = (
-				F56C8445131F42E8000AD0F6 /* DirectoryNodeCountry.cpp */,
-				F56C8446131F42E8000AD0F6 /* DirectoryNodeCountry.h */,
 				F56C8447131F42E8000AD0F6 /* DirectoryNode.cpp */,
 				F56C8448131F42E8000AD0F6 /* DirectoryNode.h */,
 				F56C8449131F42E8000AD0F6 /* DirectoryNodeActor.cpp */,
 				F56C844A131F42E8000AD0F6 /* DirectoryNodeActor.h */,
+				F56C8445131F42E8000AD0F6 /* DirectoryNodeCountry.cpp */,
+				F56C8446131F42E8000AD0F6 /* DirectoryNodeCountry.h */,
 				F56C844B131F42E8000AD0F6 /* DirectoryNodeDirector.cpp */,
 				F56C844C131F42E8000AD0F6 /* DirectoryNodeDirector.h */,
 				F56C844D131F42E8000AD0F6 /* DirectoryNodeEpisodes.cpp */,
@@ -4689,191 +4678,191 @@
 		F56C8482131F42E9000AD0F6 /* guilib */ = {
 			isa = PBXGroup;
 			children = (
-				329189291423A9B700E878CD /* JpegIO.cpp */,
-				3291892A1423A9B700E878CD /* JpegIO.h */,
+				F56C84E1131F42E9000AD0F6 /* AnimatedGif.cpp */,
 				F56C8483131F42E9000AD0F6 /* AnimatedGif.h */,
+				F56C84E2131F42E9000AD0F6 /* AudioContext.cpp */,
 				F56C8484131F42E9000AD0F6 /* AudioContext.h */,
+				F56C84E3131F42E9000AD0F6 /* D3DResource.cpp */,
 				F56C8485131F42E9000AD0F6 /* D3DResource.h */,
+				F56C84E4131F42E9000AD0F6 /* DDSImage.cpp */,
 				F56C8486131F42E9000AD0F6 /* DDSImage.h */,
+				F56C84E5131F42E9000AD0F6 /* DirectXGraphics.cpp */,
 				F56C8487131F42E9000AD0F6 /* DirectXGraphics.h */,
 				7C0A7FAD13A9E72E00AFC2BD /* DirtyRegion.h */,
 				7C0A7FAE13A9E72E00AFC2BD /* DirtyRegionSolvers.cpp */,
 				7C0A7FAF13A9E72E00AFC2BD /* DirtyRegionSolvers.h */,
 				7C0A7FB013A9E72E00AFC2BD /* DirtyRegionTracker.cpp */,
 				7C0A7FB113A9E72E00AFC2BD /* DirtyRegionTracker.h */,
+				F56C84E6131F42E9000AD0F6 /* FrameBufferObject.cpp */,
 				F56C8488131F42E9000AD0F6 /* FrameBufferObject.h */,
 				F56C8489131F42E9000AD0F6 /* Geometry.h */,
+				F56C84E7131F42E9000AD0F6 /* GraphicContext.cpp */,
 				F56C848A131F42E9000AD0F6 /* GraphicContext.h */,
 				F56C848B131F42E9000AD0F6 /* gui3d.h */,
 				DF3488F613FD961A0026A711 /* GUIAction.cpp */,
 				DF3488F713FD961A0026A711 /* GUIAction.h */,
+				F56C84E8131F42E9000AD0F6 /* GUIAudioManager.cpp */,
 				F56C848D131F42E9000AD0F6 /* GUIAudioManager.h */,
+				F56C84E9131F42E9000AD0F6 /* GUIBaseContainer.cpp */,
 				F56C848E131F42E9000AD0F6 /* GUIBaseContainer.h */,
+				F56C84EA131F42E9000AD0F6 /* GUIBorderedImage.cpp */,
 				F56C848F131F42E9000AD0F6 /* GUIBorderedImage.h */,
+				F56C84EB131F42E9000AD0F6 /* GUIButtonControl.cpp */,
 				F56C8490131F42E9000AD0F6 /* GUIButtonControl.h */,
 				F56C8492131F42E9000AD0F6 /* GUICallback.h */,
+				F56C84ED131F42E9000AD0F6 /* GUICheckMarkControl.cpp */,
 				F56C8493131F42E9000AD0F6 /* GUICheckMarkControl.h */,
+				F56C84EE131F42E9000AD0F6 /* GUIColorManager.cpp */,
 				F56C8494131F42E9000AD0F6 /* GUIColorManager.h */,
+				F56C84EF131F42E9000AD0F6 /* GUIControl.cpp */,
 				F56C8495131F42E9000AD0F6 /* GUIControl.h */,
+				F56C84F0131F42E9000AD0F6 /* GUIControlFactory.cpp */,
 				F56C8496131F42E9000AD0F6 /* GUIControlFactory.h */,
+				F56C84F1131F42E9000AD0F6 /* GUIControlGroup.cpp */,
 				F56C8497131F42E9000AD0F6 /* GUIControlGroup.h */,
+				F56C84F2131F42E9000AD0F6 /* GUIControlGroupList.cpp */,
 				F56C8498131F42E9000AD0F6 /* GUIControlGroupList.h */,
+				F56C84F3131F42E9000AD0F6 /* GUIControlProfiler.cpp */,
 				F56C8499131F42E9000AD0F6 /* GUIControlProfiler.h */,
+				F56C84F4131F42E9000AD0F6 /* GUIDialog.cpp */,
 				F56C849A131F42E9000AD0F6 /* GUIDialog.h */,
+				F56C84F5131F42E9000AD0F6 /* GUIEditControl.cpp */,
 				F56C849B131F42E9000AD0F6 /* GUIEditControl.h */,
+				F56C84F6131F42E9000AD0F6 /* GUIFadeLabelControl.cpp */,
 				F56C849C131F42E9000AD0F6 /* GUIFadeLabelControl.h */,
+				F56C84F7131F42E9000AD0F6 /* GUIFixedListContainer.cpp */,
 				F56C849D131F42E9000AD0F6 /* GUIFixedListContainer.h */,
+				F56C84F8131F42E9000AD0F6 /* GUIFont.cpp */,
 				F56C849E131F42E9000AD0F6 /* GUIFont.h */,
+				F56C84F9131F42E9000AD0F6 /* GUIFontManager.cpp */,
 				F56C849F131F42E9000AD0F6 /* GUIFontManager.h */,
+				F56C84FA131F42E9000AD0F6 /* GUIFontTTF.cpp */,
 				F56C84A0131F42E9000AD0F6 /* GUIFontTTF.h */,
+				F56C84FB131F42E9000AD0F6 /* GUIFontTTFDX.cpp */,
 				F56C84A1131F42E9000AD0F6 /* GUIFontTTFDX.h */,
+				F56C84FC131F42E9000AD0F6 /* GUIFontTTFGL.cpp */,
 				F56C84A2131F42E9000AD0F6 /* GUIFontTTFGL.h */,
+				F56C84FD131F42E9000AD0F6 /* GUIImage.cpp */,
 				F56C84A3131F42E9000AD0F6 /* GUIImage.h */,
+				F56C84FE131F42E9000AD0F6 /* GUIIncludes.cpp */,
 				F56C84A4131F42E9000AD0F6 /* GUIIncludes.h */,
+				F56C84FF131F42E9000AD0F6 /* GUIInfoTypes.cpp */,
 				F56C84A5131F42E9000AD0F6 /* GUIInfoTypes.h */,
+				F56C8500131F42E9000AD0F6 /* GUILabel.cpp */,
 				F56C84A6131F42E9000AD0F6 /* GUILabel.h */,
+				F56C8501131F42E9000AD0F6 /* GUILabelControl.cpp */,
 				F56C84A7131F42E9000AD0F6 /* GUILabelControl.h */,
+				F56C8502131F42E9000AD0F6 /* GUIListContainer.cpp */,
 				F56C84A8131F42E9000AD0F6 /* GUIListContainer.h */,
+				F56C8503131F42E9000AD0F6 /* GUIListGroup.cpp */,
 				F56C84A9131F42E9000AD0F6 /* GUIListGroup.h */,
+				F56C8504131F42E9000AD0F6 /* GUIListItem.cpp */,
 				F56C84AA131F42E9000AD0F6 /* GUIListItem.h */,
+				F56C8505131F42E9000AD0F6 /* GUIListItemLayout.cpp */,
 				F56C84AB131F42E9000AD0F6 /* GUIListItemLayout.h */,
+				F56C8506131F42E9000AD0F6 /* GUIListLabel.cpp */,
 				F56C84AC131F42E9000AD0F6 /* GUIListLabel.h */,
+				F56C8507131F42E9000AD0F6 /* GUIMessage.cpp */,
 				F56C84AD131F42E9000AD0F6 /* GUIMessage.h */,
+				F56C8508131F42E9000AD0F6 /* GUIMoverControl.cpp */,
 				F56C84AE131F42E9000AD0F6 /* GUIMoverControl.h */,
+				F56C8509131F42E9000AD0F6 /* GUIMultiImage.cpp */,
 				F56C84AF131F42E9000AD0F6 /* GUIMultiImage.h */,
+				F56C850A131F42E9000AD0F6 /* GUIMultiSelectText.cpp */,
 				F56C84B0131F42E9000AD0F6 /* GUIMultiSelectText.h */,
+				F56C850B131F42E9000AD0F6 /* GUIPanelContainer.cpp */,
 				F56C84B1131F42E9000AD0F6 /* GUIPanelContainer.h */,
+				F56C850C131F42E9000AD0F6 /* GUIProgressControl.cpp */,
 				F56C84B2131F42E9000AD0F6 /* GUIProgressControl.h */,
+				F56C850D131F42E9000AD0F6 /* GUIRadioButtonControl.cpp */,
 				F56C84B3131F42E9000AD0F6 /* GUIRadioButtonControl.h */,
+				F56C850E131F42E9000AD0F6 /* GUIRenderingControl.cpp */,
 				F56C84B4131F42E9000AD0F6 /* GUIRenderingControl.h */,
+				F56C850F131F42E9000AD0F6 /* GUIResizeControl.cpp */,
 				F56C84B5131F42E9000AD0F6 /* GUIResizeControl.h */,
+				F56C8510131F42E9000AD0F6 /* GUIRSSControl.cpp */,
 				F56C84B6131F42E9000AD0F6 /* GUIRSSControl.h */,
+				F56C8511131F42E9000AD0F6 /* GUIScrollBarControl.cpp */,
 				F56C84B7131F42E9000AD0F6 /* GUIScrollBarControl.h */,
+				F56C8512131F42E9000AD0F6 /* GUISelectButtonControl.cpp */,
 				F56C84B8131F42E9000AD0F6 /* GUISelectButtonControl.h */,
+				F56C8513131F42E9000AD0F6 /* GUISettingsSliderControl.cpp */,
 				F56C84B9131F42E9000AD0F6 /* GUISettingsSliderControl.h */,
+				F56C8514131F42E9000AD0F6 /* GUIShader.cpp */,
 				F56C84BA131F42E9000AD0F6 /* GUIShader.h */,
+				F56C8515131F42E9000AD0F6 /* GUISliderControl.cpp */,
 				F56C84BB131F42E9000AD0F6 /* GUISliderControl.h */,
+				F56C8516131F42E9000AD0F6 /* GUISound.cpp */,
 				F56C84BC131F42E9000AD0F6 /* GUISound.h */,
+				F56C8517131F42E9000AD0F6 /* GUISpinControl.cpp */,
 				F56C84BD131F42E9000AD0F6 /* GUISpinControl.h */,
+				F56C8518131F42E9000AD0F6 /* GUISpinControlEx.cpp */,
 				F56C84BE131F42E9000AD0F6 /* GUISpinControlEx.h */,
+				F56C8519131F42E9000AD0F6 /* GUIStandardWindow.cpp */,
 				F56C84BF131F42E9000AD0F6 /* GUIStandardWindow.h */,
+				F56C851A131F42E9000AD0F6 /* GUIStaticItem.cpp */,
 				F56C84C0131F42E9000AD0F6 /* GUIStaticItem.h */,
+				F56C851B131F42E9000AD0F6 /* GUITextBox.cpp */,
 				F56C84C1131F42E9000AD0F6 /* GUITextBox.h */,
+				F56C851C131F42E9000AD0F6 /* GUITextLayout.cpp */,
 				F56C84C2131F42E9000AD0F6 /* GUITextLayout.h */,
+				F56C851D131F42E9000AD0F6 /* GUITexture.cpp */,
 				F56C84C3131F42E9000AD0F6 /* GUITexture.h */,
+				F56C851E131F42E9000AD0F6 /* GUITextureD3D.cpp */,
 				F56C84C4131F42E9000AD0F6 /* GUITextureD3D.h */,
+				F56C851F131F42E9000AD0F6 /* GUITextureGL.cpp */,
 				F56C84C5131F42E9000AD0F6 /* GUITextureGL.h */,
+				F56C8520131F42E9000AD0F6 /* GUITextureGLES.cpp */,
 				F56C84C6131F42E9000AD0F6 /* GUITextureGLES.h */,
+				F56C8521131F42E9000AD0F6 /* GUIToggleButtonControl.cpp */,
 				F56C84C7131F42E9000AD0F6 /* GUIToggleButtonControl.h */,
+				F56C8522131F42E9000AD0F6 /* GUIVideoControl.cpp */,
 				F56C84C8131F42E9000AD0F6 /* GUIVideoControl.h */,
+				F56C8523131F42E9000AD0F6 /* GUIVisualisationControl.cpp */,
 				F56C84C9131F42E9000AD0F6 /* GUIVisualisationControl.h */,
+				F56C8524131F42E9000AD0F6 /* GUIWindow.cpp */,
 				F56C84CA131F42E9000AD0F6 /* GUIWindow.h */,
+				F56C8525131F42E9000AD0F6 /* GUIWindowManager.cpp */,
 				F56C84CB131F42E9000AD0F6 /* GUIWindowManager.h */,
+				F56C8526131F42E9000AD0F6 /* GUIWrappingListContainer.cpp */,
 				F56C84CC131F42E9000AD0F6 /* GUIWrappingListContainer.h */,
 				F56C84CD131F42E9000AD0F6 /* IAudioDeviceChangedCallback.h */,
 				F56C84CE131F42E9000AD0F6 /* IMsgTargetCallback.h */,
+				F56C8527131F42E9000AD0F6 /* IWindowManagerCallback.cpp */,
 				F56C84CF131F42E9000AD0F6 /* IWindowManagerCallback.h */,
+				329189291423A9B700E878CD /* JpegIO.cpp */,
+				3291892A1423A9B700E878CD /* JpegIO.h */,
+				F56C8528131F42E9000AD0F6 /* Key.cpp */,
 				F56C84D0131F42E9000AD0F6 /* Key.h */,
+				F56C8529131F42E9000AD0F6 /* LocalizeStrings.cpp */,
 				F56C84D1131F42E9000AD0F6 /* LocalizeStrings.h */,
+				F56C852A131F42E9000AD0F6 /* MatrixGLES.cpp */,
 				F56C84D2131F42E9000AD0F6 /* MatrixGLES.h */,
 				F56C84D3131F42E9000AD0F6 /* Resolution.h */,
+				F56C852B131F42E9000AD0F6 /* Shader.cpp */,
 				F56C84D4131F42E9000AD0F6 /* Shader.h */,
+				F56C852C131F42E9000AD0F6 /* Texture.cpp */,
 				F56C84D5131F42E9000AD0F6 /* Texture.h */,
+				F56C852D131F42E9000AD0F6 /* TextureBundle.cpp */,
 				F56C84D6131F42E9000AD0F6 /* TextureBundle.h */,
+				F56C852E131F42E9000AD0F6 /* TextureBundleXBT.cpp */,
 				F56C84D7131F42E9000AD0F6 /* TextureBundleXBT.h */,
+				F56C852F131F42E9000AD0F6 /* TextureBundleXPR.cpp */,
 				F56C84D8131F42E9000AD0F6 /* TextureBundleXPR.h */,
+				F56C8530131F42E9000AD0F6 /* TextureDX.cpp */,
 				F56C84D9131F42E9000AD0F6 /* TextureDX.h */,
+				F56C8531131F42E9000AD0F6 /* TextureGL.cpp */,
 				F56C84DA131F42E9000AD0F6 /* TextureGL.h */,
+				F56C8532131F42E9000AD0F6 /* TextureManager.cpp */,
 				F56C84DB131F42E9000AD0F6 /* TextureManager.h */,
 				F56C84DC131F42E9000AD0F6 /* TransformMatrix.h */,
 				F56C84DD131F42E9000AD0F6 /* Tween.h */,
-				F56C84DE131F42E9000AD0F6 /* VisibleEffect.h */,
-				F56C84DF131F42E9000AD0F6 /* XBTF.h */,
-				F56C84E0131F42E9000AD0F6 /* XBTFReader.h */,
-				F56C84E1131F42E9000AD0F6 /* AnimatedGif.cpp */,
-				F56C84E2131F42E9000AD0F6 /* AudioContext.cpp */,
-				F56C84E3131F42E9000AD0F6 /* D3DResource.cpp */,
-				F56C84E4131F42E9000AD0F6 /* DDSImage.cpp */,
-				F56C84E5131F42E9000AD0F6 /* DirectXGraphics.cpp */,
-				F56C84E6131F42E9000AD0F6 /* FrameBufferObject.cpp */,
-				F56C84E7131F42E9000AD0F6 /* GraphicContext.cpp */,
-				F56C84E8131F42E9000AD0F6 /* GUIAudioManager.cpp */,
-				F56C84E9131F42E9000AD0F6 /* GUIBaseContainer.cpp */,
-				F56C84EA131F42E9000AD0F6 /* GUIBorderedImage.cpp */,
-				F56C84EB131F42E9000AD0F6 /* GUIButtonControl.cpp */,
-				F56C84ED131F42E9000AD0F6 /* GUICheckMarkControl.cpp */,
-				F56C84EE131F42E9000AD0F6 /* GUIColorManager.cpp */,
-				F56C84EF131F42E9000AD0F6 /* GUIControl.cpp */,
-				F56C84F0131F42E9000AD0F6 /* GUIControlFactory.cpp */,
-				F56C84F1131F42E9000AD0F6 /* GUIControlGroup.cpp */,
-				F56C84F2131F42E9000AD0F6 /* GUIControlGroupList.cpp */,
-				F56C84F3131F42E9000AD0F6 /* GUIControlProfiler.cpp */,
-				F56C84F4131F42E9000AD0F6 /* GUIDialog.cpp */,
-				F56C84F5131F42E9000AD0F6 /* GUIEditControl.cpp */,
-				F56C84F6131F42E9000AD0F6 /* GUIFadeLabelControl.cpp */,
-				F56C84F7131F42E9000AD0F6 /* GUIFixedListContainer.cpp */,
-				F56C84F8131F42E9000AD0F6 /* GUIFont.cpp */,
-				F56C84F9131F42E9000AD0F6 /* GUIFontManager.cpp */,
-				F56C84FA131F42E9000AD0F6 /* GUIFontTTF.cpp */,
-				F56C84FB131F42E9000AD0F6 /* GUIFontTTFDX.cpp */,
-				F56C84FC131F42E9000AD0F6 /* GUIFontTTFGL.cpp */,
-				F56C84FD131F42E9000AD0F6 /* GUIImage.cpp */,
-				F56C84FE131F42E9000AD0F6 /* GUIIncludes.cpp */,
-				F56C84FF131F42E9000AD0F6 /* GUIInfoTypes.cpp */,
-				F56C8500131F42E9000AD0F6 /* GUILabel.cpp */,
-				F56C8501131F42E9000AD0F6 /* GUILabelControl.cpp */,
-				F56C8502131F42E9000AD0F6 /* GUIListContainer.cpp */,
-				F56C8503131F42E9000AD0F6 /* GUIListGroup.cpp */,
-				F56C8504131F42E9000AD0F6 /* GUIListItem.cpp */,
-				F56C8505131F42E9000AD0F6 /* GUIListItemLayout.cpp */,
-				F56C8506131F42E9000AD0F6 /* GUIListLabel.cpp */,
-				F56C8507131F42E9000AD0F6 /* GUIMessage.cpp */,
-				F56C8508131F42E9000AD0F6 /* GUIMoverControl.cpp */,
-				F56C8509131F42E9000AD0F6 /* GUIMultiImage.cpp */,
-				F56C850A131F42E9000AD0F6 /* GUIMultiSelectText.cpp */,
-				F56C850B131F42E9000AD0F6 /* GUIPanelContainer.cpp */,
-				F56C850C131F42E9000AD0F6 /* GUIProgressControl.cpp */,
-				F56C850D131F42E9000AD0F6 /* GUIRadioButtonControl.cpp */,
-				F56C850E131F42E9000AD0F6 /* GUIRenderingControl.cpp */,
-				F56C850F131F42E9000AD0F6 /* GUIResizeControl.cpp */,
-				F56C8510131F42E9000AD0F6 /* GUIRSSControl.cpp */,
-				F56C8511131F42E9000AD0F6 /* GUIScrollBarControl.cpp */,
-				F56C8512131F42E9000AD0F6 /* GUISelectButtonControl.cpp */,
-				F56C8513131F42E9000AD0F6 /* GUISettingsSliderControl.cpp */,
-				F56C8514131F42E9000AD0F6 /* GUIShader.cpp */,
-				F56C8515131F42E9000AD0F6 /* GUISliderControl.cpp */,
-				F56C8516131F42E9000AD0F6 /* GUISound.cpp */,
-				F56C8517131F42E9000AD0F6 /* GUISpinControl.cpp */,
-				F56C8518131F42E9000AD0F6 /* GUISpinControlEx.cpp */,
-				F56C8519131F42E9000AD0F6 /* GUIStandardWindow.cpp */,
-				F56C851A131F42E9000AD0F6 /* GUIStaticItem.cpp */,
-				F56C851B131F42E9000AD0F6 /* GUITextBox.cpp */,
-				F56C851C131F42E9000AD0F6 /* GUITextLayout.cpp */,
-				F56C851D131F42E9000AD0F6 /* GUITexture.cpp */,
-				F56C851E131F42E9000AD0F6 /* GUITextureD3D.cpp */,
-				F56C851F131F42E9000AD0F6 /* GUITextureGL.cpp */,
-				F56C8520131F42E9000AD0F6 /* GUITextureGLES.cpp */,
-				F56C8521131F42E9000AD0F6 /* GUIToggleButtonControl.cpp */,
-				F56C8522131F42E9000AD0F6 /* GUIVideoControl.cpp */,
-				F56C8523131F42E9000AD0F6 /* GUIVisualisationControl.cpp */,
-				F56C8524131F42E9000AD0F6 /* GUIWindow.cpp */,
-				F56C8525131F42E9000AD0F6 /* GUIWindowManager.cpp */,
-				F56C8526131F42E9000AD0F6 /* GUIWrappingListContainer.cpp */,
-				F56C8527131F42E9000AD0F6 /* IWindowManagerCallback.cpp */,
-				F56C8528131F42E9000AD0F6 /* Key.cpp */,
-				F56C8529131F42E9000AD0F6 /* LocalizeStrings.cpp */,
-				F56C852A131F42E9000AD0F6 /* MatrixGLES.cpp */,
-				F56C852B131F42E9000AD0F6 /* Shader.cpp */,
-				F56C852C131F42E9000AD0F6 /* Texture.cpp */,
-				F56C852D131F42E9000AD0F6 /* TextureBundle.cpp */,
-				F56C852E131F42E9000AD0F6 /* TextureBundleXBT.cpp */,
-				F56C852F131F42E9000AD0F6 /* TextureBundleXPR.cpp */,
-				F56C8530131F42E9000AD0F6 /* TextureDX.cpp */,
-				F56C8531131F42E9000AD0F6 /* TextureGL.cpp */,
-				F56C8532131F42E9000AD0F6 /* TextureManager.cpp */,
 				F56C8533131F42E9000AD0F6 /* VisibleEffect.cpp */,
+				F56C84DE131F42E9000AD0F6 /* VisibleEffect.h */,
 				F56C8534131F42E9000AD0F6 /* XBTF.cpp */,
+				F56C84DF131F42E9000AD0F6 /* XBTF.h */,
 				F56C8535131F42E9000AD0F6 /* XBTFReader.cpp */,
+				F56C84E0131F42E9000AD0F6 /* XBTFReader.h */,
 			);
 			path = guilib;
 			sourceTree = "<group>";
@@ -4907,16 +4896,16 @@
 		F56C8546131F42E9000AD0F6 /* interfaces */ = {
 			isa = PBXGroup;
 			children = (
+				F5AE41381341754C0004BD79 /* http-api */,
 				F5E6209313E907E200D5F2CD /* info */,
+				F5AE413F134175520004BD79 /* json-rpc */,
 				F56C8547131F42E9000AD0F6 /* python */,
 				F56C8586131F42EA000AD0F6 /* AnnouncementManager.cpp */,
 				F56C8587131F42EA000AD0F6 /* AnnouncementManager.h */,
 				C80711AE135DB865002F601B /* AnnouncementUtils.h */,
 				F56C8588131F42EA000AD0F6 /* Builtins.cpp */,
 				F56C8589131F42EA000AD0F6 /* Builtins.h */,
-				F5AE41381341754C0004BD79 /* http-api */,
 				F56C858A131F42EA000AD0F6 /* IAnnouncer.h */,
-				F5AE413F134175520004BD79 /* json-rpc */,
 			);
 			path = interfaces;
 			sourceTree = "<group>";
@@ -4936,8 +4925,6 @@
 		F56C8549131F42E9000AD0F6 /* xbmcmodule */ = {
 			isa = PBXGroup;
 			children = (
-				F56C854E131F42E9000AD0F6 /* controlslider.cpp */,
-				F56C854F131F42E9000AD0F6 /* controlradiobutton.cpp */,
 				F56C8550131F42E9000AD0F6 /* action.cpp */,
 				F56C8551131F42E9000AD0F6 /* action.h */,
 				F56C8552131F42E9000AD0F6 /* control.cpp */,
@@ -4951,6 +4938,8 @@
 				F56C8559131F42E9000AD0F6 /* controllabel.cpp */,
 				F56C855A131F42E9000AD0F6 /* controllist.cpp */,
 				F56C855B131F42E9000AD0F6 /* controlprogress.cpp */,
+				F56C854F131F42E9000AD0F6 /* controlradiobutton.cpp */,
+				F56C854E131F42E9000AD0F6 /* controlslider.cpp */,
 				F56C855C131F42E9000AD0F6 /* controlspin.cpp */,
 				F56C855D131F42E9000AD0F6 /* controltextbox.cpp */,
 				F56C855E131F42E9000AD0F6 /* dialog.cpp */,
@@ -5000,8 +4989,6 @@
 		F56C858B131F42EA000AD0F6 /* linux */ = {
 			isa = PBXGroup;
 			children = (
-				F56C858C131F42EA000AD0F6 /* stat_utf8.h */,
-				F56C858D131F42EA000AD0F6 /* stdio_utf8.h */,
 				F56C8590131F42EA000AD0F6 /* ConvUtils.cpp */,
 				F56C8591131F42EA000AD0F6 /* ConvUtils.h */,
 				F56C8592131F42EA000AD0F6 /* LinuxResourceCounter.cpp */,
@@ -5010,8 +4997,10 @@
 				F56C8595131F42EA000AD0F6 /* LinuxTimezone.h */,
 				F56C8596131F42EA000AD0F6 /* PlatformDefs.h */,
 				F56C8597131F42EA000AD0F6 /* PlatformInclude.h */,
-				F56C8598131F42EA000AD0F6 /* PosixMountProvider.h */,
 				F56C8599131F42EA000AD0F6 /* PosixMountProvider.cpp */,
+				F56C8598131F42EA000AD0F6 /* PosixMountProvider.h */,
+				F56C858C131F42EA000AD0F6 /* stat_utf8.h */,
+				F56C858D131F42EA000AD0F6 /* stdio_utf8.h */,
 				F56C859A131F42EA000AD0F6 /* XEventUtils.cpp */,
 				F56C859B131F42EA000AD0F6 /* XEventUtils.h */,
 				F56C859C131F42EA000AD0F6 /* XFileUtils.cpp */,
@@ -5122,7 +5111,6 @@
 		F56C85D6131F42EA000AD0F6 /* tags */ = {
 			isa = PBXGroup;
 			children = (
-				F56C85D7131F42EA000AD0F6 /* Tag.h */,
 				F56C85D8131F42EA000AD0F6 /* APEv2Tag.cpp */,
 				F56C85D9131F42EA000AD0F6 /* APEv2Tag.h */,
 				F56C85DA131F42EA000AD0F6 /* DllLibid3tag.h */,
@@ -5176,6 +5164,7 @@
 				F56C860A131F42EA000AD0F6 /* MusicInfoTagLoaderYM.h */,
 				F56C860B131F42EA000AD0F6 /* OggTag.cpp */,
 				F56C860C131F42EA000AD0F6 /* OggTag.h */,
+				F56C85D7131F42EA000AD0F6 /* Tag.h */,
 				F56C860D131F42EA000AD0F6 /* VorbisTag.cpp */,
 				F56C860E131F42EA000AD0F6 /* VorbisTag.h */,
 			);
@@ -5211,6 +5200,8 @@
 				DFA6BE4213FECA010048CC11 /* AirPlayServer.h */,
 				DF4485731400662D0069344B /* AirTunesServer.cpp */,
 				DF4485741400662D0069344B /* AirTunesServer.h */,
+				F56C8656131F42EB000AD0F6 /* cddb.cpp */,
+				F56C8657131F42EB000AD0F6 /* cddb.h */,
 				F56C863B131F42EA000AD0F6 /* DNSNameCache.cpp */,
 				F56C863C131F42EA000AD0F6 /* DNSNameCache.h */,
 				F56C863D131F42EA000AD0F6 /* EventClient.cpp */,
@@ -5228,18 +5219,16 @@
 				F56C8649131F42EB000AD0F6 /* Socket.h */,
 				F56C864A131F42EB000AD0F6 /* TCPServer.cpp */,
 				F56C864B131F42EB000AD0F6 /* TCPServer.h */,
-				F56C864C131F42EB000AD0F6 /* UPnP.cpp */,
-				F56C864D131F42EB000AD0F6 /* UPnP.h */,
 				F56C864E131F42EB000AD0F6 /* UdpClient.cpp */,
 				F56C864F131F42EB000AD0F6 /* UdpClient.h */,
+				F56C864C131F42EB000AD0F6 /* UPnP.cpp */,
+				F56C864D131F42EB000AD0F6 /* UPnP.h */,
 				F56C8650131F42EB000AD0F6 /* WebServer.cpp */,
 				F56C8651131F42EB000AD0F6 /* WebServer.h */,
 				F56C8652131F42EB000AD0F6 /* Zeroconf.cpp */,
 				F56C8653131F42EB000AD0F6 /* Zeroconf.h */,
 				F56C8654131F42EB000AD0F6 /* ZeroconfBrowser.cpp */,
 				F56C8655131F42EB000AD0F6 /* ZeroconfBrowser.h */,
-				F56C8656131F42EB000AD0F6 /* cddb.cpp */,
-				F56C8657131F42EB000AD0F6 /* cddb.h */,
 			);
 			path = network;
 			sourceTree = "<group>";
@@ -5281,16 +5270,16 @@
 		F56C8658131F42EB000AD0F6 /* osx */ = {
 			isa = PBXGroup;
 			children = (
+				F56C8B9B131F4466000AD0F6 /* ios */,
 				F56C8659131F42EB000AD0F6 /* AutoPool.h */,
 				F56C865A131F42EB000AD0F6 /* AutoPool.mm */,
 				F5B13DCD1334490D0045076D /* DarwinUtils.h */,
 				F5B13DCE1334490D0045076D /* DarwinUtils.mm */,
-				F56C8B9B131F4466000AD0F6 /* ios */,
+				F56C866F131F42EB000AD0F6 /* eprintf.cpp */,
 				F56C8669131F42EB000AD0F6 /* IOSCoreAudio.cpp */,
 				F56C866A131F42EB000AD0F6 /* IOSCoreAudio.h */,
 				F56C866B131F42EB000AD0F6 /* OSXGNUReplacements.c */,
 				F56C866C131F42EB000AD0F6 /* OSXGNUReplacements.h */,
-				F56C866F131F42EB000AD0F6 /* eprintf.cpp */,
 			);
 			path = osx;
 			sourceTree = "<group>";
@@ -5413,6 +5402,10 @@
 		F56C86B1131F42EB000AD0F6 /* settings */ = {
 			isa = PBXGroup;
 			children = (
+				F56C86BE131F42EB000AD0F6 /* AdvancedSettings.cpp */,
+				F56C86BF131F42EB000AD0F6 /* AdvancedSettings.h */,
+				7C0A7EDC13A5DC2800AFC2BD /* AppParamParser.cpp */,
+				7C0A7EDD13A5DC2800AFC2BD /* AppParamParser.h */,
 				F56C86B2131F42EB000AD0F6 /* GUIDialogContentSettings.cpp */,
 				F56C86B3131F42EB000AD0F6 /* GUIDialogContentSettings.h */,
 				F56C86B4131F42EB000AD0F6 /* GUIDialogLockSettings.cpp */,
@@ -5421,14 +5414,8 @@
 				F56C86B7131F42EB000AD0F6 /* GUIDialogProfileSettings.h */,
 				F56C86B8131F42EB000AD0F6 /* GUIDialogSettings.cpp */,
 				F56C86B9131F42EB000AD0F6 /* GUIDialogSettings.h */,
-				F56C86BA131F42EB000AD0F6 /* GUIWindowTestPattern.cpp */,
-				F56C86BB131F42EB000AD0F6 /* GUIWindowTestPattern.h */,
 				F56C86BC131F42EB000AD0F6 /* GUISettings.cpp */,
 				F56C86BD131F42EB000AD0F6 /* GUISettings.h */,
-				F56C86BE131F42EB000AD0F6 /* AdvancedSettings.cpp */,
-				F56C86BF131F42EB000AD0F6 /* AdvancedSettings.h */,
-				7C0A7EDC13A5DC2800AFC2BD /* AppParamParser.cpp */,
-				7C0A7EDD13A5DC2800AFC2BD /* AppParamParser.h */,
 				F56C86C0131F42EB000AD0F6 /* GUIWindowSettings.cpp */,
 				F56C86C1131F42EB000AD0F6 /* GUIWindowSettings.h */,
 				F56C86C2131F42EB000AD0F6 /* GUIWindowSettingsCategory.cpp */,
@@ -5437,6 +5424,8 @@
 				F56C86C5131F42EB000AD0F6 /* GUIWindowSettingsProfile.h */,
 				F56C86C6131F42EB000AD0F6 /* GUIWindowSettingsScreenCalibration.cpp */,
 				F56C86C7131F42EB000AD0F6 /* GUIWindowSettingsScreenCalibration.h */,
+				F56C86BA131F42EB000AD0F6 /* GUIWindowTestPattern.cpp */,
+				F56C86BB131F42EB000AD0F6 /* GUIWindowTestPattern.h */,
 				F56C86C8131F42EB000AD0F6 /* Profile.cpp */,
 				F56C86C9131F42EB000AD0F6 /* Profile.h */,
 				F56C86CA131F42EB000AD0F6 /* Settings.cpp */,
@@ -5455,15 +5444,15 @@
 				F56C86D1131F42EB000AD0F6 /* osx */,
 				F56C86D4131F42EB000AD0F6 /* AutorunMediaJob.cpp */,
 				F56C86D5131F42EB000AD0F6 /* AutorunMediaJob.h */,
+				F56C86DD131F42EB000AD0F6 /* cdioSupport.cpp */,
+				F56C86DE131F42EB000AD0F6 /* cdioSupport.h */,
 				F56C86D6131F42EB000AD0F6 /* DetectDVDType.cpp */,
 				F56C86D7131F42EB000AD0F6 /* DetectDVDType.h */,
-				F56C86D8131F42EB000AD0F6 /* IStorageProvider.h */,
 				F56C86D9131F42EB000AD0F6 /* IoSupport.cpp */,
 				F56C86DA131F42EB000AD0F6 /* IoSupport.h */,
+				F56C86D8131F42EB000AD0F6 /* IStorageProvider.h */,
 				F56C86DB131F42EB000AD0F6 /* MediaManager.cpp */,
 				F56C86DC131F42EB000AD0F6 /* MediaManager.h */,
-				F56C86DD131F42EB000AD0F6 /* cdioSupport.cpp */,
-				F56C86DE131F42EB000AD0F6 /* cdioSupport.h */,
 			);
 			path = storage;
 			sourceTree = "<group>";
@@ -5503,25 +5492,10 @@
 		F56C86FA131F42EB000AD0F6 /* utils */ = {
 			isa = PBXGroup;
 			children = (
-				F56C86FB131F42EB000AD0F6 /* GlobalsHandling.h */,
-				F56C86FC131F42EB000AD0F6 /* GLUtils.cpp */,
-				F56C86FD131F42EB000AD0F6 /* GLUtils.h */,
-				F56C86FE131F42EB000AD0F6 /* MathUtils.h */,
-				F56C86FF131F42EB000AD0F6 /* XMLUtils.cpp */,
-				F56C8700131F42EB000AD0F6 /* XMLUtils.h */,
-				F56C8701131F42EB000AD0F6 /* StringUtils.cpp */,
-				F56C8702131F42EB000AD0F6 /* StringUtils.h */,
-				F56C8703131F42EB000AD0F6 /* URIUtils.cpp */,
-				F56C8704131F42EB000AD0F6 /* URIUtils.h */,
-				F56C8705131F42EB000AD0F6 /* Crc32.cpp */,
-				F56C8706131F42EB000AD0F6 /* Crc32.h */,
-				F56C8707131F42EB000AD0F6 /* fstrcmp.c */,
 				F56C8708131F42EB000AD0F6 /* AlarmClock.cpp */,
 				F56C8709131F42EB000AD0F6 /* AlarmClock.h */,
 				F56C870A131F42EB000AD0F6 /* AliasShortcutUtils.cpp */,
 				F56C870B131F42EB000AD0F6 /* AliasShortcutUtils.h */,
-				F56C870C131F42EB000AD0F6 /* LangCodeExpander.cpp */,
-				F56C870D131F42EB000AD0F6 /* LangCodeExpander.h */,
 				F56C8710131F42EB000AD0F6 /* Archive.cpp */,
 				F56C8711131F42EC000AD0F6 /* Archive.h */,
 				F56C8712131F42EC000AD0F6 /* AsyncFileCopy.cpp */,
@@ -5534,6 +5508,8 @@
 				F56C8719131F42EC000AD0F6 /* CharsetConverter.h */,
 				F56C871A131F42EC000AD0F6 /* CPUInfo.cpp */,
 				F56C871B131F42EC000AD0F6 /* CPUInfo.h */,
+				F56C8705131F42EB000AD0F6 /* Crc32.cpp */,
+				F56C8706131F42EB000AD0F6 /* Crc32.h */,
 				F56C871C131F42EC000AD0F6 /* DownloadQueue.cpp */,
 				F56C871D131F42EC000AD0F6 /* DownloadQueue.h */,
 				F56C871E131F42EC000AD0F6 /* DownloadQueueManager.cpp */,
@@ -5543,11 +5519,17 @@
 				F56C8722131F42EC000AD0F6 /* Fanart.h */,
 				F56C8723131F42EC000AD0F6 /* fastmemcpy-arm.S */,
 				F56C8724131F42EC000AD0F6 /* fastmemcpy.h */,
+				F56C8764131F42EC000AD0F6 /* fft.cpp */,
+				F56C8765131F42EC000AD0F6 /* fft.h */,
 				F56C8725131F42EC000AD0F6 /* FileOperationJob.cpp */,
 				F56C8726131F42EC000AD0F6 /* FileOperationJob.h */,
 				F56C8727131F42EC000AD0F6 /* FileUtils.cpp */,
 				F56C8728131F42EC000AD0F6 /* FileUtils.h */,
+				F56C8707131F42EB000AD0F6 /* fstrcmp.c */,
 				F56C8729131F42EC000AD0F6 /* fstrcmp.h */,
+				F56C86FB131F42EB000AD0F6 /* GlobalsHandling.h */,
+				F56C86FC131F42EB000AD0F6 /* GLUtils.cpp */,
+				F56C86FD131F42EB000AD0F6 /* GLUtils.h */,
 				F56C872A131F42EC000AD0F6 /* HTMLTable.cpp */,
 				F56C872B131F42EC000AD0F6 /* HTMLTable.h */,
 				F56C872C131F42EC000AD0F6 /* HTMLUtil.cpp */,
@@ -5558,19 +5540,22 @@
 				DFA6BE7613FED09C0048CC11 /* HttpParser.h */,
 				F56C8730131F42EC000AD0F6 /* InfoLoader.cpp */,
 				F56C8731131F42EC000AD0F6 /* InfoLoader.h */,
-				F56C8732131F42EC000AD0F6 /* LabelFormatter.cpp */,
-				F56C8733131F42EC000AD0F6 /* LabelFormatter.h */,
+				F56C8736131F42EC000AD0F6 /* Job.h */,
 				F56C8734131F42EC000AD0F6 /* JobManager.cpp */,
 				F56C8735131F42EC000AD0F6 /* JobManager.h */,
-				F56C8736131F42EC000AD0F6 /* Job.h */,
 				1840B7761399616D007C848B /* JSONVariantParser.cpp */,
 				1840B7771399616D007C848B /* JSONVariantParser.h */,
 				1840B7781399616D007C848B /* JSONVariantWriter.cpp */,
 				1840B7791399616D007C848B /* JSONVariantWriter.h */,
+				F56C8732131F42EC000AD0F6 /* LabelFormatter.cpp */,
+				F56C8733131F42EC000AD0F6 /* LabelFormatter.h */,
+				F56C870C131F42EB000AD0F6 /* LangCodeExpander.cpp */,
+				F56C870D131F42EB000AD0F6 /* LangCodeExpander.h */,
 				F56C8737131F42EC000AD0F6 /* LCD.cpp */,
 				F56C8738131F42EC000AD0F6 /* LCD.h */,
 				F56C8739131F42EC000AD0F6 /* log.cpp */,
 				F56C873A131F42EC000AD0F6 /* log.h */,
+				F56C86FE131F42EB000AD0F6 /* MathUtils.h */,
 				F56C873B131F42EC000AD0F6 /* md5.cpp */,
 				F56C873C131F42EC000AD0F6 /* md5.h */,
 				F56C873D131F42EC000AD0F6 /* PCMAmplifier.cpp */,
@@ -5595,12 +5580,16 @@
 				F56C8750131F42EC000AD0F6 /* ScraperUrl.h */,
 				F56C8751131F42EC000AD0F6 /* Splash.cpp */,
 				F56C8752131F42EC000AD0F6 /* Splash.h */,
+				F56C8766131F42EC000AD0F6 /* ssrc.cpp */,
+				F56C8767131F42EC000AD0F6 /* ssrc.h */,
 				F56C8753131F42EC000AD0F6 /* Stopwatch.cpp */,
 				F56C8754131F42EC000AD0F6 /* Stopwatch.h */,
 				F56C8755131F42EC000AD0F6 /* StreamDetails.cpp */,
 				F56C8756131F42EC000AD0F6 /* StreamDetails.h */,
 				18ECC99B13CF17D200A9ED6C /* StreamUtils.cpp */,
 				18ECC99C13CF17D200A9ED6C /* StreamUtils.h */,
+				F56C8701131F42EB000AD0F6 /* StringUtils.cpp */,
+				F56C8702131F42EB000AD0F6 /* StringUtils.h */,
 				F56C8757131F42EC000AD0F6 /* SystemInfo.cpp */,
 				F56C8758131F42EC000AD0F6 /* SystemInfo.h */,
 				7CEE2E7D13D6B7D4000ABF2A /* TimeSmoother.cpp */,
@@ -5609,6 +5598,8 @@
 				F56C875A131F42EC000AD0F6 /* TimeUtils.h */,
 				F56C875B131F42EC000AD0F6 /* TuxBoxUtil.cpp */,
 				F56C875C131F42EC000AD0F6 /* TuxBoxUtil.h */,
+				F56C8703131F42EB000AD0F6 /* URIUtils.cpp */,
+				F56C8704131F42EB000AD0F6 /* URIUtils.h */,
 				F56C875D131F42EC000AD0F6 /* Variant.cpp */,
 				F56C875E131F42EC000AD0F6 /* Variant.h */,
 				F56C875F131F42EC000AD0F6 /* Weather.cpp */,
@@ -5616,10 +5607,8 @@
 				F56C8761131F42EC000AD0F6 /* Win32Exception.cpp */,
 				F56C8762131F42EC000AD0F6 /* Win32Exception.h */,
 				F56C8763131F42EC000AD0F6 /* WindowsShortcut.h */,
-				F56C8764131F42EC000AD0F6 /* fft.cpp */,
-				F56C8765131F42EC000AD0F6 /* fft.h */,
-				F56C8766131F42EC000AD0F6 /* ssrc.cpp */,
-				F56C8767131F42EC000AD0F6 /* ssrc.h */,
+				F56C86FF131F42EB000AD0F6 /* XMLUtils.cpp */,
+				F56C8700131F42EB000AD0F6 /* XMLUtils.h */,
 			);
 			path = utils;
 			sourceTree = "<group>";
@@ -5696,10 +5685,10 @@
 			isa = PBXGroup;
 			children = (
 				F56C879B131F42EC000AD0F6 /* osx */,
+				F56C87A3131F42EC000AD0F6 /* WindowingFactory.h */,
 				F56C87A0131F42EC000AD0F6 /* WinEvents.h */,
 				F56C87A1131F42EC000AD0F6 /* WinSystem.cpp */,
 				F56C87A2131F42EC000AD0F6 /* WinSystem.h */,
-				F56C87A3131F42EC000AD0F6 /* WindowingFactory.h */,
 				F56C87A4131F42EC000AD0F6 /* XBMC_events.h */,
 			);
 			path = windowing;
@@ -5773,25 +5762,25 @@
 		F5899DC91287212700D8079E /* System Libs and Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				F54D9E8012B713F8006870F9 /* libc.dylib */,
-				F589AE461288E07400D8079E /* libz.dylib */,
-				F589AE4C1288E0A300D8079E /* libm.dylib */,
+				F56B14A412CAF523009B4C96 /* AudioToolbox.framework */,
+				4D5D2E1D1301758F006ABC13 /* CFNetwork.framework */,
+				3255316512B2D02400837CD2 /* CoreAudio.framework */,
+				F56B15D412CD67A9009B4C96 /* CoreGraphics.framework */,
+				F5A29EC212A7221B003A610C /* CoreMedia.framework */,
+				F56B143312CAF279009B4C96 /* CoreVideo.framework */,
+				F5899DCD1287212700D8079E /* Foundation.framework */,
+				F56B160712CD6999009B4C96 /* ImageIO.framework */,
 				F589AE441288E06100D8079E /* libbz2.dylib */,
-				F589AE481288E07D00D8079E /* libxml2.dylib */,
 				F589AE421288E02000D8079E /* libiconv.dylib */,
+				F589AE4C1288E0A300D8079E /* libm.dylib */,
 				F589AE4A1288E09200D8079E /* libncurses.dylib */,
-				4D5D2E1D1301758F006ABC13 /* CFNetwork.framework */,
-				F5899DCD1287212700D8079E /* Foundation.framework */,
-				F5899DCC1287212700D8079E /* UIKit.framework */,
-				F5899DCA1287212700D8079E /* QuartzCore.framework */,
+				F589AE481288E07D00D8079E /* libxml2.dylib */,
+				F589AE461288E07400D8079E /* libz.dylib */,
 				F5899DCB1287212700D8079E /* OpenGLES.framework */,
-				F5A29EC212A7221B003A610C /* CoreMedia.framework */,
-				F56B14A412CAF523009B4C96 /* AudioToolbox.framework */,
-				3255316512B2D02400837CD2 /* CoreAudio.framework */,
-				F56B160712CD6999009B4C96 /* ImageIO.framework */,
-				F56B143312CAF279009B4C96 /* CoreVideo.framework */,
-				F56B15D412CD67A9009B4C96 /* CoreGraphics.framework */,
+				F5899DCA1287212700D8079E /* QuartzCore.framework */,
+				F5899DCC1287212700D8079E /* UIKit.framework */,
 				F5A29F2612A72246003A610C /* VideoToolbox.framework */,
+				F589AE4C1288E0A300D8079E /* libm.dylib */,
 			);
 			name = "System Libs and Frameworks";
 			sourceTree = "<group>";
@@ -5800,8 +5789,8 @@
 			isa = PBXGroup;
 			children = (
 				F56C8C03131F47EA000AD0F6 /* libapetag.a */,
-				F56C8C0D131F4811000AD0F6 /* libsquish.a */,
 				F56C8C0E131F4811000AD0F6 /* librtv.a */,
+				F56C8C0D131F4811000AD0F6 /* libsquish.a */,
 				F56C8C10131F4811000AD0F6 /* libxdaap.a */,
 				18404DD21396C3D200863BBA /* SlingboxLib.a */,
 			);