Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'master' into pvr-ppa

  • Loading branch information...
commit 5c6848a37b912c59eae909cd485cdb1d7a6111bc 2 parents 60222aa + 624a0bf
Lars Op den Kamp authored August 12, 2011

Showing 302 changed files with 8,168 additions and 8,092 deletions. Show diff stats Hide diff stats

  1. 8  Makefile.in
  2. 12  Makefile.include.in
  3. 731  XBMC-ATV2.xcodeproj/project.pbxproj
  4. 100  XBMC-IOS.xcodeproj/project.pbxproj
  5. 74  XBMC.xcodeproj/project.pbxproj
  6. 2  addons/skin.confluence/720p/AddonBrowser.xml
  7. 2  addons/skin.confluence/720p/MyMusicNav.xml
  8. 2  addons/skin.confluence/720p/MyMusicSongs.xml
  9. 2  addons/skin.confluence/720p/MyPics.xml
  10. 2  addons/skin.confluence/720p/MyPrograms.xml
  11. 2  addons/skin.confluence/720p/MyVideoNav.xml
  12. 8  addons/skin.confluence/addon.xml
  13. 13  addons/skin.confluence/language/Finnish/strings.xml
  14. 19  configure.in
  15. 3  language/Dutch/strings.xml
  16. 11  language/English/strings.xml
  17. 23  language/Finnish/strings.xml
  18. 5  language/German/strings.xml
  19. 85  language/Hindi (Devanagiri)/langinfo.xml
  20. 879  language/Hindi (Devanagiri)/strings.xml
  21. 2  language/Hungarian/strings.xml
  22. 19  lib/DllPostProc.h
  23. 3  lib/ffmpeg/build_xbmc_win32.sh
  24. 3  lib/libXDAAP/Makefile.in
  25. 12  lib/libexif/ExifParse.cpp
  26. 2  project/BuildDependencies/scripts/get_mingw_env.txt
  27. 5  project/BuildDependencies/scripts/librtmp_d.bat
  28. 3  project/BuildDependencies/scripts/librtmp_d.txt
  29. 8  project/VS2010Express/UnrarXLib.vcxproj
  30. 146  project/VS2010Express/XBMC for Windows.sln
  31. 18  project/VS2010Express/XBMC.vcxproj
  32. 54  project/VS2010Express/XBMC.vcxproj.filters
  33. 2  system/keymaps/appcommand.xml
  34. 9  system/keymaps/remote.xml
  35. BIN  tools/TexturePacker/TexturePacker.exe
  36. 209  tools/TexturePacker/Win32/MakeDDS.vcproj
  37. 102  tools/TexturePacker/Win32/MakeDDS.vcxproj
  38. 33  tools/TexturePacker/Win32/MakeDDS.vcxproj.filters
  39. 8  tools/TexturePacker/Win32/TexturePacker.sln
  40. 247  tools/TexturePacker/Win32/TexturePacker.vcproj
  41. 117  tools/TexturePacker/Win32/TexturePacker.vcxproj
  42. 60  tools/TexturePacker/Win32/TexturePacker.vcxproj.filters
  43. 34  tools/TexturePacker/XBMCTex.cpp
  44. 2  tools/TexturePacker/XBTFWriter.cpp
  45. 85  tools/darwin/depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch
  46. 11  tools/darwin/depends/librtmp/Makefile
  47. 115  xbmc/Application.cpp
  48. 13  xbmc/Application.h
  49. 26  xbmc/ApplicationMessenger.cpp
  50. 7  xbmc/ApplicationMessenger.h
  51. 2  xbmc/Favourites.cpp
  52. 49  xbmc/FileItem.cpp
  53. 3  xbmc/FileItem.h
  54. 2,295  xbmc/GUIInfoManager.cpp
  55. 151  xbmc/GUIInfoManager.h
  56. 2  xbmc/GUIViewState.cpp
  57. 8  xbmc/InertialScrollingHandler.cpp
  58. 2  xbmc/SortFileItem.cpp
  59. 7  xbmc/TextureCache.cpp
  60. 7  xbmc/URL.cpp
  61. 1  xbmc/URL.h
  62. 86  xbmc/Util.cpp
  63. 18  xbmc/Util.h
  64. 2  xbmc/XBApplicationEx.cpp
  65. 2  xbmc/addons/AddonCallbacksAddon.cpp
  66. 9  xbmc/addons/AddonCallbacksPVR.cpp
  67. 27  xbmc/addons/GUIDialogAddonInfo.cpp
  68. 2  xbmc/addons/GUIDialogAddonSettings.cpp
  69. 2  xbmc/cdrip/CDDARipper.cpp
  70. 2  xbmc/cores/AudioRenderers/ALSADirectSound.cpp
  71. 8  xbmc/cores/AudioRenderers/AudioRendererFactory.cpp
  72. 1  xbmc/cores/AudioRenderers/IOSAudioRenderer.cpp
  73. 5  xbmc/cores/AudioRenderers/Makefile.in
  74. 55  xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
  75. 15  xbmc/cores/VideoRenderers/LinuxRendererGLES.h
  76. 41  xbmc/cores/VideoRenderers/RenderFlags.h
  77. 8  xbmc/cores/VideoRenderers/RenderManager.cpp
  78. 55  xbmc/cores/VideoRenderers/VideoShaders/WinVideoFilter.cpp
  79. 16  xbmc/cores/VideoRenderers/VideoShaders/WinVideoFilter.h
  80. 95  xbmc/cores/VideoRenderers/WinRenderer.cpp
  81. 4  xbmc/cores/VideoRenderers/WinRenderer.h
  82. 2  xbmc/cores/dvdplayer/DVDCodecs/Video/CrystalHD.cpp
  83. 3  xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h
  84. 8  xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
  85. 3  xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecLibMpeg2.cpp
  86. 2  xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoPPFFmpeg.cpp
  87. 221  xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
  88. 12  xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h
  89. 159  xbmc/cores/dvdplayer/DVDPlayer.cpp
  90. 4  xbmc/cores/dvdplayer/DVDPlayer.h
  91. 51  xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
  92. 3  xbmc/cores/dvdplayer/DVDPlayerVideo.h
  93. 5  xbmc/cores/dvdplayer/Edl.cpp
  94. 4  xbmc/dialogs/GUIDialogBusy.cpp
  95. 2  xbmc/dialogs/GUIDialogExtendedProgressBar.cpp
  96. 6  xbmc/dialogs/GUIDialogFileBrowser.cpp
  97. 23  xbmc/dialogs/GUIDialogKeyboard.cpp
  98. 4  xbmc/dialogs/GUIDialogKeyboard.h
  99. 11  xbmc/dialogs/GUIDialogNumeric.cpp
  100. 16  xbmc/dialogs/GUIDialogProgress.cpp
  101. 34  xbmc/dialogs/GUIDialogVolumeBar.cpp
  102. 4  xbmc/dialogs/GUIDialogVolumeBar.h
  103. 135  xbmc/epg/Epg.cpp
  104. 249  xbmc/epg/Epg.h
  105. 299  xbmc/epg/EpgContainer.cpp
  106. 197  xbmc/epg/EpgContainer.h
  107. 29  xbmc/epg/EpgDatabase.cpp
  108. 3  xbmc/epg/EpgDatabase.h
  109. 83  xbmc/epg/EpgInfoTag.cpp
  110. 235  xbmc/epg/EpgInfoTag.h
  111. 120  xbmc/epg/EpgSearchFilter.cpp
  112. 22  xbmc/epg/EpgSearchFilter.h
  113. 41  xbmc/epg/GUIEPGGridContainer.cpp
  114. 47  xbmc/filesystem/FileCache.cpp
  115. 64  xbmc/filesystem/FileNFS.cpp
  116. 12  xbmc/filesystem/FileNFS.h
  117. 19  xbmc/filesystem/FileShoutcast.cpp
  118. 6  xbmc/filesystem/NFSDirectory.cpp
  119. 2  xbmc/guilib/DirectXGraphics.cpp
  120. 14  xbmc/guilib/GUIBaseContainer.cpp
  121. 4  xbmc/guilib/GUIButtonControl.cpp
  122. 929  xbmc/guilib/GUIButtonScroller.cpp
  123. 130  xbmc/guilib/GUIButtonScroller.h
  124. 45  xbmc/guilib/GUIControl.cpp
  125. 11  xbmc/guilib/GUIControl.h
  126. 89  xbmc/guilib/GUIControlFactory.cpp
  127. 7  xbmc/guilib/GUIControlFactory.h
  128. 2  xbmc/guilib/GUIControlProfiler.cpp
  129. 120  xbmc/guilib/GUIDialog.cpp
  130. 11  xbmc/guilib/GUIDialog.h
  131. 21  xbmc/guilib/GUIEditControl.cpp
  132. 3  xbmc/guilib/GUIFontTTFDX.cpp
  133. 2  xbmc/guilib/GUIIncludes.cpp
  134. 26  xbmc/guilib/GUIInfoTypes.cpp
  135. 8  xbmc/guilib/GUIInfoTypes.h
  136. 4  xbmc/guilib/GUIListContainer.cpp
  137. 23  xbmc/guilib/GUIListItemLayout.cpp
  138. 11  xbmc/guilib/GUIListItemLayout.h
  139. 6  xbmc/guilib/GUIRadioButtonControl.cpp
  140. 4  xbmc/guilib/GUIRadioButtonControl.h
  141. 47  xbmc/guilib/GUISliderControl.cpp
  142. 8  xbmc/guilib/GUIStaticItem.cpp
  143. 2  xbmc/guilib/GUIStaticItem.h
  144. 4  xbmc/guilib/GUITextBox.cpp
  145. 2  xbmc/guilib/GUITextBox.h
  146. 8  xbmc/guilib/GUIToggleButtonControl.cpp
  147. 4  xbmc/guilib/GUIToggleButtonControl.h
  148. 87  xbmc/guilib/GUIWindow.cpp
  149. 10  xbmc/guilib/GUIWindow.h
  150. 30  xbmc/guilib/GUIWindowManager.cpp
  151. 1  xbmc/guilib/GUIWindowManager.h
  152. 15  xbmc/guilib/Geometry.h
  153. 2  xbmc/guilib/IWindowManagerCallback.h
  154. 1  xbmc/guilib/Makefile.in
  155. 3  xbmc/guilib/Texture.cpp
  156. 2  xbmc/guilib/Texture.h
  157. 2  xbmc/guilib/TextureBundleXBT.cpp
  158. 19  xbmc/guilib/VisibleEffect.cpp
  159. 10  xbmc/guilib/VisibleEffect.h
  160. 9  xbmc/guilib/XBTF.cpp
  161. 5  xbmc/guilib/XBTF.h
  162. 772  xbmc/guilib/guilib_win32.vcproj
  163. 6  xbmc/input/ButtonTranslator.cpp
  164. 241  xbmc/input/MouseStat.cpp
  165. 4  xbmc/input/MouseStat.h
  166. 3  xbmc/input/XBIRRemote.h
  167. 2  xbmc/interfaces/Builtins.cpp
  168. 8  xbmc/interfaces/http-api/XBMChttp.cpp
  169. 2  xbmc/interfaces/http-api/XBMChttp.h
  170. 187  xbmc/interfaces/info/InfoBool.cpp
  171. 112  xbmc/interfaces/info/InfoBool.h
  172. 6  xbmc/interfaces/info/Makefile
  173. 24  xbmc/interfaces/python/xbmcmodule/GUIPythonWindowDialog.cpp
  174. 7  xbmc/interfaces/python/xbmcmodule/GUIPythonWindowDialog.h
  175. 24  xbmc/interfaces/python/xbmcmodule/GUIPythonWindowXMLDialog.cpp
  176. 6  xbmc/interfaces/python/xbmcmodule/GUIPythonWindowXMLDialog.h
  177. 10  xbmc/interfaces/python/xbmcmodule/control.cpp
  178. 2  xbmc/interfaces/python/xbmcmodule/window.cpp
  179. 4  xbmc/interfaces/python/xbmcmodule/xbmcmodule.cpp
  180. 2  xbmc/music/MusicDatabase.cpp
  181. 3  xbmc/music/dialogs/GUIDialogMusicInfo.cpp
  182. 2  xbmc/music/dialogs/GUIDialogMusicScan.cpp
  183. 2  xbmc/music/infoscanner/MusicInfoScanner.cpp
  184. 2  xbmc/music/windows/GUIWindowMusicBase.cpp
  185. 4  xbmc/music/windows/GUIWindowMusicNav.cpp
  186. 2  xbmc/music/windows/GUIWindowMusicSongs.cpp
  187. 3  xbmc/music/windows/GUIWindowVisualisation.cpp
  188. 12  xbmc/network/GUIDialogNetworkSetup.cpp
  189. 2  xbmc/pictures/GUIWindowPictures.cpp
  190. 4  xbmc/playlists/SmartPlayList.cpp
  191. 2  xbmc/programs/GUIWindowPrograms.cpp
  192. 36  xbmc/pvr/PVRDatabase.cpp
  193. 2  xbmc/pvr/PVRDatabase.h
  194. 5  xbmc/pvr/PVRGUIInfo.cpp
  195. 8  xbmc/pvr/PVRGUIInfo.h
  196. 309  xbmc/pvr/PVRManager.cpp
  197. 33  xbmc/pvr/PVRManager.h
  198. 7  xbmc/pvr/addons/PVRClient.cpp
  199. 8  xbmc/pvr/addons/PVRClient.h
  200. 157  xbmc/pvr/addons/PVRClients.cpp
  201. 23  xbmc/pvr/addons/PVRClients.h
  202. 121  xbmc/pvr/channels/PVRChannel.cpp
  203. 35  xbmc/pvr/channels/PVRChannel.h
  204. 187  xbmc/pvr/channels/PVRChannelGroup.cpp
  205. 224  xbmc/pvr/channels/PVRChannelGroup.h
  206. 48  xbmc/pvr/channels/PVRChannelGroupInternal.cpp
  207. 159  xbmc/pvr/channels/PVRChannelGroupInternal.h
  208. 10  xbmc/pvr/channels/PVRChannelGroups.cpp
  209. 6  xbmc/pvr/channels/PVRChannelGroupsContainer.cpp
  210. 71  xbmc/pvr/channels/PVRChannelGroupsContainer.h
  211. 8  xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
  212. 51  xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.cpp
  213. 6  xbmc/pvr/dialogs/GUIDialogPVRChannelsOSD.h
  214. 4  xbmc/pvr/dialogs/GUIDialogPVRDirectorOSD.cpp
  215. 8  xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp
  216. 9  xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.cpp
  217. 8  xbmc/pvr/dialogs/GUIDialogPVRGuideInfo.h
  218. 2  xbmc/pvr/dialogs/GUIDialogPVRGuideOSD.cpp
  219. 2  xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.cpp
  220. 11  xbmc/pvr/dialogs/GUIDialogPVRGuideSearch.h
  221. 2  xbmc/pvr/dialogs/GUIDialogPVRTimerSettings.cpp
  222. 9  xbmc/pvr/epg/Makefile
  223. 173  xbmc/pvr/epg/PVREpg.cpp
  224. 109  xbmc/pvr/epg/PVREpg.h
  225. 203  xbmc/pvr/epg/PVREpgContainer.cpp
  226. 119  xbmc/pvr/epg/PVREpgContainer.h
  227. 103  xbmc/pvr/epg/PVREpgInfoTag.cpp
  228. 92  xbmc/pvr/epg/PVREpgInfoTag.h
  229. 143  xbmc/pvr/epg/PVREpgSearchFilter.cpp
  230. 59  xbmc/pvr/epg/PVREpgSearchFilter.h
  231. 24  xbmc/pvr/timers/PVRTimerInfoTag.cpp
  232. 13  xbmc/pvr/timers/PVRTimerInfoTag.h
  233. 12  xbmc/pvr/timers/PVRTimers.cpp
  234. 1  xbmc/pvr/timers/PVRTimers.h
  235. 5  xbmc/pvr/windows/GUIWindowPVR.cpp
  236. 16  xbmc/pvr/windows/GUIWindowPVRChannels.cpp
  237. 28  xbmc/pvr/windows/GUIWindowPVRCommon.cpp
  238. 30  xbmc/pvr/windows/GUIWindowPVRGuide.cpp
  239. 8  xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
  240. 11  xbmc/pvr/windows/GUIWindowPVRSearch.cpp
  241. 4  xbmc/pvr/windows/GUIWindowPVRSearch.h
  242. 32  xbmc/pvrclients/tvheadend/HTSPDemux.cpp
  243. 2  xbmc/pvrclients/tvheadend/HTSPDemux.h
  244. 8  xbmc/pvrclients/vdr-vnsi/VNSIDemux.cpp
  245. 1  xbmc/screensavers/rsxs-0.9/configure.ac
  246. 16  xbmc/settings/AppParamParser.cpp
  247. 2  xbmc/settings/GUIDialogProfileSettings.cpp
  248. 5  xbmc/settings/GUISettings.cpp
  249. 1  xbmc/settings/GUISettings.h
  250. 53  xbmc/settings/GUIWindowSettingsCategory.cpp
  251. 9  xbmc/settings/GUIWindowSettingsCategory.h
  252. 56  xbmc/settings/GUIWindowSettingsScreenCalibration.cpp
  253. 3  xbmc/settings/GUIWindowSettingsScreenCalibration.h
  254. 20  xbmc/settings/GUIWindowTestPattern.cpp
  255. 1  xbmc/settings/GUIWindowTestPattern.h
  256. 9  xbmc/settings/Profile.cpp
  257. 6  xbmc/settings/Profile.h
  258. 19  xbmc/settings/Settings.cpp
  259. 8  xbmc/settings/Settings.h
  260. 32  xbmc/threads/Atomics.cpp
  261. 17  xbmc/threads/Helpers.h
  262. 5  xbmc/threads/Lockables.h
  263. 12  xbmc/threads/SharedSection.h
  264. 2  xbmc/threads/SystemClock.cpp
  265. 6  xbmc/threads/platform/Condition.h
  266. 6  xbmc/threads/platform/CriticalSection.h
  267. 6  xbmc/threads/platform/Implementation.cpp
  268. 6  xbmc/threads/platform/ThreadLocal.h
  269. 47  xbmc/threads/platform/platform.select.h
  270. 4  xbmc/threads/platform/pthreads/CriticalSection.h
  271. 2  xbmc/threads/platform/pthreads/Implementation.cpp
  272. 65  xbmc/threads/platform/win/Condition.h
  273. 286  xbmc/threads/platform/win/FairMonitor.cpp
  274. 183  xbmc/threads/platform/win/FairMonitor.h
  275. 1  xbmc/utils/Makefile
  276. 3  xbmc/utils/Observer.cpp
  277. 145  xbmc/utils/SystemInfo.cpp
  278. 247  xbmc/utils/TimeSmoother.cpp
  279. 188  xbmc/utils/TimeSmoother.h
  280. 12  xbmc/utils/TimeUtils.cpp
  281. 4  xbmc/utils/TimeUtils.h
  282. 31  xbmc/utils/URIUtils.cpp
  283. 2  xbmc/utils/URIUtils.h
  284. 37  xbmc/utils/Weather.cpp
  285. 9  xbmc/utils/Weather.h
  286. 9  xbmc/utils/log.cpp
  287. 38  xbmc/video/GUIViewStateVideo.cpp
  288. 97  xbmc/video/VideoDatabase.cpp
  289. 11  xbmc/video/VideoDatabase.h
  290. 2  xbmc/video/VideoInfoDownloader.cpp
  291. 5  xbmc/video/VideoInfoScanner.cpp
  292. 2  xbmc/video/dialogs/GUIDialogVideoScan.cpp
  293. 19  xbmc/video/windows/GUIWindowFullScreen.cpp
  294. 1  xbmc/video/windows/GUIWindowFullScreen.h
  295. 11  xbmc/video/windows/GUIWindowVideoBase.cpp
  296. 58  xbmc/video/windows/GUIWindowVideoNav.cpp
  297. 1  xbmc/win32/WIN32Util.cpp
  298. 1  xbmc/win32/WINFileSMB.cpp
  299. 2  xbmc/windowing/X11/WinSystemX11.cpp
  300. 6  xbmc/windowing/windows/WinEventsWin32.cpp
  301. 7  xbmc/windows/GUIMediaWindow.cpp
