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

1 files changed, 297 insertions, 545 deletions

diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index ce5398675a..fd6f1b43f6 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -4017,11 +4017,11 @@
 		08FB7794FE84155DC02AAC07 /* XBMC */ = {
 			isa = PBXGroup;
 			children = (
-				08FB7795FE84155DC02AAC07 /* Source */,
 				C6859E96029091FE04C91782 /* Documentation */,
 				F57E1ED20E36E8FD00700C9D /* internal libs */,
-				08FB779DFE84155DC02AAC07 /* System Libs and Frameworks */,
 				19C28FBDFE9D53C911CA2CBB /* Products */,
+				08FB7795FE84155DC02AAC07 /* Source */,
+				08FB779DFE84155DC02AAC07 /* System Libs and Frameworks */,
 			);
 			name = XBMC;
 			sourceTree = "<group>";
@@ -4038,28 +4038,28 @@
 		08FB779DFE84155DC02AAC07 /* System Libs and Frameworks */ = {
 			isa = PBXGroup;
 			children = (
-				F56C8CE1131F5DAF000AD0F6 /* libc.dylib */,
-				F56C8CE6131F5DC6000AD0F6 /* libz.dylib */,
-				F56C8CE9131F5DCC000AD0F6 /* libm.dylib */,
-				F56C8CEC131F5DE7000AD0F6 /* libbz2.dylib */,
-				F56C8CEF131F5DED000AD0F6 /* libxml2.dylib */,
-				F56C8CF2131F5DFD000AD0F6 /* libiconv.dylib */,
-				F56C8CF5131F5E0B000AD0F6 /* libncurses.dylib */,
-				88ECB6580DE013C4003396A7 /* DiskArbitration.framework */,
-				E35EF3230D380E1E00DB5CD5 /* Carbon.framework */,
-				E35EF2540D380C3D00DB5CD5 /* QuickTime.framework */,
-				E33466A50D2E5103005A65EC /* IOKit.framework */,
 				E38E25330D26365C00618676 /* AppKit.framework */,
 				E38E25340D26365C00618676 /* ApplicationServices.framework */,
 				E38E238B0D2626E600618676 /* AudioToolbox.framework */,
 				E38E238C0D2626E600618676 /* AudioUnit.framework */,
+				E35EF3230D380E1E00DB5CD5 /* Carbon.framework */,
 				E38E238D0D2626E600618676 /* Cocoa.framework */,
 				E38E238E0D2626E600618676 /* CoreAudio.framework */,
+				09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */,
 				E38E238F0D2626E600618676 /* CoreServices.framework */,
-				F59879070FBAA0C3008EF4FB /* QuartzCore.framework */,
+				88ECB6580DE013C4003396A7 /* DiskArbitration.framework */,
 				E38E23900D2626E600618676 /* Foundation.framework */,
+				E33466A50D2E5103005A65EC /* IOKit.framework */,
+				F56C8CEC131F5DE7000AD0F6 /* libbz2.dylib */,
+				F56C8CF2131F5DFD000AD0F6 /* libiconv.dylib */,
+				F56C8CE9131F5DCC000AD0F6 /* libm.dylib */,
+				F56C8CF5131F5E0B000AD0F6 /* libncurses.dylib */,
+				F56C8CEF131F5DED000AD0F6 /* libxml2.dylib */,
+				F56C8CE6131F5DC6000AD0F6 /* libz.dylib */,
 				E38E23910D2626E600618676 /* OpenGL.framework */,
-				09AB6884FE841BABC02AAC07 /* CoreFoundation.framework */,
+				F59879070FBAA0C3008EF4FB /* QuartzCore.framework */,
+				E35EF2540D380C3D00DB5CD5 /* QuickTime.framework */,
+				F56C8CE9131F5DCC000AD0F6 /* libm.dylib */,
 			);
 			name = "System Libs and Frameworks";
 			sourceTree = "<group>";
@@ -4067,24 +4067,10 @@
 		18B49FF01152BEEB001AF8A6 /* addons */ = {
 			isa = PBXGroup;
 			children = (
-				184C472D1296BC6E0006DB3E /* Service.cpp */,
-				184C472E1296BC6E0006DB3E /* Service.h */,
-				18B7C97A12943809009E7A26 /* GUIWindowAddonBrowser.cpp */,
-				18B7C97B1294380A009E7A26 /* GUIWindowAddonBrowser.h */,
-				18B7C8F912942718009E7A26 /* GUIDialogAddonSettings.cpp */,
-				18B7C8FA12942718009E7A26 /* GUIDialogAddonSettings.h */,
-				18B7C38612942090009E7A26 /* GUIDialogAddonInfo.cpp */,
-				18B7C38712942090009E7A26 /* GUIDialogAddonInfo.h */,
-				18B7C38812942090009E7A26 /* GUIViewStateAddonBrowser.cpp */,
-				18B7C38912942090009E7A26 /* GUIViewStateAddonBrowser.h */,
-				18B7C3821294203F009E7A26 /* AddonDatabase.cpp */,
-				18B7C3831294203F009E7A26 /* AddonDatabase.h */,
-				C85EB75A1174614E0008E5A5 /* Repository.cpp */,
-				C85EB75B1174614E0008E5A5 /* Repository.h */,
-				183FDF8811AF0B0500B81E9C /* PluginSource.cpp */,
-				183FDF8911AF0B0500B81E9C /* PluginSource.h */,
 				18B49FF11152BFA5001AF8A6 /* Addon.cpp */,
 				18B49FF21152BFA5001AF8A6 /* Addon.h */,
+				18B7C3821294203F009E7A26 /* AddonDatabase.cpp */,
+				18B7C3831294203F009E7A26 /* AddonDatabase.h */,
 				18B49FF31152BFA5001AF8A6 /* AddonDll.h */,
 				7C4705AC12EF584C00369E51 /* AddonInstaller.cpp */,
 				7C4705AD12EF584C00369E51 /* AddonInstaller.h */,
@@ -4095,11 +4081,25 @@
 				18B700DF13A6A5750009C1AF /* AddonVersion.cpp */,
 				18B700E013A6A5750009C1AF /* AddonVersion.h */,
 				18B49FF61152BFA5001AF8A6 /* DllAddon.h */,
+				18B7C38612942090009E7A26 /* GUIDialogAddonInfo.cpp */,
+				18B7C38712942090009E7A26 /* GUIDialogAddonInfo.h */,
+				18B7C8F912942718009E7A26 /* GUIDialogAddonSettings.cpp */,
+				18B7C8FA12942718009E7A26 /* GUIDialogAddonSettings.h */,
+				18B7C38812942090009E7A26 /* GUIViewStateAddonBrowser.cpp */,
+				18B7C38912942090009E7A26 /* GUIViewStateAddonBrowser.h */,
+				18B7C97A12943809009E7A26 /* GUIWindowAddonBrowser.cpp */,
+				18B7C97B1294380A009E7A26 /* GUIWindowAddonBrowser.h */,
 				18B49FFB1152BFA5001AF8A6 /* IAddon.h */,
+				183FDF8811AF0B0500B81E9C /* PluginSource.cpp */,
+				183FDF8911AF0B0500B81E9C /* PluginSource.h */,
+				C85EB75A1174614E0008E5A5 /* Repository.cpp */,
+				C85EB75B1174614E0008E5A5 /* Repository.h */,
 				18B49FFC1152BFA5001AF8A6 /* Scraper.cpp */,
 				18B49FFD1152BFA5001AF8A6 /* Scraper.h */,
 				18B49FFE1152BFA5001AF8A6 /* ScreenSaver.cpp */,
 				18B49FFF1152BFA5001AF8A6 /* ScreenSaver.h */,
+				184C472D1296BC6E0006DB3E /* Service.cpp */,
+				184C472E1296BC6E0006DB3E /* Service.h */,
 				F52B063A11869862004B1D66 /* Skin.cpp */,
 				F52B063911869862004B1D66 /* Skin.h */,
 				18B4A0001152BFA5001AF8A6 /* Visualisation.cpp */,
@@ -4111,191 +4111,191 @@
 		18B7C3AA1294219F009E7A26 /* guilib */ = {
 			isa = PBXGroup;
 			children = (
+				18B7C7541294222E009E7A26 /* AnimatedGif.cpp */,
 				18B7C6F61294222D009E7A26 /* AnimatedGif.h */,
+				18B7C7551294222E009E7A26 /* AudioContext.cpp */,
 				18B7C6F71294222D009E7A26 /* AudioContext.h */,
+				18B7C7561294222E009E7A26 /* D3DResource.cpp */,
 				18B7C6F81294222D009E7A26 /* D3DResource.h */,
+				18B7C7571294222E009E7A26 /* DDSImage.cpp */,
 				18B7C6F91294222D009E7A26 /* DDSImage.h */,
+				18B7C7581294222E009E7A26 /* DirectXGraphics.cpp */,
 				18B7C6FA1294222D009E7A26 /* DirectXGraphics.h */,
 				F558F27813ABD56600631E12 /* DirtyRegion.h */,
+				F558F27913ABD56600631E12 /* DirtyRegionSolvers.cpp */,
 				F558F27A13ABD56600631E12 /* DirtyRegionSolvers.h */,
+				F558F27D13ABD57400631E12 /* DirtyRegionTracker.cpp */,
 				F558F27E13ABD57400631E12 /* DirtyRegionTracker.h */,
+				18B7C7591294222E009E7A26 /* FrameBufferObject.cpp */,
 				18B7C6FB1294222D009E7A26 /* FrameBufferObject.h */,
 				18B7C6FC1294222D009E7A26 /* Geometry.h */,
+				18B7C75A1294222E009E7A26 /* GraphicContext.cpp */,
 				18B7C6FD1294222D009E7A26 /* GraphicContext.h */,
 				18B7C6FE1294222D009E7A26 /* gui3d.h */,
 				DF3488E513FD958F0026A711 /* GUIAction.cpp */,
 				DF3488E613FD958F0026A711 /* GUIAction.h */,
+				18B7C75B1294222E009E7A26 /* GUIAudioManager.cpp */,
 				18B7C7001294222D009E7A26 /* GUIAudioManager.h */,
+				18B7C75C1294222E009E7A26 /* GUIBaseContainer.cpp */,
 				18B7C7011294222D009E7A26 /* GUIBaseContainer.h */,
+				18B7C75D1294222E009E7A26 /* GUIBorderedImage.cpp */,
 				18B7C7021294222D009E7A26 /* GUIBorderedImage.h */,
+				18B7C75E1294222E009E7A26 /* GUIButtonControl.cpp */,
 				18B7C7031294222D009E7A26 /* GUIButtonControl.h */,
 				18B7C7051294222D009E7A26 /* GUICallback.h */,
+				18B7C7601294222E009E7A26 /* GUICheckMarkControl.cpp */,
 				18B7C7061294222D009E7A26 /* GUICheckMarkControl.h */,
+				18B7C7611294222E009E7A26 /* GUIColorManager.cpp */,
 				18B7C7071294222D009E7A26 /* GUIColorManager.h */,
+				18B7C7621294222E009E7A26 /* GUIControl.cpp */,
 				18B7C7081294222D009E7A26 /* GUIControl.h */,
+				18B7C7631294222E009E7A26 /* GUIControlFactory.cpp */,
 				18B7C7091294222D009E7A26 /* GUIControlFactory.h */,
+				18B7C7641294222E009E7A26 /* GUIControlGroup.cpp */,
 				18B7C70A1294222D009E7A26 /* GUIControlGroup.h */,
+				18B7C7651294222E009E7A26 /* GUIControlGroupList.cpp */,
 				18B7C70B1294222D009E7A26 /* GUIControlGroupList.h */,
+				18B7C7661294222E009E7A26 /* GUIControlProfiler.cpp */,
 				18B7C70C1294222D009E7A26 /* GUIControlProfiler.h */,
+				18B7C7671294222E009E7A26 /* GUIDialog.cpp */,
 				18B7C70D1294222D009E7A26 /* GUIDialog.h */,
+				18B7C7681294222E009E7A26 /* GUIEditControl.cpp */,
 				18B7C70E1294222D009E7A26 /* GUIEditControl.h */,
+				18B7C7691294222E009E7A26 /* GUIFadeLabelControl.cpp */,
 				18B7C70F1294222D009E7A26 /* GUIFadeLabelControl.h */,
+				18B7C76A1294222E009E7A26 /* GUIFixedListContainer.cpp */,
 				18B7C7101294222D009E7A26 /* GUIFixedListContainer.h */,
+				18B7C76B1294222E009E7A26 /* GUIFont.cpp */,
 				18B7C7111294222D009E7A26 /* GUIFont.h */,
+				18B7C76C1294222E009E7A26 /* GUIFontManager.cpp */,
 				18B7C7121294222D009E7A26 /* GUIFontManager.h */,
+				18B7C76D1294222E009E7A26 /* GUIFontTTF.cpp */,
 				18B7C7131294222D009E7A26 /* GUIFontTTF.h */,
+				18B7C76E1294222E009E7A26 /* GUIFontTTFDX.cpp */,
 				18B7C7141294222D009E7A26 /* GUIFontTTFDX.h */,
+				18B7C76F1294222E009E7A26 /* GUIFontTTFGL.cpp */,
 				18B7C7151294222D009E7A26 /* GUIFontTTFGL.h */,
+				18B7C7701294222E009E7A26 /* GUIImage.cpp */,
 				18B7C7161294222D009E7A26 /* GUIImage.h */,
+				18B7C7711294222E009E7A26 /* GUIIncludes.cpp */,
 				18B7C7171294222D009E7A26 /* GUIIncludes.h */,
+				18B7C7721294222E009E7A26 /* GUIInfoTypes.cpp */,
 				18B7C7181294222D009E7A26 /* GUIInfoTypes.h */,
+				18B7C7731294222E009E7A26 /* GUILabel.cpp */,
 				18B7C7191294222D009E7A26 /* GUILabel.h */,
+				18B7C7741294222E009E7A26 /* GUILabelControl.cpp */,
 				18B7C71A1294222D009E7A26 /* GUILabelControl.h */,
+				18B7C7751294222E009E7A26 /* GUIListContainer.cpp */,
 				18B7C71B1294222D009E7A26 /* GUIListContainer.h */,
+				18B7C7761294222E009E7A26 /* GUIListGroup.cpp */,
 				18B7C71C1294222D009E7A26 /* GUIListGroup.h */,
+				18B7C7771294222E009E7A26 /* GUIListItem.cpp */,
 				18B7C71D1294222D009E7A26 /* GUIListItem.h */,
+				18B7C7781294222E009E7A26 /* GUIListItemLayout.cpp */,
 				18B7C71E1294222D009E7A26 /* GUIListItemLayout.h */,
+				18B7C7791294222E009E7A26 /* GUIListLabel.cpp */,
 				18B7C71F1294222D009E7A26 /* GUIListLabel.h */,
+				18B7C77A1294222E009E7A26 /* GUIMessage.cpp */,
 				18B7C7201294222D009E7A26 /* GUIMessage.h */,
+				18B7C77B1294222E009E7A26 /* GUIMoverControl.cpp */,
 				18B7C7211294222D009E7A26 /* GUIMoverControl.h */,
+				18B7C77C1294222E009E7A26 /* GUIMultiImage.cpp */,
 				18B7C7221294222D009E7A26 /* GUIMultiImage.h */,
+				18B7C77D1294222E009E7A26 /* GUIMultiSelectText.cpp */,
 				18B7C7231294222D009E7A26 /* GUIMultiSelectText.h */,
+				18B7C77E1294222E009E7A26 /* GUIPanelContainer.cpp */,
 				18B7C7241294222D009E7A26 /* GUIPanelContainer.h */,
+				18B7C77F1294222E009E7A26 /* GUIProgressControl.cpp */,
 				18B7C7251294222D009E7A26 /* GUIProgressControl.h */,
+				18B7C7801294222E009E7A26 /* GUIRadioButtonControl.cpp */,
 				18B7C7261294222D009E7A26 /* GUIRadioButtonControl.h */,
+				18B7C7811294222E009E7A26 /* GUIRenderingControl.cpp */,
 				18B7C7271294222D009E7A26 /* GUIRenderingControl.h */,
+				18B7C7821294222E009E7A26 /* GUIResizeControl.cpp */,
 				18B7C7281294222D009E7A26 /* GUIResizeControl.h */,
+				18B7C7831294222E009E7A26 /* GUIRSSControl.cpp */,
 				18B7C7291294222D009E7A26 /* GUIRSSControl.h */,
+				18B7C7841294222E009E7A26 /* GUIScrollBarControl.cpp */,
 				18B7C72A1294222D009E7A26 /* GUIScrollBarControl.h */,
+				18B7C7851294222E009E7A26 /* GUISelectButtonControl.cpp */,
 				18B7C72B1294222D009E7A26 /* GUISelectButtonControl.h */,
+				18B7C7861294222E009E7A26 /* GUISettingsSliderControl.cpp */,
 				18B7C72C1294222D009E7A26 /* GUISettingsSliderControl.h */,
+				18B7C7871294222E009E7A26 /* GUIShader.cpp */,
 				18B7C72D1294222D009E7A26 /* GUIShader.h */,
+				18B7C7881294222E009E7A26 /* GUISliderControl.cpp */,
 				18B7C72E1294222D009E7A26 /* GUISliderControl.h */,
+				18B7C7891294222E009E7A26 /* GUISound.cpp */,
 				18B7C72F1294222D009E7A26 /* GUISound.h */,
+				18B7C78A1294222E009E7A26 /* GUISpinControl.cpp */,
 				18B7C7301294222D009E7A26 /* GUISpinControl.h */,
+				18B7C78B1294222E009E7A26 /* GUISpinControlEx.cpp */,
 				18B7C7311294222D009E7A26 /* GUISpinControlEx.h */,
+				18B7C78C1294222E009E7A26 /* GUIStandardWindow.cpp */,
 				18B7C7321294222D009E7A26 /* GUIStandardWindow.h */,
+				18B7C78D1294222E009E7A26 /* GUIStaticItem.cpp */,
 				18B7C7331294222D009E7A26 /* GUIStaticItem.h */,
+				18B7C78E1294222E009E7A26 /* GUITextBox.cpp */,
 				18B7C7341294222D009E7A26 /* GUITextBox.h */,
+				18B7C78F1294222E009E7A26 /* GUITextLayout.cpp */,
 				18B7C7351294222D009E7A26 /* GUITextLayout.h */,
+				18B7C7901294222E009E7A26 /* GUITexture.cpp */,
 				18B7C7361294222D009E7A26 /* GUITexture.h */,
+				18B7C7911294222E009E7A26 /* GUITextureD3D.cpp */,
 				18B7C7371294222D009E7A26 /* GUITextureD3D.h */,
+				18B7C7921294222E009E7A26 /* GUITextureGL.cpp */,
 				18B7C7381294222D009E7A26 /* GUITextureGL.h */,
+				18B7C7931294222E009E7A26 /* GUITextureGLES.cpp */,
 				18B7C7391294222D009E7A26 /* GUITextureGLES.h */,
+				18B7C7941294222E009E7A26 /* GUIToggleButtonControl.cpp */,
 				18B7C73A1294222D009E7A26 /* GUIToggleButtonControl.h */,
+				18B7C7951294222E009E7A26 /* GUIVideoControl.cpp */,
 				18B7C73B1294222D009E7A26 /* GUIVideoControl.h */,
+				18B7C7961294222E009E7A26 /* GUIVisualisationControl.cpp */,
 				18B7C73C1294222D009E7A26 /* GUIVisualisationControl.h */,
+				18B7C7971294222E009E7A26 /* GUIWindow.cpp */,
 				18B7C73D1294222D009E7A26 /* GUIWindow.h */,
+				18B7C7981294222E009E7A26 /* GUIWindowManager.cpp */,
 				18B7C73E1294222D009E7A26 /* GUIWindowManager.h */,
+				18B7C7991294222E009E7A26 /* GUIWrappingListContainer.cpp */,
 				18B7C73F1294222D009E7A26 /* GUIWrappingListContainer.h */,
 				18B7C7401294222D009E7A26 /* IAudioDeviceChangedCallback.h */,
 				18B7C7411294222D009E7A26 /* IMsgTargetCallback.h */,
+				18B7C79A1294222E009E7A26 /* IWindowManagerCallback.cpp */,
 				18B7C7421294222D009E7A26 /* IWindowManagerCallback.h */,
 				32C631261423A90F00F18420 /* JpegIO.cpp */,
 				32C631271423A90F00F18420 /* JpegIO.h */,
+				18B7C79B1294222E009E7A26 /* Key.cpp */,
 				18B7C7431294222D009E7A26 /* Key.h */,
+				18B7C79C1294222E009E7A26 /* LocalizeStrings.cpp */,
 				18B7C7441294222D009E7A26 /* LocalizeStrings.h */,
+				18B7C79D1294222E009E7A26 /* MatrixGLES.cpp */,
 				18B7C7451294222E009E7A26 /* MatrixGLES.h */,
 				18B7C7461294222E009E7A26 /* Resolution.h */,
+				18B7C79E1294222E009E7A26 /* Shader.cpp */,
 				18B7C7471294222E009E7A26 /* Shader.h */,
+				18B7C79F1294222E009E7A26 /* Texture.cpp */,
 				18B7C7481294222E009E7A26 /* Texture.h */,
+				18B7C7A01294222E009E7A26 /* TextureBundle.cpp */,
 				18B7C7491294222E009E7A26 /* TextureBundle.h */,
+				18B7C7A11294222E009E7A26 /* TextureBundleXBT.cpp */,
 				18B7C74A1294222E009E7A26 /* TextureBundleXBT.h */,
+				18B7C7A21294222E009E7A26 /* TextureBundleXPR.cpp */,
 				18B7C74B1294222E009E7A26 /* TextureBundleXPR.h */,
+				18B7C7A31294222E009E7A26 /* TextureDX.cpp */,
 				18B7C74C1294222E009E7A26 /* TextureDX.h */,
+				18B7C7A41294222E009E7A26 /* TextureGL.cpp */,
 				18B7C74D1294222E009E7A26 /* TextureGL.h */,
+				18B7C7A51294222E009E7A26 /* TextureManager.cpp */,
 				18B7C74E1294222E009E7A26 /* TextureManager.h */,
 				18B7C74F1294222E009E7A26 /* TransformMatrix.h */,
 				18B7C7501294222E009E7A26 /* Tween.h */,
-				18B7C7511294222E009E7A26 /* VisibleEffect.h */,
-				18B7C7521294222E009E7A26 /* XBTF.h */,
-				18B7C7531294222E009E7A26 /* XBTFReader.h */,
-				18B7C7541294222E009E7A26 /* AnimatedGif.cpp */,
-				18B7C7551294222E009E7A26 /* AudioContext.cpp */,
-				18B7C7561294222E009E7A26 /* D3DResource.cpp */,
-				18B7C7571294222E009E7A26 /* DDSImage.cpp */,
-				18B7C7581294222E009E7A26 /* DirectXGraphics.cpp */,
-				F558F27913ABD56600631E12 /* DirtyRegionSolvers.cpp */,
-				F558F27D13ABD57400631E12 /* DirtyRegionTracker.cpp */,
-				18B7C7591294222E009E7A26 /* FrameBufferObject.cpp */,
-				18B7C75A1294222E009E7A26 /* GraphicContext.cpp */,
-				18B7C75B1294222E009E7A26 /* GUIAudioManager.cpp */,
-				18B7C75C1294222E009E7A26 /* GUIBaseContainer.cpp */,
-				18B7C75D1294222E009E7A26 /* GUIBorderedImage.cpp */,
-				18B7C75E1294222E009E7A26 /* GUIButtonControl.cpp */,
-				18B7C7601294222E009E7A26 /* GUICheckMarkControl.cpp */,
-				18B7C7611294222E009E7A26 /* GUIColorManager.cpp */,
-				18B7C7621294222E009E7A26 /* GUIControl.cpp */,
-				18B7C7631294222E009E7A26 /* GUIControlFactory.cpp */,
-				18B7C7641294222E009E7A26 /* GUIControlGroup.cpp */,
-				18B7C7651294222E009E7A26 /* GUIControlGroupList.cpp */,
-				18B7C7661294222E009E7A26 /* GUIControlProfiler.cpp */,
-				18B7C7671294222E009E7A26 /* GUIDialog.cpp */,
-				18B7C7681294222E009E7A26 /* GUIEditControl.cpp */,
-				18B7C7691294222E009E7A26 /* GUIFadeLabelControl.cpp */,
-				18B7C76A1294222E009E7A26 /* GUIFixedListContainer.cpp */,
-				18B7C76B1294222E009E7A26 /* GUIFont.cpp */,
-				18B7C76C1294222E009E7A26 /* GUIFontManager.cpp */,
-				18B7C76D1294222E009E7A26 /* GUIFontTTF.cpp */,
-				18B7C76E1294222E009E7A26 /* GUIFontTTFDX.cpp */,
-				18B7C76F1294222E009E7A26 /* GUIFontTTFGL.cpp */,
-				18B7C7701294222E009E7A26 /* GUIImage.cpp */,
-				18B7C7711294222E009E7A26 /* GUIIncludes.cpp */,
-				18B7C7721294222E009E7A26 /* GUIInfoTypes.cpp */,
-				18B7C7731294222E009E7A26 /* GUILabel.cpp */,
-				18B7C7741294222E009E7A26 /* GUILabelControl.cpp */,
-				18B7C7751294222E009E7A26 /* GUIListContainer.cpp */,
-				18B7C7761294222E009E7A26 /* GUIListGroup.cpp */,
-				18B7C7771294222E009E7A26 /* GUIListItem.cpp */,
-				18B7C7781294222E009E7A26 /* GUIListItemLayout.cpp */,
-				18B7C7791294222E009E7A26 /* GUIListLabel.cpp */,
-				18B7C77A1294222E009E7A26 /* GUIMessage.cpp */,
-				18B7C77B1294222E009E7A26 /* GUIMoverControl.cpp */,
-				18B7C77C1294222E009E7A26 /* GUIMultiImage.cpp */,
-				18B7C77D1294222E009E7A26 /* GUIMultiSelectText.cpp */,
-				18B7C77E1294222E009E7A26 /* GUIPanelContainer.cpp */,
-				18B7C77F1294222E009E7A26 /* GUIProgressControl.cpp */,
-				18B7C7801294222E009E7A26 /* GUIRadioButtonControl.cpp */,
-				18B7C7811294222E009E7A26 /* GUIRenderingControl.cpp */,
-				18B7C7821294222E009E7A26 /* GUIResizeControl.cpp */,
-				18B7C7831294222E009E7A26 /* GUIRSSControl.cpp */,
-				18B7C7841294222E009E7A26 /* GUIScrollBarControl.cpp */,
-				18B7C7851294222E009E7A26 /* GUISelectButtonControl.cpp */,
-				18B7C7861294222E009E7A26 /* GUISettingsSliderControl.cpp */,
-				18B7C7871294222E009E7A26 /* GUIShader.cpp */,
-				18B7C7881294222E009E7A26 /* GUISliderControl.cpp */,
-				18B7C7891294222E009E7A26 /* GUISound.cpp */,
-				18B7C78A1294222E009E7A26 /* GUISpinControl.cpp */,
-				18B7C78B1294222E009E7A26 /* GUISpinControlEx.cpp */,
-				18B7C78C1294222E009E7A26 /* GUIStandardWindow.cpp */,
-				18B7C78D1294222E009E7A26 /* GUIStaticItem.cpp */,
-				18B7C78E1294222E009E7A26 /* GUITextBox.cpp */,
-				18B7C78F1294222E009E7A26 /* GUITextLayout.cpp */,
-				18B7C7901294222E009E7A26 /* GUITexture.cpp */,
-				18B7C7911294222E009E7A26 /* GUITextureD3D.cpp */,
-				18B7C7921294222E009E7A26 /* GUITextureGL.cpp */,
-				18B7C7931294222E009E7A26 /* GUITextureGLES.cpp */,
-				18B7C7941294222E009E7A26 /* GUIToggleButtonControl.cpp */,
-				18B7C7951294222E009E7A26 /* GUIVideoControl.cpp */,
-				18B7C7961294222E009E7A26 /* GUIVisualisationControl.cpp */,
-				18B7C7971294222E009E7A26 /* GUIWindow.cpp */,
-				18B7C7981294222E009E7A26 /* GUIWindowManager.cpp */,
-				18B7C7991294222E009E7A26 /* GUIWrappingListContainer.cpp */,
-				18B7C79A1294222E009E7A26 /* IWindowManagerCallback.cpp */,
-				18B7C79B1294222E009E7A26 /* Key.cpp */,
-				18B7C79C1294222E009E7A26 /* LocalizeStrings.cpp */,
-				18B7C79D1294222E009E7A26 /* MatrixGLES.cpp */,
-				18B7C79E1294222E009E7A26 /* Shader.cpp */,
-				18B7C79F1294222E009E7A26 /* Texture.cpp */,
-				18B7C7A01294222E009E7A26 /* TextureBundle.cpp */,
-				18B7C7A11294222E009E7A26 /* TextureBundleXBT.cpp */,
-				18B7C7A21294222E009E7A26 /* TextureBundleXPR.cpp */,
-				18B7C7A31294222E009E7A26 /* TextureDX.cpp */,
-				18B7C7A41294222E009E7A26 /* TextureGL.cpp */,
-				18B7C7A51294222E009E7A26 /* TextureManager.cpp */,
 				18B7C7A61294222E009E7A26 /* VisibleEffect.cpp */,
+				18B7C7511294222E009E7A26 /* VisibleEffect.h */,
 				18B7C7A71294222E009E7A26 /* XBTF.cpp */,
+				18B7C7521294222E009E7A26 /* XBTF.h */,
 				18B7C7A81294222E009E7A26 /* XBTFReader.cpp */,
+				18B7C7531294222E009E7A26 /* XBTFReader.h */,
 			);
 			path = guilib;
 			sourceTree = "<group>";
@@ -4329,7 +4329,6 @@
 		18B7C854129423A7009E7A26 /* tags */ = {
 			isa = PBXGroup;
 			children = (
-				18B7C94712942AD7009E7A26 /* Tag.h */,
 				18B7C855129423A7009E7A26 /* APEv2Tag.cpp */,
 				18B7C856129423A7009E7A26 /* APEv2Tag.h */,
 				4313777F12D648E900680C15 /* DllLibid3tag.h */,
@@ -4383,6 +4382,7 @@
 				18B7C887129423A7009E7A26 /* MusicInfoTagLoaderYM.h */,
 				18B7C888129423A7009E7A26 /* OggTag.cpp */,
 				18B7C889129423A7009E7A26 /* OggTag.h */,
+				18B7C94712942AD7009E7A26 /* Tag.h */,
 				18B7C88A129423A7009E7A26 /* VorbisTag.cpp */,
 				18B7C88B129423A7009E7A26 /* VorbisTag.h */,
 			);
@@ -4466,9 +4466,9 @@
 		38F4E56013CCCB3B00664821 /* platform */ = {
 			isa = PBXGroup;
 			children = (
+				38F4E56913CCCB3B00664821 /* pthreads */,
 				38F4E56513CCCB3B00664821 /* Condition.h */,
 				38F4E56613CCCB3B00664821 /* CriticalSection.h */,
-				38F4E56913CCCB3B00664821 /* pthreads */,
 				38F4E56D13CCCB3B00664821 /* README.platform */,
 				38F4E56E13CCCB3B00664821 /* ThreadLocal.h */,
 			);
@@ -4478,10 +4478,10 @@
 		38F4E56913CCCB3B00664821 /* pthreads */ = {
 			isa = PBXGroup;
 			children = (
-				3802709713D5A62D009493DD /* ThreadLocal.h */,
 				38F4E56A13CCCB3B00664821 /* Condition.h */,
 				38F4E56B13CCCB3B00664821 /* CriticalSection.h */,
 				38F4E56C13CCCB3B00664821 /* Implementation.cpp */,
+				3802709713D5A62D009493DD /* ThreadLocal.h */,
 			);
 			path = pthreads;
 			sourceTree = "<group>";
@@ -4701,6 +4701,8 @@
 				DF34892913FD9C780026A711 /* AirPlayServer.h */,
 				DF448455140048A60069344B /* AirTunesServer.cpp */,
 				DF448456140048A60069344B /* AirTunesServer.h */,
+				E38E169D0D25F9FA00618676 /* cddb.cpp */,
+				E38E169E0D25F9FA00618676 /* cddb.h */,
 				E38E16890D25F9FA00618676 /* DNSNameCache.cpp */,
 				E38E168A0D25F9FA00618676 /* DNSNameCache.h */,
 				E3E920010D8C622A002BF43D /* EventClient.cpp */,
@@ -4718,18 +4720,16 @@
 				6E97BDC40DA2B620003A2A89 /* Socket.h */,
 				432D7CF612D870E800CE4C49 /* TCPServer.cpp */,
 				432D7CF512D870D600CE4C49 /* TCPServer.h */,
-				E38E1E1C0D25F9FD00618676 /* UPnP.cpp */,
-				E38E1E1D0D25F9FD00618676 /* UPnP.h */,
 				E38E1E8B0D25F9FD00618676 /* UdpClient.cpp */,
 				E38E1E8C0D25F9FD00618676 /* UdpClient.h */,
+				E38E1E1C0D25F9FD00618676 /* UPnP.cpp */,
+				E38E1E1D0D25F9FD00618676 /* UPnP.h */,
 				F5A7A859112908F00059D6AA /* WebServer.cpp */,
 				F5A7A85A112908F00059D6AA /* WebServer.h */,
 				E46F7C280F77217400C25D29 /* Zeroconf.cpp */,
 				E46F7C290F77217400C25D29 /* Zeroconf.h */,
 				E49ACDD410074F9200A86ECD /* ZeroconfBrowser.cpp */,
 				E49ACDD310074F9200A86ECD /* ZeroconfBrowser.h */,
-				E38E169D0D25F9FA00618676 /* cddb.cpp */,
-				E38E169E0D25F9FA00618676 /* cddb.h */,
 			);
 			path = network;
 			sourceTree = "<group>";
@@ -4788,16 +4788,16 @@
 		4367217312D6640E002508E6 /* interfaces */ = {
 			isa = PBXGroup;
 			children = (
+				F5AE406E13415D8C0004BD79 /* http-api */,
 				7C89674213C03B21003631FE /* info */,
+				F5AE407F13415D9E0004BD79 /* json-rpc */,
 				E38E19820D25F9FB00618676 /* python */,
 				F5A7A700112893E50059D6AA /* AnnouncementManager.cpp */,
 				F5A7A701112893E50059D6AA /* AnnouncementManager.h */,
 				C807114A135DB5BF002F601B /* AnnouncementUtils.h */,
 				7CCF7F1B1069F3AE00992676 /* Builtins.cpp */,
 				7CCF7F1C1069F3AE00992676 /* Builtins.h */,
-				F5AE406E13415D8C0004BD79 /* http-api */,
 				436721A612D66A09002508E6 /* IAnnouncer.h */,
-				F5AE407F13415D9E0004BD79 /* json-rpc */,
 			);
 			path = interfaces;
 			sourceTree = "<group>";
@@ -4834,10 +4834,6 @@
 		43D8300612D64DEF00B38489 /* threads */ = {
 			isa = PBXGroup;
 			children = (
-				3802709813D5A653009493DD /* SystemClock.cpp */,
-				3802709913D5A653009493DD /* SystemClock.h */,
-				38F4E55E13CCCB3B00664821 /* Helpers.h */,
-				38F4E55F13CCCB3B00664821 /* Lockables.h */,
 				38F4E56013CCCB3B00664821 /* platform */,
 				83E0B2480F7C95FF0091643F /* Atomics.cpp */,
 				83E0B2470F7C95FF0091643F /* Atomics.h */,
@@ -4845,10 +4841,14 @@
 				E38E1E2E0D25F9FD00618676 /* CriticalSection.h */,
 				E38E1E350D25F9FD00618676 /* Event.cpp */,
 				E38E1E360D25F9FD00618676 /* Event.h */,
+				38F4E55E13CCCB3B00664821 /* Helpers.h */,
+				38F4E55F13CCCB3B00664821 /* Lockables.h */,
 				83A72B950FBC8E3B00171871 /* LockFree.cpp */,
 				83A72B960FBC8E3B00171871 /* LockFree.h */,
 				E38E1E7A0D25F9FD00618676 /* SharedSection.h */,
 				E38E1E7C0D25F9FD00618676 /* SingleLock.h */,
+				3802709813D5A653009493DD /* SystemClock.cpp */,
+				3802709913D5A653009493DD /* SystemClock.h */,
 				E38E1E850D25F9FD00618676 /* Thread.cpp */,
 				E38E1E860D25F9FD00618676 /* Thread.h */,
 				F558F51D13AF03AD00631E12 /* ThreadLocal.h */,
@@ -4862,15 +4862,15 @@
 				43FAC87812D635F500F67914 /* osx */,
 				E4A249F51095C880003D74C6 /* AutorunMediaJob.cpp */,
 				E4A249F61095C880003D74C6 /* AutorunMediaJob.h */,
+				E38E169F0D25F9FA00618676 /* cdioSupport.cpp */,
+				E38E16A00D25F9FA00618676 /* cdioSupport.h */,
 				E38E16840D25F9FA00618676 /* DetectDVDType.cpp */,
 				E38E16850D25F9FA00618676 /* DetectDVDType.h */,
-				43FAC87112D6349400F67914 /* IStorageProvider.h */,
 				F599CD29108E65370010EC2A /* IoSupport.cpp */,
 				F599CD2A108E65370010EC2A /* IoSupport.h */,
+				43FAC87112D6349400F67914 /* IStorageProvider.h */,
 				E38E1D8B0D25F9FD00618676 /* MediaManager.cpp */,
 				E38E1D8C0D25F9FD00618676 /* MediaManager.h */,
-				E38E169F0D25F9FA00618676 /* cdioSupport.cpp */,
-				E38E16A00D25F9FA00618676 /* cdioSupport.h */,
 			);
 			path = storage;
 			sourceTree = "<group>";
@@ -4977,12 +4977,12 @@
 			isa = PBXGroup;
 			children = (
 				43FAC8CE12D63CA800F67914 /* osx */,
+				7C779E25104A57E500F444C4 /* WindowingFactory.h */,
 				7C779E26104A57E500F444C4 /* WinEvents.h */,
 				7C779E27104A57E500F444C4 /* WinEventsSDL.cpp */,
 				7C779E28104A57E500F444C4 /* WinEventsSDL.h */,
 				7C779E29104A57E500F444C4 /* WinSystem.cpp */,
 				7C779E2A104A57E500F444C4 /* WinSystem.h */,
-				7C779E25104A57E500F444C4 /* WindowingFactory.h */,
 				7C779E2F104A57E500F444C4 /* XBMC_events.h */,
 			);
 			path = windowing;
@@ -5013,10 +5013,10 @@
 		7C89674213C03B21003631FE /* info */ = {
 			isa = PBXGroup;
 			children = (
-				DF98D98A1434F47D00A6EBE1 /* SkinVariable.cpp */,
-				DF98D98B1434F47D00A6EBE1 /* SkinVariable.h */,
 				7C89674313C03B22003631FE /* InfoBool.cpp */,
 				7C89674413C03B22003631FE /* InfoBool.h */,
+				DF98D98A1434F47D00A6EBE1 /* SkinVariable.cpp */,
+				DF98D98B1434F47D00A6EBE1 /* SkinVariable.h */,
 			);
 			path = info;
 			sourceTree = "<group>";
@@ -5045,20 +5045,20 @@
 			children = (
 				F57A1D1C1329B15300498CC7 /* AutoPool.h */,
 				F57A1D1D1329B15300498CC7 /* AutoPool.mm */,
-				6E2FACD20E26E92800DF79EA /* Info.plist */,
-				F5EA04280F72EB88005C2EC5 /* SDLMain.mm */,
-				F5EA04E80F72F9CA005C2EC5 /* SDLMain.h */,
+				F5EA05C30F73381A005C2EC5 /* CocoaInterface.h */,
+				F5EA05C00F733812005C2EC5 /* CocoaInterface.mm */,
 				83A72B920FBC8DFF00171871 /* CoreAudio.cpp */,
 				83A72B930FBC8DFF00171871 /* CoreAudio.h */,
-				F5EA05C00F733812005C2EC5 /* CocoaInterface.mm */,
-				F5EA05C30F73381A005C2EC5 /* CocoaInterface.h */,
 				F5B13C8B1334056B0045076D /* DarwinUtils.h */,
 				F5B13C8C1334056B0045076D /* DarwinUtils.mm */,
-				E306D12C0DDF7B590052C2AD /* XBMCHelper.cpp */,
-				E306D12D0DDF7B590052C2AD /* XBMCHelper.h */,
+				F5ACB5370FC3DF3D00AAA056 /* eprintf.cpp */,
+				6E2FACD20E26E92800DF79EA /* Info.plist */,
 				F51CEEEE0F5C5D20004F4602 /* OSXGNUReplacements.c */,
 				F51CEEF00F5C5D28004F4602 /* OSXGNUReplacements.h */,
-				F5ACB5370FC3DF3D00AAA056 /* eprintf.cpp */,
+				F5EA04E80F72F9CA005C2EC5 /* SDLMain.h */,
+				F5EA04280F72EB88005C2EC5 /* SDLMain.mm */,
+				E306D12C0DDF7B590052C2AD /* XBMCHelper.cpp */,
+				E306D12D0DDF7B590052C2AD /* XBMCHelper.h */,
 			);
 			path = osx;
 			sourceTree = "<group>";
@@ -5093,9 +5093,6 @@
 				43FAC85D12D62F4300F67914 /* video */,
 				43FAC8C812D63C4400F67914 /* windowing */,
 				43D82FF512D64C8600B38489 /* windows */,
-				F5B413131065900C0035D105 /* config.h */,
-				C8D0B2AE1265A9A800F0C0AC /* SystemGlobals.cpp */,
-				7C779E24104A57E500F444C4 /* ViewState.h */,
 				E38E14640D25F9F900618676 /* Application.cpp */,
 				E38E14650D25F9F900618676 /* Application.h */,
 				E38E14660D25F9F900618676 /* ApplicationMessenger.cpp */,
@@ -5106,6 +5103,7 @@
 				E38E14710D25F9F900618676 /* AutoSwitch.h */,
 				E38E14720D25F9F900618676 /* BackgroundInfoLoader.cpp */,
 				E38E14730D25F9F900618676 /* BackgroundInfoLoader.h */,
+				F5B413131065900C0035D105 /* config.h */,
 				E38E167E0D25F9FA00618676 /* CueDocument.cpp */,
 				E38E167F0D25F9FA00618676 /* CueDocument.h */,
 				E38E168C0D25F9FA00618676 /* DynamicDll.cpp */,
@@ -5132,16 +5130,17 @@
 				880DBE4C0DC223FF00E26B71 /* MediaSource.h */,
 				E38E1DC10D25F9FD00618676 /* NfoFile.cpp */,
 				E38E1DC20D25F9FD00618676 /* NfoFile.h */,
-				7CAA25331085963B0096DE39 /* PasswordManager.cpp */,
-				7CAA25341085963B0096DE39 /* PasswordManager.h */,
 				E38E1DD50D25F9FD00618676 /* PartyModeManager.cpp */,
 				E38E1DD60D25F9FD00618676 /* PartyModeManager.h */,
+				7CAA25331085963B0096DE39 /* PasswordManager.cpp */,
+				7CAA25341085963B0096DE39 /* PasswordManager.h */,
 				E38E1DE90D25F9FD00618676 /* PlayListPlayer.cpp */,
 				E38E1DEA0D25F9FD00618676 /* PlayListPlayer.h */,
 				E38E1DFE0D25F9FD00618676 /* SectionLoader.cpp */,
 				E38E1DFF0D25F9FD00618676 /* SectionLoader.h */,
 				E38E1E0F0D25F9FD00618676 /* SortFileItem.cpp */,
 				E38E1E100D25F9FD00618676 /* SortFileItem.h */,
+				C8D0B2AE1265A9A800F0C0AC /* SystemGlobals.cpp */,
 				E38E1E160D25F9FD00618676 /* Temperature.cpp */,
 				E38E1E170D25F9FD00618676 /* Temperature.h */,
 				7C8A14541154CB2600E5FCFA /* TextureCache.cpp */,
@@ -5158,6 +5157,7 @@
 				E38E1E210D25F9FD00618676 /* Util.h */,
 				E38E1E990D25F9FD00618676 /* ViewDatabase.cpp */,
 				E38E1E9A0D25F9FD00618676 /* ViewDatabase.h */,
+				7C779E24104A57E500F444C4 /* ViewState.h */,
 				E38E1EA70D25F9FD00618676 /* XBApplicationEx.cpp */,
 				E38E1EA80D25F9FD00618676 /* XBApplicationEx.h */,
 				384718D61325BA04000486D6 /* XBDateTime.cpp */,
@@ -5170,6 +5170,7 @@
 		E38E147F0D25F9F900618676 /* cdrip */ = {
 			isa = PBXGroup;
 			children = (
+				E38E14900D25F9F900618676 /* lame */,
 				E38E14800D25F9F900618676 /* CDDAReader.cpp */,
 				E38E14810D25F9F900618676 /* CDDAReader.h */,
 				E38E14820D25F9F900618676 /* CDDARipper.cpp */,
@@ -5190,7 +5191,6 @@
 				E38E148D0D25F9F900618676 /* EncoderVorbis.h */,
 				E38E148E0D25F9F900618676 /* EncoderWav.cpp */,
 				E38E148F0D25F9F900618676 /* EncoderWav.h */,
-				E38E14900D25F9F900618676 /* lame */,
 			);
 			path = cdrip;
 			sourceTree = "<group>";
@@ -5206,17 +5206,17 @@
 		E38E149A0D25F9F900618676 /* cores */ = {
 			isa = PBXGroup;
 			children = (
-				F5E56B11108284E6006E788A /* playercorefactory */,
+				F5A00B060EFDDDB700CD59F3 /* AudioRenderers */,
 				E38E149D0D25F9F900618676 /* DllLoader */,
-				E38E14F60D25F9F900618676 /* DummyVideoPlayer.cpp */,
-				E38E14F70D25F9F900618676 /* DummyVideoPlayer.h */,
 				E38E14F80D25F9F900618676 /* dvdplayer */,
-				E38E15B50D25F9FA00618676 /* IAudioCallback.h */,
 				7C5608C30F1754930056433A /* ExternalPlayer */,
-				E38E15B60D25F9FA00618676 /* IPlayer.h */,
 				E38E15D20D25F9FA00618676 /* paplayer */,
-				F5A00B060EFDDDB700CD59F3 /* AudioRenderers */,
+				F5E56B11108284E6006E788A /* playercorefactory */,
 				E38E16580D25F9FA00618676 /* VideoRenderers */,
+				E38E14F60D25F9F900618676 /* DummyVideoPlayer.cpp */,
+				E38E14F70D25F9F900618676 /* DummyVideoPlayer.h */,
+				E38E15B50D25F9FA00618676 /* IAudioCallback.h */,
+				E38E15B60D25F9FA00618676 /* IPlayer.h */,
 			);
 			path = cores;
 			sourceTree = "<group>";
@@ -5224,6 +5224,7 @@
 		E38E149D0D25F9F900618676 /* DllLoader */ = {
 			isa = PBXGroup;
 			children = (
+				E38E14B80D25F9F900618676 /* exports */,
 				E38E149E0D25F9F900618676 /* coff.cpp */,
 				E38E149F0D25F9F900618676 /* coff.h */,
 				E38E14A00D25F9F900618676 /* coffldr.h */,
@@ -5241,7 +5242,6 @@
 				E38E14B50D25F9F900618676 /* DllLoader.h */,
 				E38E14B60D25F9F900618676 /* DllLoaderContainer.cpp */,
 				E38E14B70D25F9F900618676 /* DllLoaderContainer.h */,
-				E38E14B80D25F9F900618676 /* exports */,
 				E38E14EB0D25F9F900618676 /* ldt_keeper.c */,
 				E38E14EC0D25F9F900618676 /* ldt_keeper.h */,
 				E38E14ED0D25F9F900618676 /* LibraryLoader.cpp */,
@@ -5257,13 +5257,13 @@
 		E38E14B80D25F9F900618676 /* exports */ = {
 			isa = PBXGroup;
 			children = (
+				E38E14E20D25F9F900618676 /* util */,
 				E38E14B90D25F9F900618676 /* emu_dummy.cpp */,
 				E38E14BA0D25F9F900618676 /* emu_dummy.h */,
 				E38E14BD0D25F9F900618676 /* emu_kernel32.cpp */,
 				E38E14BE0D25F9F900618676 /* emu_kernel32.h */,
 				E38E14C10D25F9F900618676 /* emu_msvcrt.cpp */,
 				E38E14C20D25F9F900618676 /* emu_msvcrt.h */,
-				E38E14E20D25F9F900618676 /* util */,
 				E38E14E80D25F9F900618676 /* wrapper.c */,
 			);
 			path = exports;
@@ -5281,22 +5281,19 @@
 		E38E14F80D25F9F900618676 /* dvdplayer */ = {
 			isa = PBXGroup;
 			children = (
-				43348AA1107747CD00F859CF /* Edl.cpp */,
-				43348AA2107747CD00F859CF /* Edl.h */,
-				7CDAE9030FFCA3520040B25F /* DVDTSCorrection.cpp */,
-				7CDAE9040FFCA3520040B25F /* DVDTSCorrection.h */,
+				E38E15000D25F9F900618676 /* DVDCodecs */,
+				E38E15480D25F9F900618676 /* DVDDemuxers */,
+				E38E15570D25F9FA00618676 /* DVDInputStreams */,
+				E38E158E0D25F9FA00618676 /* DVDSubtitles */,
 				E38E14FB0D25F9F900618676 /* dvd_config.h */,
 				E38E14FC0D25F9F900618676 /* DVDAudio.cpp */,
 				E38E14FD0D25F9F900618676 /* DVDAudio.h */,
 				E38E14FE0D25F9F900618676 /* DVDClock.cpp */,
 				E38E14FF0D25F9F900618676 /* DVDClock.h */,
-				E38E15000D25F9F900618676 /* DVDCodecs */,
-				E38E15480D25F9F900618676 /* DVDDemuxers */,
 				E38E15550D25F9FA00618676 /* DVDDemuxSPU.cpp */,
 				E38E15560D25F9FA00618676 /* DVDDemuxSPU.h */,
 				F5F2EF4A0E593E0D0092C37F /* DVDFileInfo.cpp */,
 				F5F2EF490E593E0D0092C37F /* DVDFileInfo.h */,
-				E38E15570D25F9FA00618676 /* DVDInputStreams */,
 				E38E15780D25F9FA00618676 /* DVDMessage.cpp */,
 				E38E15790D25F9FA00618676 /* DVDMessage.h */,
 				E38E157A0D25F9FA00618676 /* DVDMessageQueue.cpp */,
@@ -5323,7 +5320,10 @@
 				E38E158B0D25F9FA00618676 /* DVDPlayerVideo.h */,
 				E38E158C0D25F9FA00618676 /* DVDStreamInfo.cpp */,
 				E38E158D0D25F9FA00618676 /* DVDStreamInfo.h */,
-				E38E158E0D25F9FA00618676 /* DVDSubtitles */,
+				7CDAE9030FFCA3520040B25F /* DVDTSCorrection.cpp */,
+				7CDAE9040FFCA3520040B25F /* DVDTSCorrection.h */,
+				43348AA1107747CD00F859CF /* Edl.cpp */,
+				43348AA2107747CD00F859CF /* Edl.h */,
 				E38E159A0D25F9FA00618676 /* IDVDPlayer.h */,
 			);
 			path = dvdplayer;
@@ -5333,13 +5333,13 @@
 			isa = PBXGroup;
 			children = (
 				E38E15010D25F9F900618676 /* Audio */,
+				E38E15280D25F9F900618676 /* Overlay */,
+				E38E153A0D25F9F900618676 /* Video */,
 				E38E15210D25F9F900618676 /* DVDCodecs.h */,
 				E38E15220D25F9F900618676 /* DVDCodecUtils.cpp */,
 				E38E15230D25F9F900618676 /* DVDCodecUtils.h */,
 				E38E15240D25F9F900618676 /* DVDFactoryCodec.cpp */,
 				E38E15250D25F9F900618676 /* DVDFactoryCodec.h */,
-				E38E15280D25F9F900618676 /* Overlay */,
-				E38E153A0D25F9F900618676 /* Video */,
 			);
 			path = DVDCodecs;
 			sourceTree = "<group>";
@@ -5347,6 +5347,8 @@
 		E38E15010D25F9F900618676 /* Audio */ = {
 			isa = PBXGroup;
 			children = (
+				F5F24E801123242B009126C6 /* Encoders */,
+				E38E151D0D25F9F900618676 /* libmad */,
 				E38E15050D25F9F900618676 /* DllLibMad.h */,
 				E38E15060D25F9F900618676 /* DVDAudioCodec.h */,
 				E38E15070D25F9F900618676 /* DVDAudioCodecFFmpeg.cpp */,
@@ -5359,8 +5361,6 @@
 				F5F245D91112C6AC009126C6 /* DVDAudioCodecPassthroughFFmpeg.h */,
 				E38E15150D25F9F900618676 /* DVDAudioCodecPcm.cpp */,
 				E38E15160D25F9F900618676 /* DVDAudioCodecPcm.h */,
-				F5F24E801123242B009126C6 /* Encoders */,
-				E38E151D0D25F9F900618676 /* libmad */,
 			);
 			path = Audio;
 			sourceTree = "<group>";
@@ -5376,23 +5376,23 @@
 		E38E15280D25F9F900618676 /* Overlay */ = {
 			isa = PBXGroup;
 			children = (
-				8883CE9E0DD817D1004E8B72 /* DVDOverlayCodecSSA.cpp */,
-				8883CE9F0DD817D1004E8B72 /* DVDOverlayCodecSSA.h */,
-				8883CEA00DD817D1004E8B72 /* DVDOverlaySSA.h */,
+				E38E15340D25F9F900618676 /* libspucc */,
 				E38E15290D25F9F900618676 /* DVDOverlay.h */,
 				E38E152A0D25F9F900618676 /* DVDOverlayCodec.h */,
 				E38E152B0D25F9F900618676 /* DVDOverlayCodecCC.cpp */,
 				E38E152C0D25F9F900618676 /* DVDOverlayCodecCC.h */,
 				E38E152D0D25F9F900618676 /* DVDOverlayCodecFFmpeg.cpp */,
 				E38E152E0D25F9F900618676 /* DVDOverlayCodecFFmpeg.h */,
+				8883CE9E0DD817D1004E8B72 /* DVDOverlayCodecSSA.cpp */,
+				8883CE9F0DD817D1004E8B72 /* DVDOverlayCodecSSA.h */,
 				E38E152F0D25F9F900618676 /* DVDOverlayCodecText.cpp */,
 				E38E15300D25F9F900618676 /* DVDOverlayCodecText.h */,
 				F5CEE60713D3C89700225F72 /* DVDOverlayCodecTX3G.cpp */,
 				F5CEE60813D3C89700225F72 /* DVDOverlayCodecTX3G.h */,
 				E38E15310D25F9F900618676 /* DVDOverlayImage.h */,
 				E38E15320D25F9F900618676 /* DVDOverlaySpu.h */,
+				8883CEA00DD817D1004E8B72 /* DVDOverlaySSA.h */,
 				E38E15330D25F9F900618676 /* DVDOverlayText.h */,
-				E38E15340D25F9F900618676 /* libspucc */,
 			);
 			path = Overlay;
 			sourceTree = "<group>";
@@ -5409,21 +5409,21 @@
 		E38E153A0D25F9F900618676 /* Video */ = {
 			isa = PBXGroup;
 			children = (
-				E38E153B0D25F9F900618676 /* DllLibMpeg2.h */,
-				E38E153C0D25F9F900618676 /* DVDVideoCodec.h */,
+				E38E15430D25F9F900618676 /* libmpeg2 */,
 				F5F240EB110A4F76009126C6 /* CrystalHD.cpp */,
 				F5F240EC110A4F76009126C6 /* CrystalHD.h */,
+				E38E153B0D25F9F900618676 /* DllLibMpeg2.h */,
+				E38E153C0D25F9F900618676 /* DVDVideoCodec.h */,
 				F595994410E9F322004B58B3 /* DVDVideoCodecCrystalHD.cpp */,
 				F595994310E9F322004B58B3 /* DVDVideoCodecCrystalHD.h */,
-				F52B06B81187CE18004B1D66 /* DVDVideoCodecVDA.cpp */,
-				F52B06B91187CE18004B1D66 /* DVDVideoCodecVDA.h */,
 				E38E153D0D25F9F900618676 /* DVDVideoCodecFFmpeg.cpp */,
 				E38E153E0D25F9F900618676 /* DVDVideoCodecFFmpeg.h */,
 				E38E153F0D25F9F900618676 /* DVDVideoCodecLibMpeg2.cpp */,
 				E38E15400D25F9F900618676 /* DVDVideoCodecLibMpeg2.h */,
+				F52B06B81187CE18004B1D66 /* DVDVideoCodecVDA.cpp */,
+				F52B06B91187CE18004B1D66 /* DVDVideoCodecVDA.h */,
 				E38E15410D25F9F900618676 /* DVDVideoPPFFmpeg.cpp */,
 				E38E15420D25F9F900618676 /* DVDVideoPPFFmpeg.h */,
-				E38E15430D25F9F900618676 /* libmpeg2 */,
 			);
 			path = Video;
 			sourceTree = "<group>";
@@ -5440,18 +5440,18 @@
 		E38E15480D25F9F900618676 /* DVDDemuxers */ = {
 			isa = PBXGroup;
 			children = (
-				E33206370D5070AA00435CE3 /* DVDDemuxVobsub.cpp */,
-				E38E25BF0D263DC100618676 /* DVDFactoryDemuxer.cpp */,
+				E38E15490D25F9F900618676 /* DVDDemux.cpp */,
+				E38E154A0D25F9F900618676 /* DVDDemux.h */,
 				E38E25C20D263DE200618676 /* DVDDemuxFFmpeg.cpp */,
 				E38E154C0D25F9F900618676 /* DVDDemuxFFmpeg.h */,
 				F55110440F5C3C0000955236 /* DVDDemuxHTSP.cpp */,
 				F55110430F5C3C0000955236 /* DVDDemuxHTSP.h */,
-				E38E15490D25F9F900618676 /* DVDDemux.cpp */,
-				E38E154A0D25F9F900618676 /* DVDDemux.h */,
 				E38E154D0D25F9F900618676 /* DVDDemuxShoutcast.cpp */,
 				E38E154E0D25F9F900618676 /* DVDDemuxShoutcast.h */,
 				E38E154F0D25F9F900618676 /* DVDDemuxUtils.cpp */,
 				E38E15500D25F9F900618676 /* DVDDemuxUtils.h */,
+				E33206370D5070AA00435CE3 /* DVDDemuxVobsub.cpp */,
+				E38E25BF0D263DC100618676 /* DVDFactoryDemuxer.cpp */,
 			);
 			path = DVDDemuxers;
 			sourceTree = "<group>";
@@ -5459,10 +5459,7 @@
 		E38E15570D25F9FA00618676 /* DVDInputStreams */ = {
 			isa = PBXGroup;
 			children = (
-				815EE6330E17F1DC009FBE3C /* DVDInputStreamRTMP.cpp */,
-				815EE6340E17F1DC009FBE3C /* DVDInputStreamRTMP.h */,
-				E33979940D62FD47004ECDDA /* DVDInputStreamTV.cpp */,
-				E33979950D62FD47004ECDDA /* DVDInputStreamTV.h */,
+				E38E15670D25F9FA00618676 /* dvdnav */,
 				E38E15580D25F9FA00618676 /* DllDvdNav.h */,
 				E38E15590D25F9FA00618676 /* DVDFactoryInputStream.cpp */,
 				E38E155A0D25F9FA00618676 /* DVDFactoryInputStream.h */,
@@ -5482,7 +5479,10 @@
 				E38E15640D25F9FA00618676 /* DVDInputStreamMemory.h */,
 				E38E15650D25F9FA00618676 /* DVDInputStreamNavigator.cpp */,
 				E38E15660D25F9FA00618676 /* DVDInputStreamNavigator.h */,
-				E38E15670D25F9FA00618676 /* dvdnav */,
+				815EE6330E17F1DC009FBE3C /* DVDInputStreamRTMP.cpp */,
+				815EE6340E17F1DC009FBE3C /* DVDInputStreamRTMP.h */,
+				E33979940D62FD47004ECDDA /* DVDInputStreamTV.cpp */,
+				E33979950D62FD47004ECDDA /* DVDInputStreamTV.h */,
 				E38E15740D25F9FA00618676 /* DVDStateSerializer.cpp */,
 				E38E15750D25F9FA00618676 /* DVDStateSerializer.h */,
 			);
@@ -5543,23 +5543,21 @@
 		E38E15D20D25F9FA00618676 /* paplayer */ = {
 			isa = PBXGroup;
 			children = (
-				88ACB01C0DCF409E0083CFDF /* ASAPCodec.cpp */,
-				88ACB01D0DCF409E0083CFDF /* ASAPCodec.h */,
-				DF4484EC140054530069344B /* BXAcodec.cpp */,
-				DF4484ED140054530069344B /* BXAcodec.h */,
-				E36578860D3AA7B40033CC1C /* DVDPlayerCodec.cpp */,
-				E36578870D3AA7B40033CC1C /* DVDPlayerCodec.h */,
 				E38E15DB0D25F9FA00618676 /* ADPCMCodec.cpp */,
 				E38E15DC0D25F9FA00618676 /* ADPCMCodec.h */,
+				88ACB01C0DCF409E0083CFDF /* ASAPCodec.cpp */,
+				88ACB01D0DCF409E0083CFDF /* ASAPCodec.h */,
 				E38E15E30D25F9FA00618676 /* AudioDecoder.cpp */,
 				E38E15E40D25F9FA00618676 /* AudioDecoder.h */,
+				DF4484EC140054530069344B /* BXAcodec.cpp */,
+				DF4484ED140054530069344B /* BXAcodec.h */,
 				E38E15E50D25F9FA00618676 /* CachingCodec.h */,
 				E38E15E60D25F9FA00618676 /* CDDAcodec.cpp */,
 				E38E15E70D25F9FA00618676 /* CDDAcodec.h */,
 				E38E15E80D25F9FA00618676 /* CodecFactory.cpp */,
 				E38E15E90D25F9FA00618676 /* CodecFactory.h */,
-				F5F8E1D90E427E8000A8E96F /* VGMCodec.cpp */,
-				F5F8E1D80E427E8000A8E96F /* VGMCodec.h */,
+				E36578860D3AA7B40033CC1C /* DVDPlayerCodec.cpp */,
+				E36578870D3AA7B40033CC1C /* DVDPlayerCodec.h */,
 				E38E160A0D25F9FA00618676 /* FLACcodec.cpp */,
 				E38E160B0D25F9FA00618676 /* FLACcodec.h */,
 				E38E160E0D25F9FA00618676 /* ICodec.h */,
@@ -5583,6 +5581,8 @@
 				E38E16360D25F9FA00618676 /* SPCCodec.h */,
 				E38E16370D25F9FA00618676 /* TimidityCodec.cpp */,
 				E38E16380D25F9FA00618676 /* TimidityCodec.h */,
+				F5F8E1D90E427E8000A8E96F /* VGMCodec.cpp */,
+				F5F8E1D80E427E8000A8E96F /* VGMCodec.h */,
 				E38E16390D25F9FA00618676 /* WAVcodec.cpp */,
 				E38E163A0D25F9FA00618676 /* WAVcodec.h */,
 				E38E16410D25F9FA00618676 /* YMCodec.cpp */,
@@ -5594,21 +5594,21 @@
 		E38E16580D25F9FA00618676 /* VideoRenderers */ = {
 			isa = PBXGroup;
 			children = (
+				E38E166B0D25F9FA00618676 /* VideoShaders */,
 				7CAA204F1079C8160096DE39 /* BaseRenderer.cpp */,
 				7CAA20501079C8160096DE39 /* BaseRenderer.h */,
 				E38E165F0D25F9FA00618676 /* LinuxRendererGL.cpp */,
 				E38E16600D25F9FA00618676 /* LinuxRendererGL.h */,
-				F5D8D72F102BB3B1004A11AB /* OverlayRendererGL.cpp */,
-				F5D8D72E102BB3B1004A11AB /* OverlayRendererGL.h */,
 				F5D8D731102BB3B1004A11AB /* OverlayRenderer.cpp */,
 				F5D8D730102BB3B1004A11AB /* OverlayRenderer.h */,
+				F5D8D72F102BB3B1004A11AB /* OverlayRendererGL.cpp */,
+				F5D8D72E102BB3B1004A11AB /* OverlayRendererGL.h */,
 				431AE5D7109C1A63007428C3 /* OverlayRendererUtil.cpp */,
 				431AE5D8109C1A63007428C3 /* OverlayRendererUtil.h */,
 				F56579AD13060D1E0085ED7F /* RenderCapture.cpp */,
 				F56579AE13060D1E0085ED7F /* RenderCapture.h */,
 				E38E16650D25F9FA00618676 /* RenderManager.cpp */,
 				E38E16660D25F9FA00618676 /* RenderManager.h */,
-				E38E166B0D25F9FA00618676 /* VideoShaders */,
 				E38E16740D25F9FA00618676 /* WinRenderer.h */,
 			);
 			path = VideoRenderers;
@@ -5617,8 +5617,8 @@
 		E38E166B0D25F9FA00618676 /* VideoShaders */ = {
 			isa = PBXGroup;
 			children = (
-				F592568610FBF2E100D2C91D /* ConvolutionKernels.h */,
 				F592568710FBF2E100D2C91D /* ConvolutionKernels.cpp */,
+				F592568610FBF2E100D2C91D /* ConvolutionKernels.h */,
 				E38E166F0D25F9FA00618676 /* VideoFilterShader.cpp */,
 				E38E16700D25F9FA00618676 /* VideoFilterShader.h */,
 				E38E16710D25F9FA00618676 /* YUV2RGBShader.cpp */,
@@ -5630,35 +5630,14 @@
 		E38E16940D25F9FA00618676 /* filesystem */ = {
 			isa = PBXGroup;
 			children = (
-				DF0DF15713A3ADA7008ED511 /* FileNFS.cpp */,
-				DF0DF15813A3ADA7008ED511 /* FileNFS.h */,
-				DF0DF15913A3ADA7008ED511 /* NFSDirectory.cpp */,
-				DF0DF15A13A3ADA7008ED511 /* NFSDirectory.h */,
-				7C84A59C12FA3C1600CD1714 /* SourcesDirectory.cpp */,
-				7C84A59D12FA3C1600CD1714 /* SourcesDirectory.h */,
-				7C2D6AE20F35453E00DD2E85 /* SpecialProtocol.cpp */,
-				7C2D6AE30F35453E00DD2E85 /* SpecialProtocol.h */,
-				7CEBD8A60F33A0D800CAF6AD /* SpecialProtocolDirectory.cpp */,
-				7CEBD8A70F33A0D800CAF6AD /* SpecialProtocolDirectory.h */,
-				E4E91BB70E7F7338001F0546 /* NptXbmcFile.cpp */,
-				889B4D8C0E0EF86C00FAD25E /* RSSDirectory.cpp */,
-				889B4D8D0E0EF86C00FAD25E /* RSSDirectory.h */,
-				F5A7B42A113CBB950059D6AA /* AddonsDirectory.h */,
+				E38E170A0D25F9FA00618676 /* MusicDatabaseDirectory */,
+				E38E175F0D25F9FA00618676 /* VideoDatabaseDirectory */,
 				F5A7B42B113CBB950059D6AA /* AddonsDirectory.cpp */,
-				88ACB0190DCF40800083CFDF /* ASAPFileDirectory.cpp */,
-				88ACB01A0DCF40800083CFDF /* ASAPFileDirectory.h */,
-				880DBE530DC224A100E26B71 /* MusicFileDirectory.cpp */,
-				880DBE540DC224A100E26B71 /* MusicFileDirectory.h */,
-				E3BBB7980D7EA78A00CAAFD3 /* MythSession.cpp */,
-				E3DAAF8A0D6E1B0500F17647 /* FileSmb.cpp */,
-				E3DAAF8B0D6E1B0500F17647 /* SMBDirectory.cpp */,
-				810C9FA50D67D1FB0095F5DD /* MythDirectory.cpp */,
-				810C9FA60D67D1FB0095F5DD /* MythDirectory.h */,
-				810C9FA70D67D1FB0095F5DD /* MythFile.cpp */,
-				810C9FA80D67D1FB0095F5DD /* MythFile.h */,
-				E38F12C10D29FF200035C331 /* FileShoutcast.cpp */,
+				F5A7B42A113CBB950059D6AA /* AddonsDirectory.h */,
 				DF24A6B01406C7C500C7721E /* AFPDirectory.cpp */,
 				DF24A6B11406C7C500C7721E /* AFPDirectory.h */,
+				88ACB0190DCF40800083CFDF /* ASAPFileDirectory.cpp */,
+				88ACB01A0DCF40800083CFDF /* ASAPFileDirectory.h */,
 				7C99B6A2133D342100FC2B16 /* CacheCircular.cpp */,
 				7C99B6A3133D342100FC2B16 /* CacheCircular.h */,
 				E38E16970D25F9FA00618676 /* CacheMemBuffer.cpp */,
@@ -5709,6 +5688,8 @@
 				E38E16CF0D25F9FA00618676 /* FileLastFM.h */,
 				E38E16D20D25F9FA00618676 /* FileMusicDatabase.cpp */,
 				E38E16D30D25F9FA00618676 /* FileMusicDatabase.h */,
+				DF0DF15713A3ADA7008ED511 /* FileNFS.cpp */,
+				DF0DF15813A3ADA7008ED511 /* FileNFS.h */,
 				DF448459140048C80069344B /* FilePipe.cpp */,
 				DF44845A140048C80069344B /* FilePipe.h */,
 				E38E16D40D25F9FA00618676 /* FileRar.cpp */,
@@ -5717,6 +5698,8 @@
 				E38E16D70D25F9FA00618676 /* FileRTV.h */,
 				F5A7B374113AFB5F0059D6AA /* FileSFTP.cpp */,
 				F5A7B375113AFB5F0059D6AA /* FileSFTP.h */,
+				E38F12C10D29FF200035C331 /* FileShoutcast.cpp */,
+				E3DAAF8A0D6E1B0500F17647 /* FileSmb.cpp */,
 				E38E16DB0D25F9FA00618676 /* FileSmb.h */,
 				F584E1270F257BD800DB26A5 /* FileSpecialProtocol.cpp */,
 				F584E1280F257BD800DB26A5 /* FileSpecialProtocol.h */,
@@ -5734,12 +5717,12 @@
 				E38E16E90D25F9FA00618676 /* HDDirectory.h */,
 				E38E16EA0D25F9FA00618676 /* HDHomeRun.cpp */,
 				E38E16EB0D25F9FA00618676 /* HDHomeRun.h */,
-				E43196130FB2382D0030E150 /* HTSPDirectory.h */,
 				E43196140FB2382E0030E150 /* HTSPDirectory.cpp */,
-				E43196150FB2382E0030E150 /* HTSPSession.h */,
+				E43196130FB2382D0030E150 /* HTSPDirectory.h */,
 				E43196160FB2382E0030E150 /* HTSPSession.cpp */,
-				F584E12C0F257C5100DB26A5 /* HTTPDirectory.h */,
+				E43196150FB2382E0030E150 /* HTSPSession.h */,
 				F584E12D0F257C5100DB26A5 /* HTTPDirectory.cpp */,
+				F584E12C0F257C5100DB26A5 /* HTTPDirectory.h */,
 				E38E16EC0D25F9FA00618676 /* IDirectory.cpp */,
 				E38E16ED0D25F9FA00618676 /* IDirectory.h */,
 				E38E16EE0D25F9FA00618676 /* IFile.cpp */,
@@ -5755,11 +5738,20 @@
 				E38E17090D25F9FA00618676 /* MultiPathDirectory.h */,
 				F50629780E57B9680066625A /* MultiPathFile.cpp */,
 				F50629790E57B9680066625A /* MultiPathFile.h */,
-				E38E170A0D25F9FA00618676 /* MusicDatabaseDirectory */,
 				E38E17370D25F9FA00618676 /* MusicDatabaseDirectory.cpp */,
 				E38E17380D25F9FA00618676 /* MusicDatabaseDirectory.h */,
+				880DBE530DC224A100E26B71 /* MusicFileDirectory.cpp */,
+				880DBE540DC224A100E26B71 /* MusicFileDirectory.h */,
 				E38E17390D25F9FA00618676 /* MusicSearchDirectory.cpp */,
 				E38E173A0D25F9FA00618676 /* MusicSearchDirectory.h */,
+				810C9FA50D67D1FB0095F5DD /* MythDirectory.cpp */,
+				810C9FA60D67D1FB0095F5DD /* MythDirectory.h */,
+				810C9FA70D67D1FB0095F5DD /* MythFile.cpp */,
+				810C9FA80D67D1FB0095F5DD /* MythFile.h */,
+				E3BBB7980D7EA78A00CAAFD3 /* MythSession.cpp */,
+				DF0DF15913A3ADA7008ED511 /* NFSDirectory.cpp */,
+				DF0DF15A13A3ADA7008ED511 /* NFSDirectory.h */,
+				E4E91BB70E7F7338001F0546 /* NptXbmcFile.cpp */,
 				E38E173C0D25F9FA00618676 /* NSFFileDirectory.cpp */,
 				E38E173D0D25F9FA00618676 /* NSFFileDirectory.h */,
 				E38E173E0D25F9FA00618676 /* OGGFileDirectory.cpp */,
@@ -5776,12 +5768,14 @@
 				E38E17470D25F9FA00618676 /* RarDirectory.h */,
 				E38E17480D25F9FA00618676 /* RarManager.cpp */,
 				E38E17490D25F9FA00618676 /* RarManager.h */,
+				889B4D8C0E0EF86C00FAD25E /* RSSDirectory.cpp */,
+				889B4D8D0E0EF86C00FAD25E /* RSSDirectory.h */,
 				E38E174B0D25F9FA00618676 /* RTVDirectory.cpp */,
 				E38E174C0D25F9FA00618676 /* RTVDirectory.h */,
-				E4DC97510FFE5BA8008E0C07 /* SAPDirectory.h */,
 				E4DC97500FFE5BA8008E0C07 /* SAPDirectory.cpp */,
-				E4DC97530FFE5BA8008E0C07 /* SAPFile.h */,
+				E4DC97510FFE5BA8008E0C07 /* SAPDirectory.h */,
 				E4DC97520FFE5BA8008E0C07 /* SAPFile.cpp */,
+				E4DC97530FFE5BA8008E0C07 /* SAPFile.h */,
 				F5A7B37C113AFB900059D6AA /* SFTPDirectory.cpp */,
 				F5A7B37D113AFB900059D6AA /* SFTPDirectory.h */,
 				E38E17510D25F9FA00618676 /* SIDFileDirectory.cpp */,
@@ -5790,7 +5784,14 @@
 				18404D9D1396C13500863BBA /* Slingbox.h */,
 				E38E17530D25F9FA00618676 /* SmartPlaylistDirectory.cpp */,
 				E38E17540D25F9FA00618676 /* SmartPlaylistDirectory.h */,
+				E3DAAF8B0D6E1B0500F17647 /* SMBDirectory.cpp */,
 				E38E17560D25F9FA00618676 /* SMBDirectory.h */,
+				7C84A59C12FA3C1600CD1714 /* SourcesDirectory.cpp */,
+				7C84A59D12FA3C1600CD1714 /* SourcesDirectory.h */,
+				7C2D6AE20F35453E00DD2E85 /* SpecialProtocol.cpp */,
+				7C2D6AE30F35453E00DD2E85 /* SpecialProtocol.h */,
+				7CEBD8A60F33A0D800CAF6AD /* SpecialProtocolDirectory.cpp */,
+				7CEBD8A70F33A0D800CAF6AD /* SpecialProtocolDirectory.h */,
 				E38E17590D25F9FA00618676 /* StackDirectory.cpp */,
 				E38E175A0D25F9FA00618676 /* StackDirectory.h */,
 				433219D312E4C6A500CD7486 /* udf25.cpp */,
@@ -5799,19 +5800,18 @@
 				433219D612E4C6A500CD7486 /* UDFDirectory.h */,
 				E38E175B0D25F9FA00618676 /* UPnPDirectory.cpp */,
 				E38E175C0D25F9FA00618676 /* UPnPDirectory.h */,
+				E38E178A0D25F9FA00618676 /* VideoDatabaseDirectory.cpp */,
+				E38E178B0D25F9FA00618676 /* VideoDatabaseDirectory.h */,
+				E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */,
+				E38E178D0D25F9FA00618676 /* VirtualDirectory.h */,
 				F5FAB0750EFABE2C00BAD4AE /* VTPDirectory.cpp */,
 				F5FAB0740EFABE2C00BAD4AE /* VTPDirectory.h */,
 				F5FAB0700EFABAC800BAD4AE /* VTPFile.cpp */,
 				F5FAB06F0EFABAC800BAD4AE /* VTPFile.h */,
 				F5FAB0790EFABE4A00BAD4AE /* VTPSession.cpp */,
 				F5FAB0780EFABE4A00BAD4AE /* VTPSession.h */,
-				E38E175F0D25F9FA00618676 /* VideoDatabaseDirectory */,
-				E38E178A0D25F9FA00618676 /* VideoDatabaseDirectory.cpp */,
-				E38E178B0D25F9FA00618676 /* VideoDatabaseDirectory.h */,
-				E38E178C0D25F9FA00618676 /* VirtualDirectory.cpp */,
-				E38E178D0D25F9FA00618676 /* VirtualDirectory.h */,
-				E49ACD8A100745C400A86ECD /* ZeroconfDirectory.h */,
 				E49ACD8B100745C400A86ECD /* ZeroconfDirectory.cpp */,
+				E49ACD8A100745C400A86ECD /* ZeroconfDirectory.h */,
 				E38E17930D25F9FA00618676 /* ZipDirectory.cpp */,
 				E38E17940D25F9FA00618676 /* ZipDirectory.h */,
 				E38E17950D25F9FA00618676 /* ZipManager.cpp */,
@@ -5823,8 +5823,6 @@
 		E38E170A0D25F9FA00618676 /* MusicDatabaseDirectory */ = {
 			isa = PBXGroup;
 			children = (
-				7C62F45C1057A62D002AD2C1 /* DirectoryNodeSingles.cpp */,
-				7C62F45D1057A62D002AD2C1 /* DirectoryNodeSingles.h */,
 				E38E170B0D25F9FA00618676 /* DirectoryNode.cpp */,
 				E38E170C0D25F9FA00618676 /* DirectoryNode.h */,
 				E38E170D0D25F9FA00618676 /* DirectoryNodeAlbum.cpp */,
@@ -5853,6 +5851,8 @@
 				E38E17240D25F9FA00618676 /* DirectoryNodeOverview.h */,
 				E38E17250D25F9FA00618676 /* DirectoryNodeRoot.cpp */,
 				E38E17260D25F9FA00618676 /* DirectoryNodeRoot.h */,
+				7C62F45C1057A62D002AD2C1 /* DirectoryNodeSingles.cpp */,
+				7C62F45D1057A62D002AD2C1 /* DirectoryNodeSingles.h */,
 				E38E17270D25F9FA00618676 /* DirectoryNodeSong.cpp */,
 				E38E17280D25F9FA00618676 /* DirectoryNodeSong.h */,
 				E38E17290D25F9FA00618676 /* DirectoryNodeSongTop100.cpp */,
@@ -5874,12 +5874,12 @@
 		E38E175F0D25F9FA00618676 /* VideoDatabaseDirectory */ = {
 			isa = PBXGroup;
 			children = (
-				7CD2C3A811940B270009EFC1 /* DirectoryNodeCountry.cpp */,
-				7CD2C3A911940B270009EFC1 /* DirectoryNodeCountry.h */,
 				E38E17600D25F9FA00618676 /* DirectoryNode.cpp */,
 				E38E17610D25F9FA00618676 /* DirectoryNode.h */,
 				E38E17620D25F9FA00618676 /* DirectoryNodeActor.cpp */,
 				E38E17630D25F9FA00618676 /* DirectoryNodeActor.h */,
+				7CD2C3A811940B270009EFC1 /* DirectoryNodeCountry.cpp */,
+				7CD2C3A911940B270009EFC1 /* DirectoryNodeCountry.h */,
 				E38E17640D25F9FA00618676 /* DirectoryNodeDirector.cpp */,
 				E38E17650D25F9FA00618676 /* DirectoryNodeDirector.h */,
 				E38E17660D25F9FA00618676 /* DirectoryNodeEpisodes.cpp */,
@@ -5927,15 +5927,6 @@
 		E38E185C0D25F9FA00618676 /* lib */ = {
 			isa = PBXGroup;
 			children = (
-				E38E15EF0D25F9FA00618676 /* DllAdpcm.h */,
-				88ACB01E0DCF409E0083CFDF /* DllASAP.h */,
-				E38E15F50D25F9FA00618676 /* DllLibFlac.h */,
-				E38E15FA0D25F9FA00618676 /* DllNosefart.h */,
-				E38E15FB0D25F9FA00618676 /* DllSidplay2.h */,
-				E38E15FC0D25F9FA00618676 /* DllStSound.h */,
-				E38E15FD0D25F9FA00618676 /* DllTimidity.h */,
-				E38E15FE0D25F9FA00618676 /* DllVorbisfile.h */,
-				18B7CA0212944A8E009E7A26 /* tinyXML */,
 				E38E18820D25F9FA00618676 /* libexif */,
 				E38E196D0D25F9FB00618676 /* libhdhomerun */,
 				F551106A0F5C424700955236 /* libhts */,
@@ -5944,7 +5935,16 @@
 				F5E55E601076B34F006E788A /* libsquish */,
 				E38E1A550D25F9FB00618676 /* libUPnP */,
 				E38E1C840D25F9FC00618676 /* libXDAAP */,
+				18B7CA0212944A8E009E7A26 /* tinyXML */,
 				E38E1CE40D25F9FC00618676 /* UnrarXLib */,
+				E38E15EF0D25F9FA00618676 /* DllAdpcm.h */,
+				88ACB01E0DCF409E0083CFDF /* DllASAP.h */,
+				E38E15F50D25F9FA00618676 /* DllLibFlac.h */,
+				E38E15FA0D25F9FA00618676 /* DllNosefart.h */,
+				E38E15FB0D25F9FA00618676 /* DllSidplay2.h */,
+				E38E15FC0D25F9FA00618676 /* DllStSound.h */,
+				E38E15FD0D25F9FA00618676 /* DllTimidity.h */,
+				E38E15FE0D25F9FA00618676 /* DllVorbisfile.h */,
 			);
 			path = lib;
 			sourceTree = "<group>";
@@ -5994,8 +5994,6 @@
 		E38E19DA0D25F9FB00618676 /* xbmcmodule */ = {
 			isa = PBXGroup;
 			children = (
-				C80425701158A0DE00D158A6 /* controlslider.cpp */,
-				E354EF030D99EDC900B55311 /* controlradiobutton.cpp */,
 				E38E257E0D263CE000618676 /* action.cpp */,
 				E38E19DC0D25F9FB00618676 /* action.h */,
 				E38E257F0D263CE000618676 /* control.cpp */,
@@ -6009,6 +6007,8 @@
 				E38E25850D263CE000618676 /* controllabel.cpp */,
 				E38E25860D263CE000618676 /* controllist.cpp */,
 				E38E25870D263CE000618676 /* controlprogress.cpp */,
+				E354EF030D99EDC900B55311 /* controlradiobutton.cpp */,
+				C80425701158A0DE00D158A6 /* controlslider.cpp */,
 				E38E25880D263CE000618676 /* controlspin.cpp */,
 				E38E25890D263CE000618676 /* controltextbox.cpp */,
 				E38E258A0D263CE000618676 /* dialog.cpp */,
@@ -6075,10 +6075,9 @@
 		E38E1A550D25F9FB00618676 /* libUPnP */ = {
 			isa = PBXGroup;
 			children = (
-				F5E56AD8108280DE006E788A /* New Group */,
+				E38E1A5B0D25F9FB00618676 /* Platinum */,
 				43BF092D1080C6F600E25290 /* README.txt */,
 				43BF092E1080C6F600E25290 /* SConstruct */,
-				E38E1A5B0D25F9FB00618676 /* Platinum */,
 			);
 			path = libUPnP;
 			sourceTree = "<group>";
@@ -6086,13 +6085,12 @@
 		E38E1A5B0D25F9FB00618676 /* Platinum */ = {
 			isa = PBXGroup;
 			children = (
+				E38E1AB90D25F9FB00618676 /* Source */,
+				E38E1B310D25F9FB00618676 /* Targets */,
 				E4DF6CD80EFF85EB00C28243 /* CHANGELOG.txt */,
 				E4DF6CD90EFF85EB00C28243 /* LICENSE.txt */,
 				E4DF6CDA0EFF85EB00C28243 /* README.txt */,
 				E38E1AB80D25F9FB00618676 /* SConstruct */,
-				E38E1AB90D25F9FB00618676 /* Source */,
-				E38E1B310D25F9FB00618676 /* Targets */,
-				E38E1B330D25F9FB00618676 /* ThirdParty */,
 			);
 			path = Platinum;
 			sourceTree = "<group>";
@@ -6100,15 +6098,15 @@
 		E38E1AB90D25F9FB00618676 /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				43BF09671080C8C200E25290 /* Platinum.h */,
-				43BF09691080C8C200E25290 /* PltVersion.h */,
-				43BF09681080C8C200E25290 /* PltSvnVersion.h */,
-				F5E56B0F10828303006E788A /* System */,
 				E38E1ABA0D25F9FB00618676 /* Apps */,
 				E38E1AC40D25F9FB00618676 /* Core */,
 				E38E1AFC0D25F9FB00618676 /* Devices */,
+				F5E56B0F10828303006E788A /* System */,
 				E38E1B1E0D25F9FB00618676 /* Tests */,
 				E38E1B2B0D25F9FB00618676 /* Tools */,
+				43BF09671080C8C200E25290 /* Platinum.h */,
+				43BF09691080C8C200E25290 /* PltVersion.h */,
+				43BF09681080C8C200E25290 /* PltSvnVersion.h */,
 			);
 			path = Source;
 			sourceTree = "<group>";
@@ -6350,238 +6348,6 @@
 			path = "x86-microsoft-win32-vs2003";
 			sourceTree = "<group>";
 		};
-		E38E1B330D25F9FB00618676 /* ThirdParty */ = {
-			isa = PBXGroup;
-			children = (
-				E38E1B340D25F9FB00618676 /* Neptune */,
-			);
-			path = ThirdParty;
-			sourceTree = "<group>";
-		};
-		E38E1B340D25F9FB00618676 /* Neptune */ = {
-			isa = PBXGroup;
-			children = (
-				E38E1BCF0D25F9FC00618676 /* Documents */,
-				E38E1BD20D25F9FC00618676 /* Extras */,
-				E38E1BD90D25F9FC00618676 /* Source */,
-			);
-			path = Neptune;
-			sourceTree = "<group>";
-		};
-		E38E1BCF0D25F9FC00618676 /* Documents */ = {
-			isa = PBXGroup;
-			children = (
-				E38E1BD00D25F9FC00618676 /* Manuals */,
-			);
-			path = Documents;
-			sourceTree = "<group>";
-		};
-		E38E1BD00D25F9FC00618676 /* Manuals */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Manuals;
-			sourceTree = "<group>";
-		};
-		E38E1BD20D25F9FC00618676 /* Extras */ = {
-			isa = PBXGroup;
-			children = (
-				E38E1BD30D25F9FC00618676 /* Project */,
-			);
-			path = Extras;
-			sourceTree = "<group>";
-		};
-		E38E1BD30D25F9FC00618676 /* Project */ = {
-			isa = PBXGroup;
-			children = (
-				E38E1BD40D25F9FC00618676 /* Eclipse */,
-			);
-			path = Project;
-			sourceTree = "<group>";
-		};
-		E38E1BD40D25F9FC00618676 /* Eclipse */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Eclipse;
-			sourceTree = "<group>";
-		};
-		E38E1BD90D25F9FC00618676 /* Source */ = {
-			isa = PBXGroup;
-			children = (
-				E38E1BE30D25F9FC00618676 /* Core */,
-				E38E1C230D25F9FC00618676 /* System */,
-				E38E1C530D25F9FC00618676 /* Tests */,
-			);
-			path = Source;
-			sourceTree = "<group>";
-		};
-		E38E1BE30D25F9FC00618676 /* Core */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Core;
-			sourceTree = "<group>";
-		};
-		E38E1C230D25F9FC00618676 /* System */ = {
-			isa = PBXGroup;
-			children = (
-				E464642F0E7DF0B9003CB291 /* StdC */,
-				E38E1C240D25F9FC00618676 /* Bsd */,
-				E38E1C2C0D25F9FC00618676 /* Posix */,
-			);
-			path = System;
-			sourceTree = "<group>";
-		};
-		E38E1C240D25F9FC00618676 /* Bsd */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Bsd;
-			sourceTree = "<group>";
-		};
-		E38E1C2C0D25F9FC00618676 /* Posix */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Posix;
-			sourceTree = "<group>";
-		};
-		E38E1C530D25F9FC00618676 /* Tests */ = {
-			isa = PBXGroup;
-			children = (
-				E38E1C540D25F9FC00618676 /* Arrays1 */,
-				E38E1C560D25F9FC00618676 /* BufferedStreams1 */,
-				E38E1C580D25F9FC00618676 /* HttpClient1 */,
-				E38E1C5A0D25F9FC00618676 /* HttpServer1 */,
-				E38E1C5C0D25F9FC00618676 /* Lists1 */,
-				E38E1C5E0D25F9FC00618676 /* Logging1 */,
-				E38E1C600D25F9FC00618676 /* Maps1 */,
-				E38E1C620D25F9FC00618676 /* Messages1 */,
-				E38E1C640D25F9FC00618676 /* Messages2 */,
-				E38E1C660D25F9FC00618676 /* Misc1 */,
-				E38E1C680D25F9FC00618676 /* RingBuffer1 */,
-				E38E1C6A0D25F9FC00618676 /* Strings1 */,
-				E38E1C6C0D25F9FC00618676 /* Threads1 */,
-				E38E1C6E0D25F9FC00618676 /* Udp1 */,
-				E38E1C700D25F9FC00618676 /* Url1 */,
-				E38E1C720D25F9FC00618676 /* Xml1 */,
-			);
-			path = Tests;
-			sourceTree = "<group>";
-		};
-		E38E1C540D25F9FC00618676 /* Arrays1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Arrays1;
-			sourceTree = "<group>";
-		};
-		E38E1C560D25F9FC00618676 /* BufferedStreams1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = BufferedStreams1;
-			sourceTree = "<group>";
-		};
-		E38E1C580D25F9FC00618676 /* HttpClient1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = HttpClient1;
-			sourceTree = "<group>";
-		};
-		E38E1C5A0D25F9FC00618676 /* HttpServer1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = HttpServer1;
-			sourceTree = "<group>";
-		};
-		E38E1C5C0D25F9FC00618676 /* Lists1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Lists1;
-			sourceTree = "<group>";
-		};
-		E38E1C5E0D25F9FC00618676 /* Logging1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Logging1;
-			sourceTree = "<group>";
-		};
-		E38E1C600D25F9FC00618676 /* Maps1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Maps1;
-			sourceTree = "<group>";
-		};
-		E38E1C620D25F9FC00618676 /* Messages1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Messages1;
-			sourceTree = "<group>";
-		};
-		E38E1C640D25F9FC00618676 /* Messages2 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Messages2;
-			sourceTree = "<group>";
-		};
-		E38E1C660D25F9FC00618676 /* Misc1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Misc1;
-			sourceTree = "<group>";
-		};
-		E38E1C680D25F9FC00618676 /* RingBuffer1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = RingBuffer1;
-			sourceTree = "<group>";
-		};
-		E38E1C6A0D25F9FC00618676 /* Strings1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Strings1;
-			sourceTree = "<group>";
-		};
-		E38E1C6C0D25F9FC00618676 /* Threads1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Threads1;
-			sourceTree = "<group>";
-		};
-		E38E1C6E0D25F9FC00618676 /* Udp1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Udp1;
-			sourceTree = "<group>";
-		};
-		E38E1C700D25F9FC00618676 /* Url1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Url1;
-			sourceTree = "<group>";
-		};
-		E38E1C720D25F9FC00618676 /* Xml1 */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = Xml1;
-			sourceTree = "<group>";
-		};
 		E38E1C840D25F9FC00618676 /* libXDAAP */ = {
 			isa = PBXGroup;
 			children = (
@@ -6597,8 +6363,6 @@
 		E38E1CE40D25F9FC00618676 /* UnrarXLib */ = {
 			isa = PBXGroup;
 			children = (
-				E38E257B0D263C4400618676 /* rar.cpp */,
-				E38E25770D263BF600618676 /* unpack.cpp */,
 				E38E1CE60D25F9FC00618676 /* archive.cpp */,
 				E38E1CE70D25F9FC00618676 /* archive.hpp */,
 				E38E1CE80D25F9FC00618676 /* arcread.cpp */,
@@ -6655,6 +6419,7 @@
 				E38E1D200D25F9FC00618676 /* os.hpp */,
 				E38E1D210D25F9FC00618676 /* pathfn.cpp */,
 				E38E1D220D25F9FC00618676 /* pathfn.hpp */,
+				E38E257B0D263C4400618676 /* rar.cpp */,
 				E38E1D240D25F9FC00618676 /* rar.hpp */,
 				E38E1D250D25F9FC00618676 /* rardefs.hpp */,
 				E38E1D260D25F9FC00618676 /* rarfn.hpp */,
@@ -6697,6 +6462,7 @@
 				E38E1D510D25F9FC00618676 /* ulinks.hpp */,
 				E38E1D520D25F9FC00618676 /* unicode.cpp */,
 				E38E1D530D25F9FC00618676 /* unicode.hpp */,
+				E38E25770D263BF600618676 /* unpack.cpp */,
 				E38E1D550D25F9FC00618676 /* unpack.hpp */,
 				E38E1D580D25F9FC00618676 /* unrar.h */,
 				E38E1D590D25F9FC00618676 /* UnrarX.hpp */,
@@ -6712,8 +6478,6 @@
 		E38E1D690D25F9FD00618676 /* linux */ = {
 			isa = PBXGroup;
 			children = (
-				18308CB41303370800AA309E /* stat_utf8.h */,
-				18308CB51303370800AA309E /* stdio_utf8.h */,
 				E38E1D6A0D25F9FD00618676 /* ConvUtils.cpp */,
 				E38E1D6B0D25F9FD00618676 /* ConvUtils.h */,
 				E38E1D700D25F9FD00618676 /* LinuxResourceCounter.cpp */,
@@ -6722,8 +6486,10 @@
 				E38E1D730D25F9FD00618676 /* LinuxTimezone.h */,
 				E38E1D780D25F9FD00618676 /* PlatformDefs.h */,
 				E38E1D790D25F9FD00618676 /* PlatformInclude.h */,
-				F5E56BA41082A675006E788A /* PosixMountProvider.h */,
 				F5E56BA51082A675006E788A /* PosixMountProvider.cpp */,
+				F5E56BA41082A675006E788A /* PosixMountProvider.h */,
+				18308CB41303370800AA309E /* stat_utf8.h */,
+				18308CB51303370800AA309E /* stdio_utf8.h */,
 				E38E1D7A0D25F9FD00618676 /* XEventUtils.cpp */,
 				E38E1D7C0D25F9FD00618676 /* XEventUtils.h */,
 				E38E1D7D0D25F9FD00618676 /* XFileUtils.cpp */,
@@ -6752,6 +6518,10 @@
 		E38E1E000D25F9FD00618676 /* settings */ = {
 			isa = PBXGroup;
 			children = (
+				18B7C3A612942132009E7A26 /* AdvancedSettings.cpp */,
+				18B7C3A712942132009E7A26 /* AdvancedSettings.h */,
+				7C0A7EBE13A5DBCE00AFC2BD /* AppParamParser.cpp */,
+				7C0A7EBF13A5DBCE00AFC2BD /* AppParamParser.h */,
 				18B7C903129427A6009E7A26 /* GUIDialogContentSettings.cpp */,
 				18B7C904129427A6009E7A26 /* GUIDialogContentSettings.h */,
 				18B7C905129427A6009E7A26 /* GUIDialogLockSettings.cpp */,
@@ -6760,14 +6530,8 @@
 				18B7C908129427A6009E7A26 /* GUIDialogProfileSettings.h */,
 				18B7C909129427A6009E7A26 /* GUIDialogSettings.cpp */,
 				18B7C90A129427A6009E7A26 /* GUIDialogSettings.h */,
-				F5F95D9F0E4E203700C3FA5C /* GUIWindowTestPattern.cpp */,
-				F5F95D9E0E4E203700C3FA5C /* GUIWindowTestPattern.h */,
 				18B7C8C212942451009E7A26 /* GUISettings.cpp */,
 				18B7C8C312942451009E7A26 /* GUISettings.h */,
-				18B7C3A612942132009E7A26 /* AdvancedSettings.cpp */,
-				18B7C3A712942132009E7A26 /* AdvancedSettings.h */,
-				7C0A7EBE13A5DBCE00AFC2BD /* AppParamParser.cpp */,
-				7C0A7EBF13A5DBCE00AFC2BD /* AppParamParser.h */,
 				18B7C39612942114009E7A26 /* GUIWindowSettings.cpp */,
 				18B7C39712942114009E7A26 /* GUIWindowSettings.h */,
 				18B7C39812942114009E7A26 /* GUIWindowSettingsCategory.cpp */,
@@ -6776,6 +6540,8 @@
 				18B7C39B12942114009E7A26 /* GUIWindowSettingsProfile.h */,
 				18B7C39C12942114009E7A26 /* GUIWindowSettingsScreenCalibration.cpp */,
 				18B7C39D12942114009E7A26 /* GUIWindowSettingsScreenCalibration.h */,
+				F5F95D9F0E4E203700C3FA5C /* GUIWindowTestPattern.cpp */,
+				F5F95D9E0E4E203700C3FA5C /* GUIWindowTestPattern.h */,
 				E38E1DF10D25F9FD00618676 /* Profile.cpp */,
 				E38E1DF20D25F9FD00618676 /* Profile.h */,
 				18B7C38E129420E5009E7A26 /* Settings.cpp */,
@@ -6791,25 +6557,10 @@
 		E38E1E220D25F9FD00618676 /* utils */ = {
 			isa = PBXGroup;
 			children = (
-				38B2BBD013131B4A00F83309 /* GlobalsHandling.h */,
-				18C1D22B13033F6A00CFFE59 /* GLUtils.cpp */,
-				18C1D22C13033F6A00CFFE59 /* GLUtils.h */,
-				18B7C9E7129447B9009E7A26 /* MathUtils.h */,
-				18B7C9811294385F009E7A26 /* XMLUtils.cpp */,
-				18B7C9821294385F009E7A26 /* XMLUtils.h */,
-				18B7C8F11294261F009E7A26 /* StringUtils.cpp */,
-				18B7C8F21294261F009E7A26 /* StringUtils.h */,
-				18B7C8EC12942613009E7A26 /* URIUtils.cpp */,
-				18B7C8ED12942613009E7A26 /* URIUtils.h */,
-				18B7C8E712942603009E7A26 /* Crc32.cpp */,
-				18B7C8E812942603009E7A26 /* Crc32.h */,
-				7CBEBB8212912BA300431822 /* fstrcmp.c */,
 				E38E1E230D25F9FD00618676 /* AlarmClock.cpp */,
 				E38E1E240D25F9FD00618676 /* AlarmClock.h */,
 				F5A9D3081097C9370050490F /* AliasShortcutUtils.cpp */,
 				F5A9D3071097C9370050490F /* AliasShortcutUtils.h */,
-				E38E18560D25F9FA00618676 /* LangCodeExpander.cpp */,
-				E38E18570D25F9FA00618676 /* LangCodeExpander.h */,
 				E38E1E250D25F9FD00618676 /* Archive.cpp */,
 				E38E1E260D25F9FD00618676 /* Archive.h */,
 				F5FDF51C0E7218950005B0A6 /* AsyncFileCopy.cpp */,
@@ -6822,6 +6573,8 @@
 				E38E1E2A0D25F9FD00618676 /* CharsetConverter.h */,
 				E38E1E2B0D25F9FD00618676 /* CPUInfo.cpp */,
 				E38E1E2C0D25F9FD00618676 /* CPUInfo.h */,
+				18B7C8E712942603009E7A26 /* Crc32.cpp */,
+				18B7C8E812942603009E7A26 /* Crc32.h */,
 				E38E1E310D25F9FD00618676 /* DownloadQueue.cpp */,
 				E38E1E320D25F9FD00618676 /* DownloadQueue.h */,
 				E38E1E330D25F9FD00618676 /* DownloadQueueManager.cpp */,
@@ -6831,11 +6584,17 @@
 				6E97BDC30DA2B620003A2A89 /* Fanart.h */,
 				F5E5697210803FC3006E788A /* fastmemcpy.c */,
 				43BF09DD1080D39300E25290 /* fastmemcpy.h */,
+				18B49FF91152BFA5001AF8A6 /* fft.cpp */,
+				18B49FFA1152BFA5001AF8A6 /* fft.h */,
 				F5F244641110DC6B009126C6 /* FileOperationJob.cpp */,
 				F5F244631110DC6B009126C6 /* FileOperationJob.h */,
 				F5F245EC1112C9AB009126C6 /* FileUtils.cpp */,
 				F5F245ED1112C9AB009126C6 /* FileUtils.h */,
+				7CBEBB8212912BA300431822 /* fstrcmp.c */,
 				E38E1E3D0D25F9FD00618676 /* fstrcmp.h */,
+				38B2BBD013131B4A00F83309 /* GlobalsHandling.h */,
+				18C1D22B13033F6A00CFFE59 /* GLUtils.cpp */,
+				18C1D22C13033F6A00CFFE59 /* GLUtils.h */,
 				E38E1E400D25F9FD00618676 /* HTMLTable.cpp */,
 				E38E1E410D25F9FD00618676 /* HTMLTable.h */,
 				E38E1E420D25F9FD00618676 /* HTMLUtil.cpp */,
@@ -6846,19 +6605,22 @@
 				DF34897A13FDAA270026A711 /* HttpParser.h */,
 				E38E1E4C0D25F9FD00618676 /* InfoLoader.cpp */,
 				E38E1E4D0D25F9FD00618676 /* InfoLoader.h */,
-				E38E1E530D25F9FD00618676 /* LabelFormatter.cpp */,
-				E38E1E540D25F9FD00618676 /* LabelFormatter.h */,
+				7CAA205B107AFC280096DE39 /* Job.h */,
 				F57B6F7E1071B8B500079ACB /* JobManager.cpp */,
 				F57B6F7F1071B8B500079ACB /* JobManager.h */,
-				7CAA205B107AFC280096DE39 /* Job.h */,
 				1840B74B13993D8A007C848B /* JSONVariantParser.cpp */,
 				1840B74C13993D8A007C848B /* JSONVariantParser.h */,
 				1840B75113993DA0007C848B /* JSONVariantWriter.cpp */,
 				1840B75213993DA0007C848B /* JSONVariantWriter.h */,
+				E38E1E530D25F9FD00618676 /* LabelFormatter.cpp */,
+				E38E1E540D25F9FD00618676 /* LabelFormatter.h */,
+				E38E18560D25F9FA00618676 /* LangCodeExpander.cpp */,
+				E38E18570D25F9FA00618676 /* LangCodeExpander.h */,
 				E38E1E550D25F9FD00618676 /* LCD.cpp */,
 				E38E1E560D25F9FD00618676 /* LCD.h */,
 				E38E1E5B0D25F9FD00618676 /* log.cpp */,
 				E38E1E5C0D25F9FD00618676 /* log.h */,
+				18B7C9E7129447B9009E7A26 /* MathUtils.h */,
 				F5F8E1E60E427F6700A8E96F /* md5.cpp */,
 				F5F8E1E70E427F6700A8E96F /* md5.h */,
 				E38E1E6D0D25F9FD00618676 /* PCMAmplifier.cpp */,
@@ -6883,12 +6645,16 @@
 				7CAA25381085971C0096DE39 /* ScraperUrl.h */,
 				E38E1E7F0D25F9FD00618676 /* Splash.cpp */,
 				E38E1E800D25F9FD00618676 /* Splash.h */,
+				E38E16560D25F9FA00618676 /* ssrc.cpp */,
+				E38E16570D25F9FA00618676 /* ssrc.h */,
 				E38E1E810D25F9FD00618676 /* Stopwatch.cpp */,
 				E38E1E820D25F9FD00618676 /* Stopwatch.h */,
 				F5487B4B0FE6F02700E506FD /* StreamDetails.cpp */,
 				F5487B4A0FE6F02700E506FD /* StreamDetails.h */,
 				18ECC96013CF178D00A9ED6C /* StreamUtils.cpp */,
 				18ECC96113CF178D00A9ED6C /* StreamUtils.h */,
+				18B7C8F11294261F009E7A26 /* StringUtils.cpp */,
+				18B7C8F21294261F009E7A26 /* StringUtils.h */,
 				E38E1E830D25F9FD00618676 /* SystemInfo.cpp */,
 				E38E1E840D25F9FD00618676 /* SystemInfo.h */,
 				7CEE2E5913D6B71E000ABF2A /* TimeSmoother.cpp */,
@@ -6897,6 +6663,8 @@
 				7CCF7FC8106A0DF500992676 /* TimeUtils.h */,
 				E38E1E890D25F9FD00618676 /* TuxBoxUtil.cpp */,
 				E38E1E8A0D25F9FD00618676 /* TuxBoxUtil.h */,
+				18B7C8EC12942613009E7A26 /* URIUtils.cpp */,
+				18B7C8ED12942613009E7A26 /* URIUtils.h */,
 				7CF1FB09123B1AF000B2CBCB /* Variant.cpp */,
 				7CF1FB0A123B1AF000B2CBCB /* Variant.h */,
 				E38E1E8D0D25F9FD00618676 /* Weather.cpp */,
@@ -6904,21 +6672,12 @@
 				E38E1E8F0D25F9FD00618676 /* Win32Exception.cpp */,
 				E38E1E900D25F9FD00618676 /* Win32Exception.h */,
 				E38E1E920D25F9FD00618676 /* WindowsShortcut.h */,
-				18B49FF91152BFA5001AF8A6 /* fft.cpp */,
-				18B49FFA1152BFA5001AF8A6 /* fft.h */,
-				E38E16560D25F9FA00618676 /* ssrc.cpp */,
-				E38E16570D25F9FA00618676 /* ssrc.h */,
+				18B7C9811294385F009E7A26 /* XMLUtils.cpp */,
+				18B7C9821294385F009E7A26 /* XMLUtils.h */,
 			);
 			path = utils;
 			sourceTree = "<group>";
 		};
-		E464642F0E7DF0B9003CB291 /* StdC */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			path = StdC;
-			sourceTree = "<group>";
-		};
 		F551106A0F5C424700955236 /* libhts */ = {
 			isa = PBXGroup;
 			children = (
@@ -6946,8 +6705,8 @@
 			isa = PBXGroup;
 			children = (
 				F5DC888A110A654000EE1B15 /* libapetag.a */,
-				43352CED1071634600706B8A /* libsquish.a */,
 				E38E256C0D263A1C00618676 /* librtv.a */,
+				43352CED1071634600706B8A /* libsquish.a */,
 				E38E25680D2639F100618676 /* libxdaap.a */,
 				18404DA51396C31B00863BBA /* SlingboxLib.a */,
 			);
@@ -6957,11 +6716,11 @@
 		F5A00B060EFDDDB700CD59F3 /* AudioRenderers */ = {
 			isa = PBXGroup;
 			children = (
+				F5A00B070EFDDDFC00CD59F3 /* AudioRendererFactory.cpp */,
+				F5A00B090EFDDE5F00CD59F3 /* AudioRendererFactory.h */,
 				83A72B8E0FBC8DB000171871 /* CoreAudioRenderer.cpp */,
 				83A72B8F0FBC8DB000171871 /* CoreAudioRenderer.h */,
 				83A72B900FBC8DB000171871 /* IAudioRenderer.h */,
-				F5A00B090EFDDE5F00CD59F3 /* AudioRendererFactory.h */,
-				F5A00B070EFDDDFC00CD59F3 /* AudioRendererFactory.cpp */,
 				F5A00B240EFDE44100CD59F3 /* NullDirectSound.cpp */,
 				F5A00B250EFDE44100CD59F3 /* NullDirectSound.h */,
 			);
@@ -7087,14 +6846,6 @@
 			name = libsquish;
 			sourceTree = "<group>";
 		};
-		F5E56AD8108280DE006E788A /* New Group */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = "New Group";
-			path = ../../..;
-			sourceTree = "<group>";
-		};
 		F5E56B0F10828303006E788A /* System */ = {
 			isa = PBXGroup;
 			children = (
@@ -9404,6 +9155,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ARCHS = i386;
+				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PREPROCESSOR_DEFINITIONS = "";
 				GCC_VERSION = 4.0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;