8  Makefile.in
@@ -55,6 +55,7 @@ BIN_DIRS=	\
55 55
 	lib/libhts \
56 56
 	xbmc/interfaces \
57 57
 	xbmc/interfaces/http-api \
  58
+	xbmc/interfaces/info \
58 59
 	xbmc/interfaces/json-rpc \
59 60
 	xbmc/interfaces/python \
60 61
 	xbmc/interfaces/python/xbmcmodule \
@@ -71,7 +72,6 @@ BIN_DIRS=	\
71 72
 	xbmc/pvr/addons \
72 73
 	xbmc/pvr/channels \
73 74
 	xbmc/pvr/dialogs \
74  
-	xbmc/pvr/epg \
75 75
 	xbmc/pvr/recordings \
76 76
 	xbmc/pvr/timers \
77 77
 	xbmc/pvr/windows \
@@ -336,6 +336,8 @@ lib/libhts/libhts.a: force
336 336
 	$(MAKE) -C lib/libhts
337 337
 xbmc/interfaces/interfaces.a: force
338 338
 	$(MAKE) -C xbmc/interfaces
  339
+xbmc/interfaces/info/info.a: force
  340
+	$(MAKE) -C xbmc/interfaces/info
339 341
 xbmc/interfaces/python/python.a: force
340 342
 	$(MAKE) -C xbmc/interfaces/python
341 343
 xbmc/interfaces/python/xbmcmodule/xbmcmodule.a: force
@@ -378,8 +380,6 @@ xbmc/pvr/channels/pvrchannels.a: force
378 380
 	$(MAKE) -C xbmc/pvr/channels
379 381
 xbmc/pvr/dialogs/pvrdialogs.a: force
380 382
 	$(MAKE) -C xbmc/pvr/dialogs
381  
-xbmc/pvr/epg/pvrepg.a: force
382  
-	$(MAKE) -C xbmc/pvr/epg
383 383
 xbmc/pvr/recordings/pvrrecordings.a: force
384 384
 	$(MAKE) -C xbmc/pvr/recordings
385 385
 xbmc/pvr/timers/pvrtimers.a: force
@@ -512,7 +512,6 @@ OBJSXBMC=	\
512 512
 	xbmc/pvr/pvr.a \
513 513
 	xbmc/pvr/channels/pvrchannels.a \
514 514
 	xbmc/pvr/dialogs/pvrdialogs.a \
515  
-	xbmc/pvr/epg/pvrepg.a \
516 515
 	xbmc/pvr/recordings/pvrrecordings.a \
517 516
 	xbmc/pvr/timers/pvrtimers.a \
518 517
 	xbmc/video/dialogs/videodialogs.a \
@@ -532,6 +531,7 @@ OBJSXBMC=	\
532 531
 	xbmc/cdrip/cdrip.a \
533 532
 	xbmc/interfaces/json-rpc/json-rpc.a \
534 533
 	xbmc/interfaces/http-api/http-api.a \
  534
+	xbmc/interfaces/info/info.a \
535 535
 	xbmc/dbwrappers/dbwrappers.a \
536 536
 	lib/libsquish/libsquish.a \
537 537
 	lib/SlingboxLib/SlingboxLib.a \
12  Makefile.include.in
@@ -83,22 +83,22 @@ GEN_DEPS=\
83 83
 
84 84
 %.o: %.cpp
85 85
 	@rm -f $@
86  
-	$(SILENT_CPP) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
  86
+	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
87 87
 	&& $(GEN_DEPS)
88 88
 
89 89
 %.o: %.cc
90 90
 	@rm -f $@
91  
-	$(SILENT_CC) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
  91
+	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
92 92
 	&& $(GEN_DEPS)
93 93
 
94 94
 %.o: %.c
95 95
 	@rm -f $@
96  
-	$(SILENT_CC) $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
  96
+	$(SILENT_CC) $(CC) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
97 97
 	&& $(GEN_DEPS)
98 98
 
99 99
 %.o: %.C
100 100
 	@rm -f $@
101  
-	$(SILENT_CC) $(CC) -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
  101
+	$(SILENT_CPP) $(CXX) -MF $*.d -MD -c $(CFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
102 102
 	&& $(GEN_DEPS)
103 103
 
104 104
 %.o: %.S
@@ -111,12 +111,12 @@ GEN_DEPS=\
111 111
 
112 112
 %.o: %.m
113 113
 	@rm -f $@
114  
-	$(SILENT_MM) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
  114
+	$(SILENT_MM) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
115 115
 	&& $(GEN_DEPS)
116 116
 
117 117
 %.o: %.mm
118 118
 	@rm -f $@
119  
-	$(SILENT_MM) $(CXX) -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
  119
+	$(SILENT_MM) $(CXX) -MF $*.d -MD -c $(CXXFLAGS) $(DEFINES) $(INCLUDES) $< -o $@ \
120 120
 	&& $(GEN_DEPS)
121 121
 
122 122
 
731  XBMC-ATV2.xcodeproj/project.pbxproj
@@ -29,62 +29,62 @@
29 29
 		DF0DF16C13A3AF82008ED511 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF16813A3AF82008ED511 /* FileNFS.cpp */; };
30 30
 		DF0DF16D13A3AF82008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF16A13A3AF82008ED511 /* NFSDirectory.cpp */; };
31 31
 		DF27E25C13C23CCA002514FE /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF27E25A13C23CCA002514FE /* InertialScrollingHandler.cpp */; };
32  
-		DF79149813D4A5650018E92E /* AddonCallbacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79149013D4A5650018E92E /* AddonCallbacks.cpp */; };
33  
-		DF79149913D4A5650018E92E /* AddonCallbacksAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79149213D4A5650018E92E /* AddonCallbacksAddon.cpp */; };
34  
-		DF79149A13D4A5650018E92E /* AddonCallbacksGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79149413D4A5650018E92E /* AddonCallbacksGUI.cpp */; };
35  
-		DF79149B13D4A5650018E92E /* AddonCallbacksPVR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79149613D4A5650018E92E /* AddonCallbacksPVR.cpp */; };
36  
-		DF7914A213D4A5800018E92E /* DVDInputStreamPVRManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79149E13D4A5800018E92E /* DVDInputStreamPVRManager.cpp */; };
37  
-		DF7914A313D4A5800018E92E /* DVDInputStreamStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914A013D4A5800018E92E /* DVDInputStreamStack.cpp */; };
38  
-		DF7914A613D4A58B0018E92E /* DVDDemuxPVRClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914A413D4A58B0018E92E /* DVDDemuxPVRClient.cpp */; };
39  
-		DF7914A913D4A5A30018E92E /* GUIDialogExtendedProgressBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914A713D4A5A30018E92E /* GUIDialogExtendedProgressBar.cpp */; };
40  
-		DF79151013D4A5B90018E92E /* Epg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914AB13D4A5B90018E92E /* Epg.cpp */; };
41  
-		DF79151113D4A5B90018E92E /* EpgContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914AD13D4A5B90018E92E /* EpgContainer.cpp */; };
42  
-		DF79151213D4A5B90018E92E /* EpgDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914AF13D4A5B90018E92E /* EpgDatabase.cpp */; };
43  
-		DF79151313D4A5B90018E92E /* EpgInfoTag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914B113D4A5B90018E92E /* EpgInfoTag.cpp */; };
44  
-		DF79151413D4A5B90018E92E /* EpgSearchFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914B313D4A5B90018E92E /* EpgSearchFilter.cpp */; };
45  
-		DF79151513D4A5B90018E92E /* GUIEPGGridContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914B513D4A5B90018E92E /* GUIEPGGridContainer.cpp */; };
46  
-		DF79151813D4A5B90018E92E /* PVRClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914BB13D4A5B90018E92E /* PVRClient.cpp */; };
47  
-		DF79151913D4A5B90018E92E /* PVRClients.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914BD13D4A5B90018E92E /* PVRClients.cpp */; };
48  
-		DF79151B13D4A5B90018E92E /* PVRChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914C113D4A5B90018E92E /* PVRChannel.cpp */; };
49  
-		DF79151C13D4A5B90018E92E /* PVRChannelGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914C313D4A5B90018E92E /* PVRChannelGroup.cpp */; };
50  
-		DF79151D13D4A5B90018E92E /* PVRChannelGroupInternal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914C513D4A5B90018E92E /* PVRChannelGroupInternal.cpp */; };
51  
-		DF79151E13D4A5B90018E92E /* PVRChannelGroups.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914C713D4A5B90018E92E /* PVRChannelGroups.cpp */; };
52  
-		DF79151F13D4A5B90018E92E /* PVRChannelGroupsContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914C913D4A5B90018E92E /* PVRChannelGroupsContainer.cpp */; };
53  
-		DF79152013D4A5B90018E92E /* GUIDialogPVRChannelManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914CC13D4A5B90018E92E /* GUIDialogPVRChannelManager.cpp */; };
54  
-		DF79152113D4A5B90018E92E /* GUIDialogPVRChannelsOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914CE13D4A5B90018E92E /* GUIDialogPVRChannelsOSD.cpp */; };
55  
-		DF79152213D4A5B90018E92E /* GUIDialogPVRCutterOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914D013D4A5B90018E92E /* GUIDialogPVRCutterOSD.cpp */; };
56  
-		DF79152313D4A5B90018E92E /* GUIDialogPVRDirectorOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914D213D4A5B90018E92E /* GUIDialogPVRDirectorOSD.cpp */; };
57  
-		DF79152413D4A5B90018E92E /* GUIDialogPVRGroupManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914D413D4A5B90018E92E /* GUIDialogPVRGroupManager.cpp */; };
58  
-		DF79152513D4A5B90018E92E /* GUIDialogPVRGuideInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914D613D4A5B90018E92E /* GUIDialogPVRGuideInfo.cpp */; };
59  
-		DF79152613D4A5B90018E92E /* GUIDialogPVRGuideOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914D813D4A5B90018E92E /* GUIDialogPVRGuideOSD.cpp */; };
60  
-		DF79152713D4A5B90018E92E /* GUIDialogPVRGuideSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914DA13D4A5B90018E92E /* GUIDialogPVRGuideSearch.cpp */; };
61  
-		DF79152813D4A5B90018E92E /* GUIDialogPVRRecordingInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914DC13D4A5B90018E92E /* GUIDialogPVRRecordingInfo.cpp */; };
62  
-		DF79152913D4A5B90018E92E /* GUIDialogPVRTimerSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914DE13D4A5B90018E92E /* GUIDialogPVRTimerSettings.cpp */; };
63  
-		DF79152C13D4A5B90018E92E /* PVREpg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914E313D4A5B90018E92E /* PVREpg.cpp */; };
64  
-		DF79152D13D4A5B90018E92E /* PVREpgContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914E513D4A5B90018E92E /* PVREpgContainer.cpp */; };
65  
-		DF79152E13D4A5B90018E92E /* PVREpgInfoTag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914E713D4A5B90018E92E /* PVREpgInfoTag.cpp */; };
66  
-		DF79152F13D4A5B90018E92E /* PVREpgSearchFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914E913D4A5B90018E92E /* PVREpgSearchFilter.cpp */; };
67  
-		DF79153113D4A5B90018E92E /* PVRDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914EC13D4A5B90018E92E /* PVRDatabase.cpp */; };
68  
-		DF79153213D4A5B90018E92E /* PVRGUIInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914EE13D4A5B90018E92E /* PVRGUIInfo.cpp */; };
69  
-		DF79153313D4A5B90018E92E /* PVRManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914F013D4A5B90018E92E /* PVRManager.cpp */; };
70  
-		DF79153513D4A5B90018E92E /* PVRRecording.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914F413D4A5B90018E92E /* PVRRecording.cpp */; };
71  
-		DF79153613D4A5B90018E92E /* PVRRecordings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914F613D4A5B90018E92E /* PVRRecordings.cpp */; };
72  
-		DF79153813D4A5B90018E92E /* PVRTimerInfoTag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914FA13D4A5B90018E92E /* PVRTimerInfoTag.cpp */; };
73  
-		DF79153913D4A5B90018E92E /* PVRTimers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914FC13D4A5B90018E92E /* PVRTimers.cpp */; };
74  
-		DF79153A13D4A5B90018E92E /* GUIViewStatePVR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7914FF13D4A5B90018E92E /* GUIViewStatePVR.cpp */; };
75  
-		DF79153B13D4A5B90018E92E /* GUIWindowPVR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79150113D4A5B90018E92E /* GUIWindowPVR.cpp */; };
76  
-		DF79153C13D4A5B90018E92E /* GUIWindowPVRChannels.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79150313D4A5B90018E92E /* GUIWindowPVRChannels.cpp */; };
77  
-		DF79153D13D4A5B90018E92E /* GUIWindowPVRCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79150513D4A5B90018E92E /* GUIWindowPVRCommon.cpp */; };
78  
-		DF79153E13D4A5B90018E92E /* GUIWindowPVRGuide.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79150713D4A5B90018E92E /* GUIWindowPVRGuide.cpp */; };
79  
-		DF79153F13D4A5B90018E92E /* GUIWindowPVRRecordings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79150913D4A5B90018E92E /* GUIWindowPVRRecordings.cpp */; };
80  
-		DF79154013D4A5B90018E92E /* GUIWindowPVRSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79150B13D4A5B90018E92E /* GUIWindowPVRSearch.cpp */; };
81  
-		DF79154113D4A5B90018E92E /* GUIWindowPVRTimers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79150D13D4A5B90018E92E /* GUIWindowPVRTimers.cpp */; };
82  
-		DF79154713D4A6120018E92E /* Observer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79154313D4A6120018E92E /* Observer.cpp */; };
83  
-		DF79154813D4A6120018E92E /* TextSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79154513D4A6120018E92E /* TextSearch.cpp */; };
84  
-		DF79154A13D4A6280018E92E /* libTcpSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF79154913D4A6280018E92E /* libTcpSocket.a */; };
85  
-		DF79168B13D4AA800018E92E /* PVRDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79168713D4AA800018E92E /* PVRDirectory.cpp */; };
86  
-		DF79168C13D4AA800018E92E /* PVRFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF79168913D4AA800018E92E /* PVRFile.cpp */; };
87  
-		DFD4D21F13D7286E00A47C47 /* platform.select.h in Resources */ = {isa = PBXBuildFile; fileRef = DFD4D21013D7286E00A47C47 /* platform.select.h */; };
  32
+		DF7E662313ED4ADF003ED690 /* Observer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E662213ED4ADF003ED690 /* Observer.cpp */; };
  33
+		DF7E663413ED4BF8003ED690 /* Epg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E662713ED4BF8003ED690 /* Epg.cpp */; };
  34
+		DF7E663513ED4BF8003ED690 /* EpgContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E662913ED4BF8003ED690 /* EpgContainer.cpp */; };
  35
+		DF7E663613ED4BF8003ED690 /* EpgDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E662B13ED4BF8003ED690 /* EpgDatabase.cpp */; };
  36
+		DF7E663713ED4BF8003ED690 /* EpgInfoTag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E662D13ED4BF8003ED690 /* EpgInfoTag.cpp */; };
  37
+		DF7E663813ED4BF8003ED690 /* EpgSearchFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E662F13ED4BF8003ED690 /* EpgSearchFilter.cpp */; };
  38
+		DF7E663913ED4BF8003ED690 /* GUIEPGGridContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E663113ED4BF8003ED690 /* GUIEPGGridContainer.cpp */; };
  39
+		DF7E664313ED4C48003ED690 /* AddonCallbacks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E663B13ED4C48003ED690 /* AddonCallbacks.cpp */; };
  40
+		DF7E664413ED4C48003ED690 /* AddonCallbacksAddon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E663D13ED4C48003ED690 /* AddonCallbacksAddon.cpp */; };
  41
+		DF7E664513ED4C48003ED690 /* AddonCallbacksGUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E663F13ED4C48003ED690 /* AddonCallbacksGUI.cpp */; };
  42
+		DF7E664613ED4C48003ED690 /* AddonCallbacksPVR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E664113ED4C48003ED690 /* AddonCallbacksPVR.cpp */; };
  43
+		DF7E664913ED4C5A003ED690 /* GUIDialogExtendedProgressBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E664713ED4C5A003ED690 /* GUIDialogExtendedProgressBar.cpp */; };
  44
+		DF7E664C13ED4C96003ED690 /* TextSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E664A13ED4C96003ED690 /* TextSearch.cpp */; };
  45
+		DF7E675513ED4CB1003ED690 /* PVRClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E665013ED4CB1003ED690 /* PVRClient.cpp */; };
  46
+		DF7E675613ED4CB1003ED690 /* PVRClients.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E665213ED4CB1003ED690 /* PVRClients.cpp */; };
  47
+		DF7E675813ED4CB1003ED690 /* PVRChannel.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E665613ED4CB1003ED690 /* PVRChannel.cpp */; };
  48
+		DF7E675913ED4CB1003ED690 /* PVRChannelGroup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E665813ED4CB1003ED690 /* PVRChannelGroup.cpp */; };
  49
+		DF7E675A13ED4CB1003ED690 /* PVRChannelGroupInternal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E665A13ED4CB1003ED690 /* PVRChannelGroupInternal.cpp */; };
  50
+		DF7E675B13ED4CB1003ED690 /* PVRChannelGroups.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E665C13ED4CB1003ED690 /* PVRChannelGroups.cpp */; };
  51
+		DF7E675C13ED4CB1003ED690 /* PVRChannelGroupsContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E665E13ED4CB1003ED690 /* PVRChannelGroupsContainer.cpp */; };
  52
+		DF7E675D13ED4CB1003ED690 /* GUIDialogPVRChannelManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E666113ED4CB1003ED690 /* GUIDialogPVRChannelManager.cpp */; };
  53
+		DF7E675E13ED4CB1003ED690 /* GUIDialogPVRChannelsOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E666313ED4CB1003ED690 /* GUIDialogPVRChannelsOSD.cpp */; };
  54
+		DF7E675F13ED4CB1003ED690 /* GUIDialogPVRCutterOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E666513ED4CB1003ED690 /* GUIDialogPVRCutterOSD.cpp */; };
  55
+		DF7E676013ED4CB1003ED690 /* GUIDialogPVRDirectorOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E666713ED4CB1003ED690 /* GUIDialogPVRDirectorOSD.cpp */; };
  56
+		DF7E676113ED4CB1003ED690 /* GUIDialogPVRGroupManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E666913ED4CB1003ED690 /* GUIDialogPVRGroupManager.cpp */; };
  57
+		DF7E676213ED4CB1003ED690 /* GUIDialogPVRGuideInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E666B13ED4CB1003ED690 /* GUIDialogPVRGuideInfo.cpp */; };
  58
+		DF7E676313ED4CB1003ED690 /* GUIDialogPVRGuideOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E666D13ED4CB1003ED690 /* GUIDialogPVRGuideOSD.cpp */; };
  59
+		DF7E676413ED4CB1003ED690 /* GUIDialogPVRGuideSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E666F13ED4CB1003ED690 /* GUIDialogPVRGuideSearch.cpp */; };
  60
+		DF7E676513ED4CB1003ED690 /* GUIDialogPVRRecordingInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E667113ED4CB1003ED690 /* GUIDialogPVRRecordingInfo.cpp */; };
  61
+		DF7E676613ED4CB1003ED690 /* GUIDialogPVRTimerSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E667313ED4CB1003ED690 /* GUIDialogPVRTimerSettings.cpp */; };
  62
+		DF7E676913ED4CB1003ED690 /* PVREpg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E667813ED4CB1003ED690 /* PVREpg.cpp */; };
  63
+		DF7E676A13ED4CB1003ED690 /* PVREpgContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E667A13ED4CB1003ED690 /* PVREpgContainer.cpp */; };
  64
+		DF7E676B13ED4CB1003ED690 /* PVREpgInfoTag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E667C13ED4CB1003ED690 /* PVREpgInfoTag.cpp */; };
  65
+		DF7E676C13ED4CB1003ED690 /* PVREpgSearchFilter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E667E13ED4CB1003ED690 /* PVREpgSearchFilter.cpp */; };
  66
+		DF7E676E13ED4CB1003ED690 /* PVRDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E668113ED4CB1003ED690 /* PVRDatabase.cpp */; };
  67
+		DF7E676F13ED4CB1003ED690 /* PVRGUIInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E668313ED4CB1003ED690 /* PVRGUIInfo.cpp */; };
  68
+		DF7E677013ED4CB1003ED690 /* PVRManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E668513ED4CB1003ED690 /* PVRManager.cpp */; };
  69
+		DF7E677213ED4CB1003ED690 /* PVRRecording.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E668913ED4CB1003ED690 /* PVRRecording.cpp */; };
  70
+		DF7E677313ED4CB1003ED690 /* PVRRecordings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E668B13ED4CB1003ED690 /* PVRRecordings.cpp */; };
  71
+		DF7E677513ED4CB1003ED690 /* PVRTimerInfoTag.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E668F13ED4CB1003ED690 /* PVRTimerInfoTag.cpp */; };
  72
+		DF7E677613ED4CB1003ED690 /* PVRTimers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E669113ED4CB1003ED690 /* PVRTimers.cpp */; };
  73
+		DF7E677713ED4CB1003ED690 /* GUIViewStatePVR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E669413ED4CB1003ED690 /* GUIViewStatePVR.cpp */; };
  74
+		DF7E677813ED4CB1003ED690 /* GUIWindowPVR.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E669613ED4CB1003ED690 /* GUIWindowPVR.cpp */; };
  75
+		DF7E677913ED4CB1003ED690 /* GUIWindowPVRChannels.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E669813ED4CB1003ED690 /* GUIWindowPVRChannels.cpp */; };
  76
+		DF7E677A13ED4CB1003ED690 /* GUIWindowPVRCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E669A13ED4CB1003ED690 /* GUIWindowPVRCommon.cpp */; };
  77
+		DF7E677B13ED4CB1003ED690 /* GUIWindowPVRGuide.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E669C13ED4CB1003ED690 /* GUIWindowPVRGuide.cpp */; };
  78
+		DF7E677C13ED4CB1003ED690 /* GUIWindowPVRRecordings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E669E13ED4CB1003ED690 /* GUIWindowPVRRecordings.cpp */; };
  79
+		DF7E677D13ED4CB1003ED690 /* GUIWindowPVRSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E66A013ED4CB1003ED690 /* GUIWindowPVRSearch.cpp */; };
  80
+		DF7E677E13ED4CB1003ED690 /* GUIWindowPVRTimers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E66A213ED4CB1003ED690 /* GUIWindowPVRTimers.cpp */; };
  81
+		DF7E680013ED4E25003ED690 /* DVDInputStreamPVRManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E67FC13ED4E25003ED690 /* DVDInputStreamPVRManager.cpp */; };
  82
+		DF7E680113ED4E25003ED690 /* DVDInputStreamStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E67FE13ED4E25003ED690 /* DVDInputStreamStack.cpp */; };
  83
+		DF7E680413ED4E42003ED690 /* DVDDemuxPVRClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E680213ED4E42003ED690 /* DVDDemuxPVRClient.cpp */; };
  84
+		DF7E680813ED4F15003ED690 /* libTcpSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DF7E680713ED4F15003ED690 /* libTcpSocket.a */; };
  85
+		DF7E681613ED5152003ED690 /* TimeSmoother.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF88787913E8912900B4ECE2 /* TimeSmoother.cpp */; };
  86
+		DF7E683B13ED52B7003ED690 /* PVRDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E683713ED52B7003ED690 /* PVRDirectory.cpp */; };
  87
+		DF7E683C13ED52B7003ED690 /* PVRFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF7E683913ED52B7003ED690 /* PVRFile.cpp */; };
88 88
 		DFD4D22013D7286E00A47C47 /* Implementation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D21413D7286E00A47C47 /* Implementation.cpp */; };
89 89
 		DFD4D22113D7286E00A47C47 /* README.platform in Resources */ = {isa = PBXBuildFile; fileRef = DFD4D21613D7286E00A47C47 /* README.platform */; };
90 90
 		DFD4D22213D7286E00A47C47 /* SystemClock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DFD4D21C13D7286E00A47C47 /* SystemClock.cpp */; };
@@ -462,7 +462,6 @@
462 462
 		F56C79F8131EC154000AD0F6 /* GUIBaseContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7506131EC152000AD0F6 /* GUIBaseContainer.cpp */; };
463 463
 		F56C79F9131EC154000AD0F6 /* GUIBorderedImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7507131EC152000AD0F6 /* GUIBorderedImage.cpp */; };
464 464
 		F56C79FA131EC154000AD0F6 /* GUIButtonControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7508131EC152000AD0F6 /* GUIButtonControl.cpp */; };
465  
-		F56C79FB131EC154000AD0F6 /* GUIButtonScroller.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7509131EC152000AD0F6 /* GUIButtonScroller.cpp */; };
466 465
 		F56C79FC131EC154000AD0F6 /* GUICheckMarkControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C750A131EC152000AD0F6 /* GUICheckMarkControl.cpp */; };
467 466
 		F56C79FD131EC154000AD0F6 /* GUIColorManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C750B131EC152000AD0F6 /* GUIColorManager.cpp */; };
468 467
 		F56C79FE131EC154000AD0F6 /* GUIControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C750C131EC152000AD0F6 /* GUIControl.cpp */; };
@@ -977,6 +976,7 @@
977 976
 		F5AE453B134D2E720004BD79 /* JSONServiceDescription.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AE4539134D2E720004BD79 /* JSONServiceDescription.cpp */; };
978 977
 		F5B13E0113344F310045076D /* DarwinUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B13E0013344F310045076D /* DarwinUtils.mm */; };
979 978
 		F5CEE72C13D3F9AC00225F72 /* DVDOverlayCodecTX3G.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5CEE72B13D3F9AC00225F72 /* DVDOverlayCodecTX3G.cpp */; };
  979
+		F5E6209F13E9081400D5F2CD /* InfoBool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E6209D13E9081400D5F2CD /* InfoBool.cpp */; };
980 980
 /* End PBXBuildFile section */
981 981
 
982 982
 /* Begin PBXFileReference section */
@@ -1026,118 +1026,119 @@
1026 1026
 		DF0DF16B13A3AF82008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = "<group>"; };
1027 1027
 		DF27E25A13C23CCA002514FE /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = "<group>"; };
1028 1028
 		DF27E25B13C23CCA002514FE /* InertialScrollingHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InertialScrollingHandler.h; sourceTree = "<group>"; };
1029  
-		DF79149013D4A5650018E92E /* AddonCallbacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonCallbacks.cpp; sourceTree = "<group>"; };
1030  
-		DF79149113D4A5650018E92E /* AddonCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonCallbacks.h; sourceTree = "<group>"; };
1031  
-		DF79149213D4A5650018E92E /* AddonCallbacksAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonCallbacksAddon.cpp; sourceTree = "<group>"; };
1032  
-		DF79149313D4A5650018E92E /* AddonCallbacksAddon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonCallbacksAddon.h; sourceTree = "<group>"; };
1033  
-		DF79149413D4A5650018E92E /* AddonCallbacksGUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonCallbacksGUI.cpp; sourceTree = "<group>"; };
1034  
-		DF79149513D4A5650018E92E /* AddonCallbacksGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonCallbacksGUI.h; sourceTree = "<group>"; };
1035  
-		DF79149613D4A5650018E92E /* AddonCallbacksPVR.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonCallbacksPVR.cpp; sourceTree = "<group>"; };
1036  
-		DF79149713D4A5650018E92E /* AddonCallbacksPVR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonCallbacksPVR.h; sourceTree = "<group>"; };
1037  
-		DF79149E13D4A5800018E92E /* DVDInputStreamPVRManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDInputStreamPVRManager.cpp; sourceTree = "<group>"; };
1038  
-		DF79149F13D4A5800018E92E /* DVDInputStreamPVRManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDInputStreamPVRManager.h; sourceTree = "<group>"; };
1039  
-		DF7914A013D4A5800018E92E /* DVDInputStreamStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDInputStreamStack.cpp; sourceTree = "<group>"; };
1040  
-		DF7914A113D4A5800018E92E /* DVDInputStreamStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDInputStreamStack.h; sourceTree = "<group>"; };
1041  
-		DF7914A413D4A58B0018E92E /* DVDDemuxPVRClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDDemuxPVRClient.cpp; sourceTree = "<group>"; };
1042  
-		DF7914A513D4A58B0018E92E /* DVDDemuxPVRClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDDemuxPVRClient.h; sourceTree = "<group>"; };
1043  
-		DF7914A713D4A5A30018E92E /* GUIDialogExtendedProgressBar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogExtendedProgressBar.cpp; sourceTree = "<group>"; };
1044  
-		DF7914A813D4A5A30018E92E /* GUIDialogExtendedProgressBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogExtendedProgressBar.h; sourceTree = "<group>"; };
1045  
-		DF7914AB13D4A5B90018E92E /* Epg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Epg.cpp; sourceTree = "<group>"; };
1046  
-		DF7914AC13D4A5B90018E92E /* Epg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Epg.h; sourceTree = "<group>"; };
1047  
-		DF7914AD13D4A5B90018E92E /* EpgContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EpgContainer.cpp; sourceTree = "<group>"; };
1048  
-		DF7914AE13D4A5B90018E92E /* EpgContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EpgContainer.h; sourceTree = "<group>"; };
1049  
-		DF7914AF13D4A5B90018E92E /* EpgDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EpgDatabase.cpp; sourceTree = "<group>"; };
1050  
-		DF7914B013D4A5B90018E92E /* EpgDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EpgDatabase.h; sourceTree = "<group>"; };
1051  
-		DF7914B113D4A5B90018E92E /* EpgInfoTag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EpgInfoTag.cpp; sourceTree = "<group>"; };
1052  
-		DF7914B213D4A5B90018E92E /* EpgInfoTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EpgInfoTag.h; sourceTree = "<group>"; };
1053  
-		DF7914B313D4A5B90018E92E /* EpgSearchFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EpgSearchFilter.cpp; sourceTree = "<group>"; };
1054  
-		DF7914B413D4A5B90018E92E /* EpgSearchFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EpgSearchFilter.h; sourceTree = "<group>"; };
1055  
-		DF7914B513D4A5B90018E92E /* GUIEPGGridContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIEPGGridContainer.cpp; sourceTree = "<group>"; };
1056  
-		DF7914B613D4A5B90018E92E /* GUIEPGGridContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIEPGGridContainer.h; sourceTree = "<group>"; };
1057  
-		DF7914BB13D4A5B90018E92E /* PVRClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRClient.cpp; sourceTree = "<group>"; };
1058  
-		DF7914BC13D4A5B90018E92E /* PVRClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRClient.h; sourceTree = "<group>"; };
1059  
-		DF7914BD13D4A5B90018E92E /* PVRClients.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRClients.cpp; sourceTree = "<group>"; };
1060  
-		DF7914BE13D4A5B90018E92E /* PVRClients.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRClients.h; sourceTree = "<group>"; };
1061  
-		DF7914C113D4A5B90018E92E /* PVRChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRChannel.cpp; sourceTree = "<group>"; };
1062  
-		DF7914C213D4A5B90018E92E /* PVRChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRChannel.h; sourceTree = "<group>"; };
1063  
-		DF7914C313D4A5B90018E92E /* PVRChannelGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRChannelGroup.cpp; sourceTree = "<group>"; };
1064  
-		DF7914C413D4A5B90018E92E /* PVRChannelGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRChannelGroup.h; sourceTree = "<group>"; };
1065  
-		DF7914C513D4A5B90018E92E /* PVRChannelGroupInternal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRChannelGroupInternal.cpp; sourceTree = "<group>"; };
1066  
-		DF7914C613D4A5B90018E92E /* PVRChannelGroupInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRChannelGroupInternal.h; sourceTree = "<group>"; };
1067  
-		DF7914C713D4A5B90018E92E /* PVRChannelGroups.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRChannelGroups.cpp; sourceTree = "<group>"; };
1068  
-		DF7914C813D4A5B90018E92E /* PVRChannelGroups.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRChannelGroups.h; sourceTree = "<group>"; };
1069  
-		DF7914C913D4A5B90018E92E /* PVRChannelGroupsContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRChannelGroupsContainer.cpp; sourceTree = "<group>"; };
1070  
-		DF7914CA13D4A5B90018E92E /* PVRChannelGroupsContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRChannelGroupsContainer.h; sourceTree = "<group>"; };
1071  
-		DF7914CC13D4A5B90018E92E /* GUIDialogPVRChannelManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRChannelManager.cpp; sourceTree = "<group>"; };
1072  
-		DF7914CD13D4A5B90018E92E /* GUIDialogPVRChannelManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRChannelManager.h; sourceTree = "<group>"; };
1073  
-		DF7914CE13D4A5B90018E92E /* GUIDialogPVRChannelsOSD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRChannelsOSD.cpp; sourceTree = "<group>"; };
1074  
-		DF7914CF13D4A5B90018E92E /* GUIDialogPVRChannelsOSD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRChannelsOSD.h; sourceTree = "<group>"; };
1075  
-		DF7914D013D4A5B90018E92E /* GUIDialogPVRCutterOSD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRCutterOSD.cpp; sourceTree = "<group>"; };
1076  
-		DF7914D113D4A5B90018E92E /* GUIDialogPVRCutterOSD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRCutterOSD.h; sourceTree = "<group>"; };
1077  
-		DF7914D213D4A5B90018E92E /* GUIDialogPVRDirectorOSD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRDirectorOSD.cpp; sourceTree = "<group>"; };
1078  
-		DF7914D313D4A5B90018E92E /* GUIDialogPVRDirectorOSD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRDirectorOSD.h; sourceTree = "<group>"; };
1079  
-		DF7914D413D4A5B90018E92E /* GUIDialogPVRGroupManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRGroupManager.cpp; sourceTree = "<group>"; };
1080  
-		DF7914D513D4A5B90018E92E /* GUIDialogPVRGroupManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRGroupManager.h; sourceTree = "<group>"; };
1081  
-		DF7914D613D4A5B90018E92E /* GUIDialogPVRGuideInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRGuideInfo.cpp; sourceTree = "<group>"; };
1082  
-		DF7914D713D4A5B90018E92E /* GUIDialogPVRGuideInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRGuideInfo.h; sourceTree = "<group>"; };
1083  
-		DF7914D813D4A5B90018E92E /* GUIDialogPVRGuideOSD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRGuideOSD.cpp; sourceTree = "<group>"; };
1084  
-		DF7914D913D4A5B90018E92E /* GUIDialogPVRGuideOSD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRGuideOSD.h; sourceTree = "<group>"; };
1085  
-		DF7914DA13D4A5B90018E92E /* GUIDialogPVRGuideSearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRGuideSearch.cpp; sourceTree = "<group>"; };
1086  
-		DF7914DB13D4A5B90018E92E /* GUIDialogPVRGuideSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRGuideSearch.h; sourceTree = "<group>"; };
1087  
-		DF7914DC13D4A5B90018E92E /* GUIDialogPVRRecordingInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRRecordingInfo.cpp; sourceTree = "<group>"; };
1088  
-		DF7914DD13D4A5B90018E92E /* GUIDialogPVRRecordingInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRRecordingInfo.h; sourceTree = "<group>"; };
1089  
-		DF7914DE13D4A5B90018E92E /* GUIDialogPVRTimerSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRTimerSettings.cpp; sourceTree = "<group>"; };
1090  
-		DF7914DF13D4A5B90018E92E /* GUIDialogPVRTimerSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRTimerSettings.h; sourceTree = "<group>"; };
1091  
-		DF7914E313D4A5B90018E92E /* PVREpg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVREpg.cpp; sourceTree = "<group>"; };
1092  
-		DF7914E413D4A5B90018E92E /* PVREpg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVREpg.h; sourceTree = "<group>"; };
1093  
-		DF7914E513D4A5B90018E92E /* PVREpgContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVREpgContainer.cpp; sourceTree = "<group>"; };
1094  
-		DF7914E613D4A5B90018E92E /* PVREpgContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVREpgContainer.h; sourceTree = "<group>"; };
1095  
-		DF7914E713D4A5B90018E92E /* PVREpgInfoTag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVREpgInfoTag.cpp; sourceTree = "<group>"; };
1096  
-		DF7914E813D4A5B90018E92E /* PVREpgInfoTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVREpgInfoTag.h; sourceTree = "<group>"; };
1097  
-		DF7914E913D4A5B90018E92E /* PVREpgSearchFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVREpgSearchFilter.cpp; sourceTree = "<group>"; };
1098  
-		DF7914EA13D4A5B90018E92E /* PVREpgSearchFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVREpgSearchFilter.h; sourceTree = "<group>"; };
1099  
-		DF7914EC13D4A5B90018E92E /* PVRDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRDatabase.cpp; sourceTree = "<group>"; };
1100  
-		DF7914ED13D4A5B90018E92E /* PVRDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRDatabase.h; sourceTree = "<group>"; };
1101  
-		DF7914EE13D4A5B90018E92E /* PVRGUIInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRGUIInfo.cpp; sourceTree = "<group>"; };
1102  
-		DF7914EF13D4A5B90018E92E /* PVRGUIInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRGUIInfo.h; sourceTree = "<group>"; };
1103  
-		DF7914F013D4A5B90018E92E /* PVRManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRManager.cpp; sourceTree = "<group>"; };
1104  
-		DF7914F113D4A5B90018E92E /* PVRManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRManager.h; sourceTree = "<group>"; };
1105  
-		DF7914F413D4A5B90018E92E /* PVRRecording.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRRecording.cpp; sourceTree = "<group>"; };
1106  
-		DF7914F513D4A5B90018E92E /* PVRRecording.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRRecording.h; sourceTree = "<group>"; };
1107  
-		DF7914F613D4A5B90018E92E /* PVRRecordings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRRecordings.cpp; sourceTree = "<group>"; };
1108  
-		DF7914F713D4A5B90018E92E /* PVRRecordings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRRecordings.h; sourceTree = "<group>"; };
1109  
-		DF7914FA13D4A5B90018E92E /* PVRTimerInfoTag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRTimerInfoTag.cpp; sourceTree = "<group>"; };
1110  
-		DF7914FB13D4A5B90018E92E /* PVRTimerInfoTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRTimerInfoTag.h; sourceTree = "<group>"; };
1111  
-		DF7914FC13D4A5B90018E92E /* PVRTimers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRTimers.cpp; sourceTree = "<group>"; };
1112  
-		DF7914FD13D4A5B90018E92E /* PVRTimers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRTimers.h; sourceTree = "<group>"; };
1113  
-		DF7914FF13D4A5B90018E92E /* GUIViewStatePVR.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewStatePVR.cpp; sourceTree = "<group>"; };
1114  
-		DF79150013D4A5B90018E92E /* GUIViewStatePVR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewStatePVR.h; sourceTree = "<group>"; };
1115  
-		DF79150113D4A5B90018E92E /* GUIWindowPVR.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVR.cpp; sourceTree = "<group>"; };
1116  
-		DF79150213D4A5B90018E92E /* GUIWindowPVR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVR.h; sourceTree = "<group>"; };
1117  
-		DF79150313D4A5B90018E92E /* GUIWindowPVRChannels.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVRChannels.cpp; sourceTree = "<group>"; };
1118  
-		DF79150413D4A5B90018E92E /* GUIWindowPVRChannels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVRChannels.h; sourceTree = "<group>"; };
1119  
-		DF79150513D4A5B90018E92E /* GUIWindowPVRCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVRCommon.cpp; sourceTree = "<group>"; };
1120  
-		DF79150613D4A5B90018E92E /* GUIWindowPVRCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVRCommon.h; sourceTree = "<group>"; };
1121  
-		DF79150713D4A5B90018E92E /* GUIWindowPVRGuide.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVRGuide.cpp; sourceTree = "<group>"; };
1122  
-		DF79150813D4A5B90018E92E /* GUIWindowPVRGuide.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVRGuide.h; sourceTree = "<group>"; };
1123  
-		DF79150913D4A5B90018E92E /* GUIWindowPVRRecordings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVRRecordings.cpp; sourceTree = "<group>"; };
1124  
-		DF79150A13D4A5B90018E92E /* GUIWindowPVRRecordings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVRRecordings.h; sourceTree = "<group>"; };
1125  
-		DF79150B13D4A5B90018E92E /* GUIWindowPVRSearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVRSearch.cpp; sourceTree = "<group>"; };
1126  
-		DF79150C13D4A5B90018E92E /* GUIWindowPVRSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVRSearch.h; sourceTree = "<group>"; };
1127  
-		DF79150D13D4A5B90018E92E /* GUIWindowPVRTimers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVRTimers.cpp; sourceTree = "<group>"; };
1128  
-		DF79150E13D4A5B90018E92E /* GUIWindowPVRTimers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVRTimers.h; sourceTree = "<group>"; };
1129  
-		DF79154313D4A6120018E92E /* Observer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Observer.cpp; sourceTree = "<group>"; };
1130  
-		DF79154413D4A6120018E92E /* Observer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Observer.h; sourceTree = "<group>"; };
1131  
-		DF79154513D4A6120018E92E /* TextSearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextSearch.cpp; sourceTree = "<group>"; };
1132  
-		DF79154613D4A6120018E92E /* TextSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextSearch.h; sourceTree = "<group>"; };
1133  
-		DF79154913D4A6280018E92E /* libTcpSocket.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTcpSocket.a; path = lib/libTcpSocket/libTcpSocket.a; sourceTree = "<group>"; };
1134  
-		DF79168713D4AA800018E92E /* PVRDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRDirectory.cpp; sourceTree = "<group>"; };
1135  
-		DF79168813D4AA800018E92E /* PVRDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRDirectory.h; sourceTree = "<group>"; };
1136  
-		DF79168913D4AA800018E92E /* PVRFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRFile.cpp; sourceTree = "<group>"; };
1137  
-		DF79168A13D4AA800018E92E /* PVRFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRFile.h; sourceTree = "<group>"; };
  1029
+		DF7E662213ED4ADF003ED690 /* Observer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Observer.cpp; sourceTree = "<group>"; };
  1030
+		DF7E662713ED4BF8003ED690 /* Epg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Epg.cpp; sourceTree = "<group>"; };
  1031
+		DF7E662813ED4BF8003ED690 /* Epg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Epg.h; sourceTree = "<group>"; };
  1032
+		DF7E662913ED4BF8003ED690 /* EpgContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EpgContainer.cpp; sourceTree = "<group>"; };
  1033
+		DF7E662A13ED4BF8003ED690 /* EpgContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EpgContainer.h; sourceTree = "<group>"; };
  1034
+		DF7E662B13ED4BF8003ED690 /* EpgDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EpgDatabase.cpp; sourceTree = "<group>"; };
  1035
+		DF7E662C13ED4BF8003ED690 /* EpgDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EpgDatabase.h; sourceTree = "<group>"; };
  1036
+		DF7E662D13ED4BF8003ED690 /* EpgInfoTag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EpgInfoTag.cpp; sourceTree = "<group>"; };
  1037
+		DF7E662E13ED4BF8003ED690 /* EpgInfoTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EpgInfoTag.h; sourceTree = "<group>"; };
  1038
+		DF7E662F13ED4BF8003ED690 /* EpgSearchFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EpgSearchFilter.cpp; sourceTree = "<group>"; };
  1039
+		DF7E663013ED4BF8003ED690 /* EpgSearchFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EpgSearchFilter.h; sourceTree = "<group>"; };
  1040
+		DF7E663113ED4BF8003ED690 /* GUIEPGGridContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIEPGGridContainer.cpp; sourceTree = "<group>"; };
  1041
+		DF7E663213ED4BF8003ED690 /* GUIEPGGridContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIEPGGridContainer.h; sourceTree = "<group>"; };
  1042
+		DF7E663B13ED4C48003ED690 /* AddonCallbacks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonCallbacks.cpp; sourceTree = "<group>"; };
  1043
+		DF7E663C13ED4C48003ED690 /* AddonCallbacks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonCallbacks.h; sourceTree = "<group>"; };
  1044
+		DF7E663D13ED4C48003ED690 /* AddonCallbacksAddon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonCallbacksAddon.cpp; sourceTree = "<group>"; };
  1045
+		DF7E663E13ED4C48003ED690 /* AddonCallbacksAddon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonCallbacksAddon.h; sourceTree = "<group>"; };
  1046
+		DF7E663F13ED4C48003ED690 /* AddonCallbacksGUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonCallbacksGUI.cpp; sourceTree = "<group>"; };
  1047
+		DF7E664013ED4C48003ED690 /* AddonCallbacksGUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonCallbacksGUI.h; sourceTree = "<group>"; };
  1048
+		DF7E664113ED4C48003ED690 /* AddonCallbacksPVR.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonCallbacksPVR.cpp; sourceTree = "<group>"; };
  1049
+		DF7E664213ED4C48003ED690 /* AddonCallbacksPVR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonCallbacksPVR.h; sourceTree = "<group>"; };
  1050
+		DF7E664713ED4C5A003ED690 /* GUIDialogExtendedProgressBar.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogExtendedProgressBar.cpp; sourceTree = "<group>"; };
  1051
+		DF7E664813ED4C5A003ED690 /* GUIDialogExtendedProgressBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogExtendedProgressBar.h; sourceTree = "<group>"; };
  1052
+		DF7E664A13ED4C96003ED690 /* TextSearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextSearch.cpp; sourceTree = "<group>"; };
  1053
+		DF7E664B13ED4C96003ED690 /* TextSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextSearch.h; sourceTree = "<group>"; };
  1054
+		DF7E665013ED4CB1003ED690 /* PVRClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRClient.cpp; sourceTree = "<group>"; };
  1055
+		DF7E665113ED4CB1003ED690 /* PVRClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRClient.h; sourceTree = "<group>"; };
  1056
+		DF7E665213ED4CB1003ED690 /* PVRClients.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRClients.cpp; sourceTree = "<group>"; };
  1057
+		DF7E665313ED4CB1003ED690 /* PVRClients.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRClients.h; sourceTree = "<group>"; };
  1058
+		DF7E665613ED4CB1003ED690 /* PVRChannel.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRChannel.cpp; sourceTree = "<group>"; };
  1059
+		DF7E665713ED4CB1003ED690 /* PVRChannel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRChannel.h; sourceTree = "<group>"; };
  1060
+		DF7E665813ED4CB1003ED690 /* PVRChannelGroup.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRChannelGroup.cpp; sourceTree = "<group>"; };
  1061
+		DF7E665913ED4CB1003ED690 /* PVRChannelGroup.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRChannelGroup.h; sourceTree = "<group>"; };
  1062
+		DF7E665A13ED4CB1003ED690 /* PVRChannelGroupInternal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRChannelGroupInternal.cpp; sourceTree = "<group>"; };
  1063
+		DF7E665B13ED4CB1003ED690 /* PVRChannelGroupInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRChannelGroupInternal.h; sourceTree = "<group>"; };
  1064
+		DF7E665C13ED4CB1003ED690 /* PVRChannelGroups.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRChannelGroups.cpp; sourceTree = "<group>"; };
  1065
+		DF7E665D13ED4CB1003ED690 /* PVRChannelGroups.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRChannelGroups.h; sourceTree = "<group>"; };
  1066
+		DF7E665E13ED4CB1003ED690 /* PVRChannelGroupsContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRChannelGroupsContainer.cpp; sourceTree = "<group>"; };
  1067
+		DF7E665F13ED4CB1003ED690 /* PVRChannelGroupsContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRChannelGroupsContainer.h; sourceTree = "<group>"; };
  1068
+		DF7E666113ED4CB1003ED690 /* GUIDialogPVRChannelManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRChannelManager.cpp; sourceTree = "<group>"; };
  1069
+		DF7E666213ED4CB1003ED690 /* GUIDialogPVRChannelManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRChannelManager.h; sourceTree = "<group>"; };
  1070
+		DF7E666313ED4CB1003ED690 /* GUIDialogPVRChannelsOSD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRChannelsOSD.cpp; sourceTree = "<group>"; };
  1071
+		DF7E666413ED4CB1003ED690 /* GUIDialogPVRChannelsOSD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRChannelsOSD.h; sourceTree = "<group>"; };
  1072
+		DF7E666513ED4CB1003ED690 /* GUIDialogPVRCutterOSD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRCutterOSD.cpp; sourceTree = "<group>"; };
  1073
+		DF7E666613ED4CB1003ED690 /* GUIDialogPVRCutterOSD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRCutterOSD.h; sourceTree = "<group>"; };
  1074
+		DF7E666713ED4CB1003ED690 /* GUIDialogPVRDirectorOSD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRDirectorOSD.cpp; sourceTree = "<group>"; };
  1075
+		DF7E666813ED4CB1003ED690 /* GUIDialogPVRDirectorOSD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRDirectorOSD.h; sourceTree = "<group>"; };
  1076
+		DF7E666913ED4CB1003ED690 /* GUIDialogPVRGroupManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRGroupManager.cpp; sourceTree = "<group>"; };
  1077
+		DF7E666A13ED4CB1003ED690 /* GUIDialogPVRGroupManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRGroupManager.h; sourceTree = "<group>"; };
  1078
+		DF7E666B13ED4CB1003ED690 /* GUIDialogPVRGuideInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRGuideInfo.cpp; sourceTree = "<group>"; };
  1079
+		DF7E666C13ED4CB1003ED690 /* GUIDialogPVRGuideInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRGuideInfo.h; sourceTree = "<group>"; };
  1080
+		DF7E666D13ED4CB1003ED690 /* GUIDialogPVRGuideOSD.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRGuideOSD.cpp; sourceTree = "<group>"; };
  1081
+		DF7E666E13ED4CB1003ED690 /* GUIDialogPVRGuideOSD.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRGuideOSD.h; sourceTree = "<group>"; };
  1082
+		DF7E666F13ED4CB1003ED690 /* GUIDialogPVRGuideSearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRGuideSearch.cpp; sourceTree = "<group>"; };
  1083
+		DF7E667013ED4CB1003ED690 /* GUIDialogPVRGuideSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRGuideSearch.h; sourceTree = "<group>"; };
  1084
+		DF7E667113ED4CB1003ED690 /* GUIDialogPVRRecordingInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRRecordingInfo.cpp; sourceTree = "<group>"; };
  1085
+		DF7E667213ED4CB1003ED690 /* GUIDialogPVRRecordingInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRRecordingInfo.h; sourceTree = "<group>"; };
  1086
+		DF7E667313ED4CB1003ED690 /* GUIDialogPVRTimerSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPVRTimerSettings.cpp; sourceTree = "<group>"; };
  1087
+		DF7E667413ED4CB1003ED690 /* GUIDialogPVRTimerSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPVRTimerSettings.h; sourceTree = "<group>"; };
  1088
+		DF7E667813ED4CB1003ED690 /* PVREpg.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVREpg.cpp; sourceTree = "<group>"; };
  1089
+		DF7E667913ED4CB1003ED690 /* PVREpg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVREpg.h; sourceTree = "<group>"; };
  1090
+		DF7E667A13ED4CB1003ED690 /* PVREpgContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVREpgContainer.cpp; sourceTree = "<group>"; };
  1091
+		DF7E667B13ED4CB1003ED690 /* PVREpgContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVREpgContainer.h; sourceTree = "<group>"; };
  1092
+		DF7E667C13ED4CB1003ED690 /* PVREpgInfoTag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVREpgInfoTag.cpp; sourceTree = "<group>"; };
  1093
+		DF7E667D13ED4CB1003ED690 /* PVREpgInfoTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVREpgInfoTag.h; sourceTree = "<group>"; };
  1094
+		DF7E667E13ED4CB1003ED690 /* PVREpgSearchFilter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVREpgSearchFilter.cpp; sourceTree = "<group>"; };
  1095
+		DF7E667F13ED4CB1003ED690 /* PVREpgSearchFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVREpgSearchFilter.h; sourceTree = "<group>"; };
  1096
+		DF7E668113ED4CB1003ED690 /* PVRDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRDatabase.cpp; sourceTree = "<group>"; };
  1097
+		DF7E668213ED4CB1003ED690 /* PVRDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRDatabase.h; sourceTree = "<group>"; };
  1098
+		DF7E668313ED4CB1003ED690 /* PVRGUIInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRGUIInfo.cpp; sourceTree = "<group>"; };
  1099
+		DF7E668413ED4CB1003ED690 /* PVRGUIInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRGUIInfo.h; sourceTree = "<group>"; };
  1100
+		DF7E668513ED4CB1003ED690 /* PVRManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRManager.cpp; sourceTree = "<group>"; };
  1101
+		DF7E668613ED4CB1003ED690 /* PVRManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRManager.h; sourceTree = "<group>"; };
  1102
+		DF7E668913ED4CB1003ED690 /* PVRRecording.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRRecording.cpp; sourceTree = "<group>"; };
  1103
+		DF7E668A13ED4CB1003ED690 /* PVRRecording.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRRecording.h; sourceTree = "<group>"; };
  1104
+		DF7E668B13ED4CB1003ED690 /* PVRRecordings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRRecordings.cpp; sourceTree = "<group>"; };
  1105
+		DF7E668C13ED4CB1003ED690 /* PVRRecordings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRRecordings.h; sourceTree = "<group>"; };
  1106
+		DF7E668F13ED4CB1003ED690 /* PVRTimerInfoTag.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRTimerInfoTag.cpp; sourceTree = "<group>"; };
  1107
+		DF7E669013ED4CB1003ED690 /* PVRTimerInfoTag.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRTimerInfoTag.h; sourceTree = "<group>"; };
  1108
+		DF7E669113ED4CB1003ED690 /* PVRTimers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRTimers.cpp; sourceTree = "<group>"; };
  1109
+		DF7E669213ED4CB1003ED690 /* PVRTimers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRTimers.h; sourceTree = "<group>"; };
  1110
+		DF7E669413ED4CB1003ED690 /* GUIViewStatePVR.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIViewStatePVR.cpp; sourceTree = "<group>"; };
  1111
+		DF7E669513ED4CB1003ED690 /* GUIViewStatePVR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIViewStatePVR.h; sourceTree = "<group>"; };
  1112
+		DF7E669613ED4CB1003ED690 /* GUIWindowPVR.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVR.cpp; sourceTree = "<group>"; };
  1113
+		DF7E669713ED4CB1003ED690 /* GUIWindowPVR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVR.h; sourceTree = "<group>"; };
  1114
+		DF7E669813ED4CB1003ED690 /* GUIWindowPVRChannels.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVRChannels.cpp; sourceTree = "<group>"; };
  1115
+		DF7E669913ED4CB1003ED690 /* GUIWindowPVRChannels.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVRChannels.h; sourceTree = "<group>"; };
  1116
+		DF7E669A13ED4CB1003ED690 /* GUIWindowPVRCommon.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVRCommon.cpp; sourceTree = "<group>"; };
  1117
+		DF7E669B13ED4CB1003ED690 /* GUIWindowPVRCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVRCommon.h; sourceTree = "<group>"; };
  1118
+		DF7E669C13ED4CB1003ED690 /* GUIWindowPVRGuide.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVRGuide.cpp; sourceTree = "<group>"; };
  1119
+		DF7E669D13ED4CB1003ED690 /* GUIWindowPVRGuide.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVRGuide.h; sourceTree = "<group>"; };
  1120
+		DF7E669E13ED4CB1003ED690 /* GUIWindowPVRRecordings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVRRecordings.cpp; sourceTree = "<group>"; };
  1121
+		DF7E669F13ED4CB1003ED690 /* GUIWindowPVRRecordings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVRRecordings.h; sourceTree = "<group>"; };
  1122
+		DF7E66A013ED4CB1003ED690 /* GUIWindowPVRSearch.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVRSearch.cpp; sourceTree = "<group>"; };
  1123
+		DF7E66A113ED4CB1003ED690 /* GUIWindowPVRSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVRSearch.h; sourceTree = "<group>"; };
  1124
+		DF7E66A213ED4CB1003ED690 /* GUIWindowPVRTimers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowPVRTimers.cpp; sourceTree = "<group>"; };
  1125
+		DF7E66A313ED4CB1003ED690 /* GUIWindowPVRTimers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowPVRTimers.h; sourceTree = "<group>"; };
  1126
+		DF7E67FC13ED4E25003ED690 /* DVDInputStreamPVRManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDInputStreamPVRManager.cpp; sourceTree = "<group>"; };
  1127
+		DF7E67FD13ED4E25003ED690 /* DVDInputStreamPVRManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDInputStreamPVRManager.h; sourceTree = "<group>"; };
  1128
+		DF7E67FE13ED4E25003ED690 /* DVDInputStreamStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDInputStreamStack.cpp; sourceTree = "<group>"; };
  1129
+		DF7E67FF13ED4E25003ED690 /* DVDInputStreamStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDInputStreamStack.h; sourceTree = "<group>"; };
  1130
+		DF7E680213ED4E42003ED690 /* DVDDemuxPVRClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDDemuxPVRClient.cpp; sourceTree = "<group>"; };
  1131
+		DF7E680313ED4E42003ED690 /* DVDDemuxPVRClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDDemuxPVRClient.h; sourceTree = "<group>"; };
  1132
+		DF7E680713ED4F15003ED690 /* libTcpSocket.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTcpSocket.a; path = lib/libTcpSocket/libTcpSocket.a; sourceTree = "<group>"; };
  1133
+		DF7E683713ED52B7003ED690 /* PVRDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRDirectory.cpp; sourceTree = "<group>"; };
  1134
+		DF7E683813ED52B7003ED690 /* PVRDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRDirectory.h; sourceTree = "<group>"; };
  1135
+		DF7E683913ED52B7003ED690 /* PVRFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRFile.cpp; sourceTree = "<group>"; };
  1136
+		DF7E683A13ED52B7003ED690 /* PVRFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRFile.h; sourceTree = "<group>"; };
  1137
+		DF88787713E890FA00B4ECE2 /* platform.select.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = platform.select.h; sourceTree = "<group>"; };
  1138
+		DF88787813E8912900B4ECE2 /* TimeSmoother.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeSmoother.h; sourceTree = "<group>"; };
  1139
+		DF88787913E8912900B4ECE2 /* TimeSmoother.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TimeSmoother.cpp; sourceTree = "<group>"; };
1138 1140
 		DFD4D20D13D7286E00A47C47 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
1139 1141
 		DFD4D20E13D7286E00A47C47 /* CriticalSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CriticalSection.h; sourceTree = "<group>"; };
1140  
-		DFD4D21013D7286E00A47C47 /* platform.select.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = platform.select.h; sourceTree = "<group>"; };
1141 1142
 		DFD4D21213D7286E00A47C47 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
1142 1143
 		DFD4D21313D7286E00A47C47 /* CriticalSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CriticalSection.h; sourceTree = "<group>"; };
1143 1144
 		DFD4D21413D7286E00A47C47 /* Implementation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Implementation.cpp; sourceTree = "<group>"; };
@@ -1981,7 +1982,6 @@
1981 1982
 		F56C74AB131EC152000AD0F6 /* GUIBaseContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIBaseContainer.h; sourceTree = "<group>"; };
1982 1983
 		F56C74AC131EC152000AD0F6 /* GUIBorderedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIBorderedImage.h; sourceTree = "<group>"; };
1983 1984
 		F56C74AD131EC152000AD0F6 /* GUIButtonControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIButtonControl.h; sourceTree = "<group>"; };
1984  
-		F56C74AE131EC152000AD0F6 /* GUIButtonScroller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIButtonScroller.h; sourceTree = "<group>"; };
1985 1985
 		F56C74AF131EC152000AD0F6 /* GUICallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUICallback.h; sourceTree = "<group>"; };
1986 1986
 		F56C74B0131EC152000AD0F6 /* GUICheckMarkControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUICheckMarkControl.h; sourceTree = "<group>"; };
1987 1987
 		F56C74B1131EC152000AD0F6 /* GUIColorManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIColorManager.h; sourceTree = "<group>"; };
@@ -2072,7 +2072,6 @@
2072 2072
 		F56C7506131EC152000AD0F6 /* GUIBaseContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIBaseContainer.cpp; sourceTree = "<group>"; };
2073 2073
 		F56C7507131EC152000AD0F6 /* GUIBorderedImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIBorderedImage.cpp; sourceTree = "<group>"; };
2074 2074
 		F56C7508131EC152000AD0F6 /* GUIButtonControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIButtonControl.cpp; sourceTree = "<group>"; };
2075  
-		F56C7509131EC152000AD0F6 /* GUIButtonScroller.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIButtonScroller.cpp; sourceTree = "<group>"; };
2076 2075
 		F56C750A131EC152000AD0F6 /* GUICheckMarkControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUICheckMarkControl.cpp; sourceTree = "<group>"; };
2077 2076
 		F56C750B131EC152000AD0F6 /* GUIColorManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIColorManager.cpp; sourceTree = "<group>"; };
2078 2077
 		F56C750C131EC152000AD0F6 /* GUIControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIControl.cpp; sourceTree = "<group>"; };
@@ -3045,6 +3044,8 @@
3045 3044
 		F5B13E0013344F310045076D /* DarwinUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DarwinUtils.mm; sourceTree = "<group>"; };
3046 3045
 		F5CEE72B13D3F9AC00225F72 /* DVDOverlayCodecTX3G.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDOverlayCodecTX3G.cpp; sourceTree = "<group>"; };
3047 3046
 		F5CEE72D13D3F9B300225F72 /* DVDOverlayCodecTX3G.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDOverlayCodecTX3G.h; sourceTree = "<group>"; };
  3047
+		F5E6209D13E9081400D5F2CD /* InfoBool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = InfoBool.cpp; path = info/InfoBool.cpp; sourceTree = "<group>"; };
  3048
+		F5E6209E13E9081400D5F2CD /* InfoBool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = InfoBool.h; path = info/InfoBool.h; sourceTree = "<group>"; };
3048 3049
 /* End PBXFileReference section */
3049 3050
 
3050 3051
 /* Begin PBXFrameworksBuildPhase section */
@@ -3076,7 +3077,7 @@
3076 3077
 				F56B161B12CD69DB009B4C96 /* ImageIO.framework in Frameworks */,
3077 3078
 				4D5D2E131301753F006ABC13 /* CFNetwork.framework in Frameworks */,
3078 3079
 				18404DFD1396C44F00863BBA /* SlingboxLib.a in Frameworks */,
3079  
-				DF79154A13D4A6280018E92E /* libTcpSocket.a in Frameworks */,
  3080
+				DF7E680813ED4F15003ED690 /* libTcpSocket.a in Frameworks */,
3080 3081
 			);
3081 3082
 			runOnlyForDeploymentPostprocessing = 0;
3082 3083
 		};
@@ -3111,164 +3112,166 @@
3111 3112
 			name = Documentation;
3112 3113
 			sourceTree = "<group>";
3113 3114
 		};
3114  
-		DF7914AA13D4A5B80018E92E /* epg */ = {
  3115
+		DF7E662613ED4BF8003ED690 /* epg */ = {
3115 3116
 			isa = PBXGroup;
3116 3117
 			children = (
3117  
-				DF7914AB13D4A5B90018E92E /* Epg.cpp */,
3118  
-				DF7914AC13D4A5B90018E92E /* Epg.h */,
3119  
-				DF7914AD13D4A5B90018E92E /* EpgContainer.cpp */,
3120  
-				DF7914AE13D4A5B90018E92E /* EpgContainer.h */,
3121  
-				DF7914AF13D4A5B90018E92E /* EpgDatabase.cpp */,
3122  
-				DF7914B013D4A5B90018E92E /* EpgDatabase.h */,
3123  
-				DF7914B113D4A5B90018E92E /* EpgInfoTag.cpp */,
3124  
-				DF7914B213D4A5B90018E92E /* EpgInfoTag.h */,
3125  
-				DF7914B313D4A5B90018E92E /* EpgSearchFilter.cpp */,
3126  
-				DF7914B413D4A5B90018E92E /* EpgSearchFilter.h */,
3127  
-				DF7914B513D4A5B90018E92E /* GUIEPGGridContainer.cpp */,
3128  
-				DF7914B613D4A5B90018E92E /* GUIEPGGridContainer.h */,
  3118
+				DF7E662713ED4BF8003ED690 /* Epg.cpp */,
  3119
+				DF7E662813ED4BF8003ED690 /* Epg.h */,
  3120
+				DF7E662913ED4BF8003ED690 /* EpgContainer.cpp */,
  3121
+				DF7E662A13ED4BF8003ED690 /* EpgContainer.h */,
  3122
+				DF7E662B13ED4BF8003ED690 /* EpgDatabase.cpp */,
  3123
+				DF7E662C13ED4BF8003ED690 /* EpgDatabase.h */,
  3124
+				DF7E662D13ED4BF8003ED690 /* EpgInfoTag.cpp */,
  3125
+				DF7E662E13ED4BF8003ED690 /* EpgInfoTag.h */,
  3126
+				DF7E662F13ED4BF8003ED690 /* EpgSearchFilter.cpp */,
  3127
+				DF7E663013ED4BF8003ED690 /* EpgSearchFilter.h */,
  3128
+				DF7E663113ED4BF8003ED690 /* GUIEPGGridContainer.cpp */,
  3129
+				DF7E663213ED4BF8003ED690 /* GUIEPGGridContainer.h */,
3129 3130
 			);
3130 3131
 			path = epg;
3131 3132
 			sourceTree = "<group>";
3132 3133
 		};
3133  
-		DF7914B813D4A5B90018E92E /* pvr */ = {
  3134
+		DF7E664D13ED4CB1003ED690 /* pvr */ = {
3134 3135
 			isa = PBXGroup;
3135 3136
 			children = (
3136  
-				DF7914B913D4A5B90018E92E /* addons */,
3137  
-				DF7914BF13D4A5B90018E92E /* channels */,
3138  
-				DF7914CB13D4A5B90018E92E /* dialogs */,
3139  
-				DF7914E113D4A5B90018E92E /* epg */,
3140  
-				DF7914EC13D4A5B90018E92E /* PVRDatabase.cpp */,
3141  
-				DF7914ED13D4A5B90018E92E /* PVRDatabase.h */,
3142  
-				DF7914EE13D4A5B90018E92E /* PVRGUIInfo.cpp */,
3143  
-				DF7914EF13D4A5B90018E92E /* PVRGUIInfo.h */,
3144  
-				DF7914F013D4A5B90018E92E /* PVRManager.cpp */,
3145  
-				DF7914F113D4A5B90018E92E /* PVRManager.h */,
3146  
-				DF7914F213D4A5B90018E92E /* recordings */,
3147  
-				DF7914F813D4A5B90018E92E /* timers */,
3148  
-				DF7914FE13D4A5B90018E92E /* windows */,
  3137
+				DF7E664E13ED4CB1003ED690 /* addons */,
  3138
+				DF7E665413ED4CB1003ED690 /* channels */,
  3139
+				DF7E666013ED4CB1003ED690 /* dialogs */,
  3140
+				DF7E667613ED4CB1003ED690 /* epg */,
  3141
+				DF7E668113ED4CB1003ED690 /* PVRDatabase.cpp */,
  3142
+				DF7E668213ED4CB1003ED690 /* PVRDatabase.h */,
  3143
+				DF7E668313ED4CB1003ED690 /* PVRGUIInfo.cpp */,
  3144
+				DF7E668413ED4CB1003ED690 /* PVRGUIInfo.h */,
  3145
+				DF7E668513ED4CB1003ED690 /* PVRManager.cpp */,
  3146
+				DF7E668613ED4CB1003ED690 /* PVRManager.h */,
  3147
+				DF7E668713ED4CB1003ED690 /* recordings */,
  3148
+				DF7E668D13ED4CB1003ED690 /* timers */,
  3149
+				DF7E669313ED4CB1003ED690 /* windows */,
3149 3150
 			);
3150 3151
 			path = pvr;
3151 3152
 			sourceTree = "<group>";
3152 3153
 		};
3153  
-		DF7914B913D4A5B90018E92E /* addons */ = {
  3154
+		DF7E664E13ED4CB1003ED690 /* addons */ = {
3154 3155
 			isa = PBXGroup;
3155 3156
 			children = (
3156  
-				DF7914BB13D4A5B90018E92E /* PVRClient.cpp */,
3157  
-				DF7914BC13D4A5B90018E92E /* PVRClient.h */,
3158  
-				DF7914BD13D4A5B90018E92E /* PVRClients.cpp */,
3159  
-				DF7914BE13D4A5B90018E92E /* PVRClients.h */,
  3157
+				DF7E665013ED4CB1003ED690 /* PVRClient.cpp */,
  3158
+				DF7E665113ED4CB1003ED690 /* PVRClient.h */,
  3159
+				DF7E665213ED4CB1003ED690 /* PVRClients.cpp */,
  3160
+				DF7E665313ED4CB1003ED690 /* PVRClients.h */,
3160 3161
 			);
3161 3162
 			path = addons;
3162 3163
 			sourceTree = "<group>";
3163 3164
 		};
3164  
-		DF7914BF13D4A5B90018E92E /* channels */ = {
  3165
+		DF7E665413ED4CB1003ED690 /* channels */ = {
3165 3166
 			isa = PBXGroup;
3166 3167
 			children = (
3167  
-				DF7914C113D4A5B90018E92E /* PVRChannel.cpp */,
3168  
-				DF7914C213D4A5B90018E92E /* PVRChannel.h */,
3169  
-				DF7914C313D4A5B90018E92E /* PVRChannelGroup.cpp */,
3170  
-				DF7914C413D4A5B90018E92E /* PVRChannelGroup.h */,
3171  
-				DF7914C513D4A5B90018E92E /* PVRChannelGroupInternal.cpp */,
3172  
-				DF7914C613D4A5B90018E92E /* PVRChannelGroupInternal.h */,
3173  
-				DF7914C713D4A5B90018E92E /* PVRChannelGroups.cpp */,
3174  
-				DF7914C813D4A5B90018E92E /* PVRChannelGroups.h */,
3175  
-				DF7914C913D4A5B90018E92E /* PVRChannelGroupsContainer.cpp */,
3176  
-				DF7914CA13D4A5B90018E92E /* PVRChannelGroupsContainer.h */,
  3168
+				DF7E665613ED4CB1003ED690 /* PVRChannel.cpp */,
  3169
+				DF7E665713ED4CB1003ED690 /* PVRChannel.h */,
  3170
+				DF7E665813ED4CB1003ED690 /* PVRChannelGroup.cpp */,
  3171
+				DF7E665913ED4CB1003ED690 /* PVRChannelGroup.h */,
  3172
+				DF7E665A13ED4CB1003ED690 /* PVRChannelGroupInternal.cpp */,
  3173
+				DF7E665B13ED4CB1003ED690 /* PVRChannelGroupInternal.h */,
  3174
+				DF7E665C13ED4CB1003ED690 /* PVRChannelGroups.cpp */,
  3175
+				DF7E665D13ED4CB1003ED690 /* PVRChannelGroups.h */,
  3176
+				DF7E665E13ED4CB1003ED690 /* PVRChannelGroupsContainer.cpp */,
  3177
+				DF7E665F13ED4CB1003ED690 /* PVRChannelGroupsContainer.h */,
3177 3178
 			);
3178 3179
 			path = channels;
3179 3180
 			sourceTree = "<group>";
3180 3181
 		};
3181  
-		DF7914CB13D4A5B90018E92E /* dialogs */ = {
  3182
+		DF7E666013ED4CB1003ED690 /* dialogs */ = {
3182 3183
 			isa = PBXGroup;
3183 3184
 			children = (
3184  
-				DF7914CC13D4A5B90018E92E /* GUIDialogPVRChannelManager.cpp */,
3185  
-				DF7914CD13D4A5B90018E92E /* GUIDialogPVRChannelManager.h */,
3186  
-				DF7914CE13D4A5B90018E92E /* GUIDialogPVRChannelsOSD.cpp */,
3187  
-				DF7914CF13D4A5B90018E92E /* GUIDialogPVRChannelsOSD.h */,
3188  
-				DF7914D013D4A5B90018E92E /* GUIDialogPVRCutterOSD.cpp */,
3189  
-				DF7914D113D4A5B90018E92E /* GUIDialogPVRCutterOSD.h */,
3190  
-				DF7914D213D4A5B90018E92E /* GUIDialogPVRDirectorOSD.cpp */,
3191  
-				DF7914D313D4A5B90018E92E /* GUIDialogPVRDirectorOSD.h */,
3192  
-				DF7914D413D4A5B90018E92E /* GUIDialogPVRGroupManager.cpp */,
3193  
-				DF7914D513D4A5B90018E92E /* GUIDialogPVRGroupManager.h */,
3194  
-				DF7914D613D4A5B90018E92E /* GUIDialogPVRGuideInfo.cpp */,
3195  
-				DF7914D713D4A5B90018E92E /* GUIDialogPVRGuideInfo.h */,
3196  
-				DF7914D813D4A5B90018E92E /* GUIDialogPVRGuideOSD.cpp */,
3197  
-				DF7914D913D4A5B90018E92E /* GUIDialogPVRGuideOSD.h */,
3198  
-				DF7914DA13D4A5B90018E92E /* GUIDialogPVRGuideSearch.cpp */,
3199  
-				DF7914DB13D4A5B90018E92E /* GUIDialogPVRGuideSearch.h */,
3200  
-				DF7914DC13D4A5B90018E92E /* GUIDialogPVRRecordingInfo.cpp */,
3201  
-				DF7914DD13D4A5B90018E92E /* GUIDialogPVRRecordingInfo.h */,
3202  
-				DF7914DE13D4A5B90018E92E /* GUIDialogPVRTimerSettings.cpp */,
3203  
-				DF7914DF13D4A5B90018E92E /* GUIDialogPVRTimerSettings.h */,
  3185
+				DF7E666113ED4CB1003ED690 /* GUIDialogPVRChannelManager.cpp */,
  3186
+				DF7E666213ED4CB1003ED690 /* GUIDialogPVRChannelManager.h */,
  3187
+				DF7E666313ED4CB1003ED690 /* GUIDialogPVRChannelsOSD.cpp */,
  3188
+				DF7E666413ED4CB1003ED690 /* GUIDialogPVRChannelsOSD.h */,
  3189
+				DF7E666513ED4CB1003ED690 /* GUIDialogPVRCutterOSD.cpp */,
  3190
+				DF7E666613ED4CB1003ED690 /* GUIDialogPVRCutterOSD.h */,
  3191
+				DF7E666713ED4CB1003ED690 /* GUIDialogPVRDirectorOSD.cpp */,
  3192
+				DF7E666813ED4CB1003ED690 /* GUIDialogPVRDirectorOSD.h */,
  3193
+				DF7E666913ED4CB1003ED690 /* GUIDialogPVRGroupManager.cpp */,
  3194
+				DF7E666A13ED4CB1003ED690 /* GUIDialogPVRGroupManager.h */,
  3195
+				DF7E666B13ED4CB1003ED690 /* GUIDialogPVRGuideInfo.cpp */,
  3196
+				DF7E666C13ED4CB1003ED690 /* GUIDialogPVRGuideInfo.h */,
  3197
+				DF7E666D13ED4CB1003ED690 /* GUIDialogPVRGuideOSD.cpp */,
  3198
+				DF7E666E13ED4CB1003ED690 /* GUIDialogPVRGuideOSD.h */,
  3199
+				DF7E666F13ED4CB1003ED690 /* GUIDialogPVRGuideSearch.cpp */,
  3200
+				DF7E667013ED4CB1003ED690 /* GUIDialogPVRGuideSearch.h */,
  3201
+				DF7E667113ED4CB1003ED690 /* GUIDialogPVRRecordingInfo.cpp */,
  3202
+				DF7E667213ED4CB1003ED690 /* GUIDialogPVRRecordingInfo.h */,
  3203
+				DF7E667313ED4CB1003ED690 /* GUIDialogPVRTimerSettings.cpp */,
  3204
+				DF7E667413ED4CB1003ED690 /* GUIDialogPVRTimerSettings.h */,
3204 3205
 			);
3205 3206
 			path = dialogs;
3206 3207
 			sourceTree = "<group>";
3207 3208
 		};
3208  
-		DF7914E113D4A5B90018E92E /* epg */ = {
  3209
+		DF7E667613ED4CB1003ED690 /* epg */ = {
3209 3210
 			isa = PBXGroup;
3210 3211
 			children = (
3211  
-				DF7914E313D4A5B90018E92E /* PVREpg.cpp */,
3212  
-				DF7914E413D4A5B90018E92E /* PVREpg.h */,
3213  
-				DF7914E513D4A5B90018E92E /* PVREpgContainer.cpp */,
3214  
-				DF7914E613D4A5B90018E92E /* PVREpgContainer.h */,
3215  
-				DF7914E713D4A5B90018E92E /* PVREpgInfoTag.cpp */,
3216  
-				DF7914E813D4A5B90018E92E /* PVREpgInfoTag.h */,
3217  
-				DF7914E913D4A5B90018E92E /* PVREpgSearchFilter.cpp */,
3218  
-				DF7914EA13D4A5B90018E92E /* PVREpgSearchFilter.h */,
  3212
+				DF7E667813ED4CB1003ED690 /* PVREpg.cpp */,
  3213
+				DF7E667913ED4CB1003ED690 /* PVREpg.h */,
  3214
+				DF7E667A13ED4CB1003ED690 /* PVREpgContainer.cpp */,
  3215
+				DF7E667B13ED4CB1003ED690 /* PVREpgContainer.h */,
  3216
+				DF7E667C13ED4CB1003ED690 /* PVREpgInfoTag.cpp */,
  3217
+				DF7E667D13ED4CB1003ED690 /* PVREpgInfoTag.h */,
  3218
+				DF7E667E13ED4CB1003ED690 /* PVREpgSearchFilter.cpp */,
  3219
+				DF7E667F13ED4CB1003ED690 /* PVREpgSearchFilter.h */,
3219 3220
 			);
3220 3221
 			path = epg;
3221 3222
 			sourceTree = "<group>";
3222 3223
 		};
3223  
-		DF7914F213D4A5B90018E92E /* recordings */ = {
  3224
+		DF7E668713ED4CB1003ED690 /* recordings */ = {
3224 3225
 			isa = PBXGroup;
3225 3226
 			children = (
3226  
-				DF7914F413D4A5B90018E92E /* PVRRecording.cpp */,
3227  
-				DF7914F513D4A5B90018E92E /* PVRRecording.h */,
3228  
-				DF7914F613D4A5B90018E92E /* PVRRecordings.cpp */,
3229  
-				DF7914F713D4A5B90018E92E /* PVRRecordings.h */,
  3227
+				DF7E668913ED4CB1003ED690 /* PVRRecording.cpp */,
  3228
+				DF7E668A13ED4CB1003ED690 /* PVRRecording.h */,
  3229
+				DF7E668B13ED4CB1003ED690 /* PVRRecordings.cpp */,
  3230
+				DF7E668C13ED4CB1003ED690 /* PVRRecordings.h */,
3230 3231
 			);
3231 3232
 			path = recordings;
3232 3233
 			sourceTree = "<group>";
3233 3234
 		};
3234  
-		DF7914F813D4A5B90018E92E /* timers */ = {
  3235
+		DF7E668D13ED4CB1003ED690 /* timers */ = {
3235 3236
 			isa = PBXGroup;
3236 3237
 			children = (
3237  
-				DF7914FA13D4A5B90018E92E /* PVRTimerInfoTag.cpp */,
3238  
-				DF7914FB13D4A5B90018E92E /* PVRTimerInfoTag.h */,
3239  
-				DF7914FC13D4A5B90018E92E /* PVRTimers.cpp */,
3240  
-				DF7914FD13D4A5B90018E92E /* PVRTimers.h */,
  3238
+				DF7E668F13ED4CB1003ED690 /* PVRTimerInfoTag.cpp */,
  3239
+				DF7E669013ED4CB1003ED690 /* PVRTimerInfoTag.h */,
  3240
+				DF7E669113ED4CB1003ED690 /* PVRTimers.cpp */,
  3241
+				DF7E669213ED4CB1003ED690 /* PVRTimers.h */,
3241 3242
 			);
3242 3243
 			path = timers;
3243 3244
 			sourceTree = "<group>";
3244 3245
 		};
3245  
-		DF7914FE13D4A5B90018E92E /* windows */ = {
  3246
+		DF7E669313ED4CB1003ED690 /* windows */ = {
3246 3247
 			isa = PBXGroup;
3247 3248
 			children = (
3248  
-				DF7914FF13D4A5B90018E92E /* GUIViewStatePVR.cpp */,
3249  
-				DF79150013D4A5B90018E92E /* GUIViewStatePVR.h */,
3250  
-				DF79150113D4A5B90018E92E /* GUIWindowPVR.cpp */,
3251  
-				DF79150213D4A5B90018E92E /* GUIWindowPVR.h */,
3252  
-				DF79150313D4A5B90018E92E /* GUIWindowPVRChannels.cpp */,
3253  
-				DF79150413D4A5B90018E92E /* GUIWindowPVRChannels.h */,
3254  
-				DF79150513D4A5B90018E92E /* GUIWindowPVRCommon.cpp */,
3255  
-				DF79150613D4A5B90018E92E /* GUIWindowPVRCommon.h */,
3256  
-				DF79150713D4A5B90018E92E /* GUIWindowPVRGuide.cpp */,
3257  
-				DF79150813D4A5B90018E92E /* GUIWindowPVRGuide.h */,
3258  
-				DF79150913D4A5B90018E92E /* GUIWindowPVRRecordings.cpp */,
3259  
-				DF79150A13D4A5B90018E92E /* GUIWindowPVRRecordings.h */,
3260  
-				DF79150B13D4A5B90018E92E /* GUIWindowPVRSearch.cpp */,
3261  
-				DF79150C13D4A5B90018E92E /* GUIWindowPVRSearch.h */,
3262  
-				DF79150D13D4A5B90018E92E /* GUIWindowPVRTimers.cpp */,
3263  
-				DF79150E13D4A5B90018E92E /* GUIWindowPVRTimers.h */,
  3249
+				DF7E669413ED4CB1003ED690 /* GUIViewStatePVR.cpp */,
  3250
+				DF7E669513ED4CB1003ED690 /* GUIViewStatePVR.h */,
  3251
+				DF7E669613ED4CB1003ED690 /* GUIWindowPVR.cpp */,
  3252
+				DF7E669713ED4CB1003ED690 /* GUIWindowPVR.h */,
  3253
+				DF7E669813ED4CB1003ED690 /* GUIWindowPVRChannels.cpp */,
  3254
+				DF7E669913ED4CB1003ED690 /* GUIWindowPVRChannels.h */,
  3255
+				DF7E669A13ED4CB1003ED690 /* GUIWindowPVRCommon.cpp */,
  3256
+				DF7E669B13ED4CB1003ED690 /* GUIWindowPVRCommon.h */,
  3257
+				DF7E669C13ED4CB1003ED690 /* GUIWindowPVRGuide.cpp */,
  3258
+				DF7E669D13ED4CB1003ED690 /* GUIWindowPVRGuide.h */,
  3259
+				DF7E669E13ED4CB1003ED690 /* GUIWindowPVRRecordings.cpp */,
  3260
+				DF7E669F13ED4CB1003ED690 /* GUIWindowPVRRecordings.h */,
  3261
+				DF7E66A013ED4CB1003ED690 /* GUIWindowPVRSearch.cpp */,
  3262
+				DF7E66A113ED4CB1003ED690 /* GUIWindowPVRSearch.h */,
  3263
+				DF7E66A213ED4CB1003ED690 /* GUIWindowPVRTimers.cpp */,
  3264
+				DF7E66A313ED4CB1003ED690 /* GUIWindowPVRTimers.h */,
3264 3265
 			);
3265 3266
 			path = windows;
  3267
+			sourceTree = "<group>";
  3268
+		};
3266 3269
 		DFD4D20C13D7286E00A47C47 /* platform */ = {
3267 3270
 			isa = PBXGroup;
3268 3271
 			children = (
  3272
+				DF88787713E890FA00B4ECE2 /* platform.select.h */,
3269 3273
 				DFD4D20D13D7286E00A47C47 /* Condition.h */,
3270 3274
 				DFD4D20E13D7286E00A47C47 /* CriticalSection.h */,
3271  
-				DFD4D21013D7286E00A47C47 /* platform.select.h */,
3272 3275
 				DFD4D21113D7286E00A47C47 /* pthreads */,
3273 3276
 				DFD4D21613D7286E00A47C47 /* README.platform */,
3274 3277
 				DFD4D21713D7286E00A47C47 /* ThreadLocal.h */,
@@ -3542,13 +3545,12 @@
3542 3545
 		F56C71D7131EC151000AD0F6 /* xbmc */ = {
3543 3546
 			isa = PBXGroup;
3544 3547
 			children = (
3545  
-				DF7914AA13D4A5B80018E92E /* epg */,
3546  
-				DF7914B813D4A5B90018E92E /* pvr */,
3547 3548
 				F56C71D8131EC151000AD0F6 /* addons */,
3548 3549
 				F56C71FE131EC151000AD0F6 /* cdrip */,
3549 3550
 				F56C721B131EC151000AD0F6 /* cores */,
3550 3551
 				F56C7357131EC151000AD0F6 /* dbwrappers */,
3551 3552
 				F56C7362131EC151000AD0F6 /* dialogs */,
  3553
+				DF7E662613ED4BF8003ED690 /* epg */,
3552 3554
 				F56C7395131EC151000AD0F6 /* filesystem */,
3553 3555
 				F56C749F131EC152000AD0F6 /* guilib */,
3554 3556
 				F56C7553131EC152000AD0F6 /* input */,
@@ -3561,6 +3563,7 @@
3561 3563
 				F56C7698131EC153000AD0F6 /* playlists */,
3562 3564
 				F56C76AB131EC153000AD0F6 /* powermanagement */,
3563 3565
 				F56C76B4131EC153000AD0F6 /* programs */,
  3566
+				DF7E664D13ED4CB1003ED690 /* pvr */,
3564 3567
 				F56C76BD131EC153000AD0F6 /* rendering */,
3565 3568
 				F56C76C5131EC153000AD0F6 /* screensavers */,
3566 3569
 				F56C76C6131EC153000AD0F6 /* settings */,
@@ -3648,14 +3651,14 @@
3648 3651
 		F56C71D8131EC151000AD0F6 /* addons */ = {
3649 3652
 			isa = PBXGroup;
3650 3653
 			children = (
3651  
-				DF79149013D4A5650018E92E /* AddonCallbacks.cpp */,
3652  
-				DF79149113D4A5650018E92E /* AddonCallbacks.h */,
3653  
-				DF79149213D4A5650018E92E /* AddonCallbacksAddon.cpp */,
3654  
-				DF79149313D4A5650018E92E /* AddonCallbacksAddon.h */,
3655  
-				DF79149413D4A5650018E92E /* AddonCallbacksGUI.cpp */,
3656  
-				DF79149513D4A5650018E92E /* AddonCallbacksGUI.h */,
3657  
-				DF79149613D4A5650018E92E /* AddonCallbacksPVR.cpp */,
3658  
-				DF79149713D4A5650018E92E /* AddonCallbacksPVR.h */,
  3654
+				DF7E663B13ED4C48003ED690 /* AddonCallbacks.cpp */,
  3655
+				DF7E663C13ED4C48003ED690 /* AddonCallbacks.h */,
  3656
+				DF7E663D13ED4C48003ED690 /* AddonCallbacksAddon.cpp */,
  3657
+				DF7E663E13ED4C48003ED690 /* AddonCallbacksAddon.h */,
  3658
+				DF7E663F13ED4C48003ED690 /* AddonCallbacksGUI.cpp */,
  3659
+				DF7E664013ED4C48003ED690 /* AddonCallbacksGUI.h */,
  3660
+				DF7E664113ED4C48003ED690 /* AddonCallbacksPVR.cpp */,
  3661
+				DF7E664213ED4C48003ED690 /* AddonCallbacksPVR.h */,
3659 3662
 				F56C71D9131EC151000AD0F6 /* Service.cpp */,
3660 3663
 				F56C71DA131EC151000AD0F6 /* Service.h */,
3661 3664
 				F56C71DB131EC151000AD0F6 /* GUIWindowAddonBrowser.cpp */,
@@ -4002,8 +4005,6 @@
4002 4005
 		F56C7291131EC151000AD0F6 /* DVDDemuxers */ = {
4003 4006
 			isa = PBXGroup;
4004 4007
 			children = (
4005  
-				DF7914A413D4A58B0018E92E /* DVDDemuxPVRClient.cpp */,
4006  
-				DF7914A513D4A58B0018E92E /* DVDDemuxPVRClient.h */,
4007 4008
 				F56C7292131EC151000AD0F6 /* DVDDemuxVobsub.cpp */,
4008 4009
 				F56C7293131EC151000AD0F6 /* DVDFactoryDemuxer.cpp */,
4009 4010
 				F56C7294131EC151000AD0F6 /* DVDDemuxFFmpeg.cpp */,
@@ -4012,6 +4013,8 @@
4012 4013
 				F56C7297131EC151000AD0F6 /* DVDDemuxHTSP.h */,
4013 4014
 				F56C7298131EC151000AD0F6 /* DVDDemux.cpp */,
4014 4015
 				F56C7299131EC151000AD0F6 /* DVDDemux.h */,
  4016
+				DF7E680213ED4E42003ED690 /* DVDDemuxPVRClient.cpp */,
  4017
+				DF7E680313ED4E42003ED690 /* DVDDemuxPVRClient.h */,
4015 4018
 				F56C729A131EC151000AD0F6 /* DVDDemuxShoutcast.cpp */,
4016 4019
 				F56C729B131EC151000AD0F6 /* DVDDemuxShoutcast.h */,
4017 4020
 				F56C729C131EC151000AD0F6 /* DVDDemuxUtils.cpp */,
@@ -4023,10 +4026,6 @@
4023 4026
 		F56C72A2131EC151000AD0F6 /* DVDInputStreams */ = {
4024 4027
 			isa = PBXGroup;
4025 4028
 			children = (
4026  
-				DF79149E13D4A5800018E92E /* DVDInputStreamPVRManager.cpp */,
4027  
-				DF79149F13D4A5800018E92E /* DVDInputStreamPVRManager.h */,
4028  
-				DF7914A013D4A5800018E92E /* DVDInputStreamStack.cpp */,
4029  
-				DF7914A113D4A5800018E92E /* DVDInputStreamStack.h */,
4030 4029
 				F56C72A3131EC151000AD0F6 /* DVDInputStreamRTMP.cpp */,
4031 4030
 				F56C72A4131EC151000AD0F6 /* DVDInputStreamRTMP.h */,
4032 4031
 				F56C72A5131EC151000AD0F6 /* DVDInputStreamTV.cpp */,
@@ -4050,6 +4049,10 @@
4050 4049
 				F56C72B7131EC151000AD0F6 /* DVDInputStreamMemory.h */,
4051 4050
 				F56C72B8131EC151000AD0F6 /* DVDInputStreamNavigator.cpp */,
4052 4051
 				F56C72B9131EC151000AD0F6 /* DVDInputStreamNavigator.h */,
  4052
+				DF7E67FC13ED4E25003ED690 /* DVDInputStreamPVRManager.cpp */,
  4053
+				DF7E67FD13ED4E25003ED690 /* DVDInputStreamPVRManager.h */,
  4054
+				DF7E67FE13ED4E25003ED690 /* DVDInputStreamStack.cpp */,
  4055
+				DF7E67FF13ED4E25003ED690 /* DVDInputStreamStack.h */,
4053 4056
 				F56C72BA131EC151000AD0F6 /* dvdnav */,
4054 4057
 				F56C72C6131EC151000AD0F6 /* DVDStateSerializer.cpp */,
4055 4058
 				F56C72C7131EC151000AD0F6 /* DVDStateSerializer.h */,
@@ -4239,8 +4242,6 @@
4239 4242
 		F56C7362131EC151000AD0F6 /* dialogs */ = {
4240 4243
 			isa = PBXGroup;
4241 4244
 			children = (
4242  
-				DF7914A713D4A5A30018E92E /* GUIDialogExtendedProgressBar.cpp */,
4243  
-				DF7914A813D4A5A30018E92E /* GUIDialogExtendedProgressBar.h */,
4244 4245
 				F56C7363131EC151000AD0F6 /* GUIDialogBoxBase.cpp */,
4245 4246
 				F56C7364131EC151000AD0F6 /* GUIDialogBoxBase.h */,
4246 4247
 				F56C7365131EC151000AD0F6 /* GUIDialogBusy.cpp */,
@@ -4253,6 +4254,8 @@
4253 4254
 				F56C736C131EC151000AD0F6 /* GUIDialogContextMenu.h */,
4254 4255
 				F56C736D131EC151000AD0F6 /* GUIDialogFavourites.cpp */,
4255 4256
 				F56C736E131EC151000AD0F6 /* GUIDialogFavourites.h */,
  4257
+				DF7E664713ED4C5A003ED690 /* GUIDialogExtendedProgressBar.cpp */,
  4258
+				DF7E664813ED4C5A003ED690 /* GUIDialogExtendedProgressBar.h */,
4256 4259
 				F56C736F131EC151000AD0F6 /* GUIDialogFileBrowser.cpp */,
4257 4260
 				F56C7370131EC151000AD0F6 /* GUIDialogFileBrowser.h */,
4258 4261
 				F56C7371131EC151000AD0F6 /* GUIDialogGamepad.cpp */,
@@ -4300,10 +4303,6 @@
4300 4303
 		F56C7395131EC151000AD0F6 /* filesystem */ = {
4301 4304
 			isa = PBXGroup;
4302 4305
 			children = (
4303  
-				DF79168713D4AA800018E92E /* PVRDirectory.cpp */,
4304  
-				DF79168813D4AA800018E92E /* PVRDirectory.h */,
4305  
-				DF79168913D4AA800018E92E /* PVRFile.cpp */,
4306  
-				DF79168A13D4AA800018E92E /* PVRFile.h */,
4307 4306
 				DF0DF16813A3AF82008ED511 /* FileNFS.cpp */,
4308 4307
 				DF0DF16913A3AF82008ED511 /* FileNFS.h */,
4309 4308
 				DF0DF16A13A3AF82008ED511 /* NFSDirectory.cpp */,
@@ -4438,6 +4437,10 @@
4438 4437
 				F56C743F131EC152000AD0F6 /* PlaylistFileDirectory.h */,
4439 4438
 				F56C7440131EC152000AD0F6 /* PluginDirectory.cpp */,
4440 4439
 				F56C7441131EC152000AD0F6 /* PluginDirectory.h */,
  4440
+				DF7E683713ED52B7003ED690 /* PVRDirectory.cpp */,
  4441
+				DF7E683813ED52B7003ED690 /* PVRDirectory.h */,
  4442
+				DF7E683913ED52B7003ED690 /* PVRFile.cpp */,
  4443
+				DF7E683A13ED52B7003ED690 /* PVRFile.h */,
4441 4444
 				F56C7442131EC152000AD0F6 /* RarDirectory.cpp */,
4442 4445
 				F56C7443131EC152000AD0F6 /* RarDirectory.h */,
4443 4446
 				F56C7444131EC152000AD0F6 /* RarManager.cpp */,
@@ -4612,7 +4615,6 @@
4612 4615
 				F56C74AB131EC152000AD0F6 /* GUIBaseContainer.h */,
4613 4616
 				F56C74AC131EC152000AD0F6 /* GUIBorderedImage.h */,
4614 4617
 				F56C74AD131EC152000AD0F6 /* GUIButtonControl.h */,
4615  
-				F56C74AE131EC152000AD0F6 /* GUIButtonScroller.h */,
4616 4618
 				F56C74AF131EC152000AD0F6 /* GUICallback.h */,
4617 4619
 				F56C74B0131EC152000AD0F6 /* GUICheckMarkControl.h */,
4618 4620
 				F56C74B1131EC152000AD0F6 /* GUIColorManager.h */,
@@ -4703,7 +4705,6 @@
4703 4705
 				F56C7506131EC152000AD0F6 /* GUIBaseContainer.cpp */,
4704 4706
 				F56C7507131EC152000AD0F6 /* GUIBorderedImage.cpp */,
4705 4707
 				F56C7508131EC152000AD0F6 /* GUIButtonControl.cpp */,
4706  
-				F56C7509131EC152000AD0F6 /* GUIButtonScroller.cpp */,
4707 4708
 				F56C750A131EC152000AD0F6 /* GUICheckMarkControl.cpp */,
4708 4709
 				F56C750B131EC152000AD0F6 /* GUIColorManager.cpp */,
4709 4710
 				F56C750C131EC152000AD0F6 /* GUIControl.cpp */,
@@ -4810,6 +4811,9 @@
4810 4811
 		F56C7563131EC152000AD0F6 /* interfaces */ = {
4811 4812
 			isa = PBXGroup;
4812 4813
 			children = (
  4814
+				F5E6209C13E9081400D5F2CD /* info */,
  4815
+				F5E6209D13E9081400D5F2CD /* InfoBool.cpp */,