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

Conflicts:
	xbmc/pvr/PVRManager.cpp
  • Loading branch information...
commit 28a25441553c68b9c3e301d869089b6bfc2d7650 2 parents 1f2654c + 087dede
Lars Op den Kamp authored

Showing 494 changed files with 17,675 additions and 7,111 deletions. Show diff stats Hide diff stats

  1. +1 35 Makefile.in
  2. +93 0 README.ios
  3. +1 1  README.linux
  4. +1 1  README.ubuntu
  5. +6,969 0 XBMC-ATV2.xcodeproj/project.pbxproj
  6. +6,988 0 XBMC-IOS.xcodeproj/project.pbxproj
  7. +63 83 XBMC.xcodeproj/project.pbxproj
  8. +3 3 addons/library.xbmc.addon/libXBMC_addon.h
  9. +51 51 addons/library.xbmc.gui/libXBMC_gui.h
  10. +8 3 addons/library.xbmc.pvr/libXBMC_pvr.h
  11. +7 0 addons/metadata.themoviedb.org/resources/language/Finnish/strings.xml
  12. +1 1  addons/pvr.hts/resources/settings.xml
  13. +1 0  addons/screensaver.xbmc.builtin.slideshow/resources/language/Finnish/strings.xml
  14. +1 1  addons/skin.confluence/720p/DialogKeyboard.xml
  15. +4 3 addons/skin.confluence/720p/MyVideoNav.xml
  16. +1 1  addons/skin.confluence/720p/SettingsSystemInfo.xml
  17. +0 1  addons/skin.confluence/720p/ViewsFileMode.xml
  18. +8 2 addons/skin.confluence/language/Finnish/strings.xml
  19. +1 3 bootstrap
  20. +126 144 configure.in
  21. +3 0  language/English/strings.xml
  22. +1 1  language/Finnish/langinfo.xml
  23. +270 110 language/Finnish/strings.xml
  24. +7 5 language/Polish/strings.xml
  25. +11 5 lib/DllAvCore.h
  26. +79 79 lib/addons/library.xbmc.gui/libXBMC_gui.cpp
  27. +8 0 lib/addons/library.xbmc.pvr/libXBMC_pvr.cpp
  28. +20 1 lib/cmyth/libcmyth/connection.c
  29. +0 32 lib/darwin/libSDL-OSX/SDL_SetWidthHeight.diff
  30. +0 40 lib/darwin/libSDL-OSX/buildSDL-osx.sh
  31. BIN  lib/darwin/libSDL-OSX/libSDL-powerpc-osx.a
  32. BIN  lib/darwin/libSDL-OSX/libSDL-x86-osx.a
  33. BIN  lib/darwin/libSDL-OSX/libSDL_mixer-powerpc-osx.a
  34. BIN  lib/darwin/libSDL-OSX/libSDL_mixer-x86-osx.a
  35. +0 37 lib/darwin/libcurl-OSX/build-libcurl-osx.sh
  36. +0 1,936 lib/darwin/libcurl-OSX/include/curl/curl.h
  37. +0 192 lib/darwin/libcurl-OSX/include/curl/curlbuild.h
  38. +0 249 lib/darwin/libcurl-OSX/include/curl/curlrules.h
  39. +0 70 lib/darwin/libcurl-OSX/include/curl/curlver.h
  40. +0 103 lib/darwin/libcurl-OSX/include/curl/easy.h
  41. +0 82 lib/darwin/libcurl-OSX/include/curl/mprintf.h
  42. +0 346 lib/darwin/libcurl-OSX/include/curl/multi.h
  43. +0 34 lib/darwin/libcurl-OSX/include/curl/stdcheaders.h
  44. +0 551 lib/darwin/libcurl-OSX/include/curl/typecheck-gcc.h
  45. +0 1  lib/darwin/libcurl-OSX/include/curl/types.h
  46. +1 1  lib/libRTV/GuideParser.cpp
  47. +4 0 lib/libXBMS/ccincludes.h
  48. +5 0 lib/libXDAAP/httpClient.c
  49. +1 1  lib/libXDAAP/thread.h
  50. +0 31 lib/libass/xbmc/Makefile.in
  51. +1 1  lib/libdvd/libdvdread/src/dvd_reader.c
  52. +4 0 lib/libflac/flac-1.2.1/src/libFLAC/fixed.c
  53. +8 0 lib/libhts/net_posix.c
  54. +1 1  lib/nosefart/NoseFartDLL.cpp
  55. +1 1  lib/stsound/StSoundLibrary/XBMCYM.cpp
  56. +2 2 lib/stsound/StSoundLibrary/YmTypes.h
  57. +4 4 project/VS2010Express/XBMC.vcxproj
  58. +8 8 project/VS2010Express/XBMC.vcxproj.filters
  59. +0 420 project/VS2010Express/guilib.vcxproj
  60. +0 621 project/VS2010Express/guilib.vcxproj.filters
  61. +23 18 project/Win32BuildSetup/BuildSetup.bat
  62. +1 1  project/Win32BuildSetup/XBMC for Windows.nsi
  63. +2 4 project/Win32BuildSetup/extract_git_rev.bat
  64. +1 1  project/Win32BuildSetup/readme.txt
  65. +80 43 system/keymaps/joystick.AppleRemote.xml
  66. +1 0  system/keymaps/keyboard.xml
  67. BIN  system/libcurl-powerpc-osx.so
  68. BIN  system/libcurl-x86-osx.so
  69. +14 0 tools/buildbot/gitrev-posix
  70. +3 0  tools/buildbot/osx-depends-check
  71. +3 3 tools/osx/ios-depends/Makefile
  72. +1 0  tools/osx/ios-depends/autoconf/Makefile
  73. +1 0  tools/osx/ios-depends/automake/Makefile
  74. +22 18 tools/osx/ios-depends/boost/Makefile
  75. +0 330 tools/osx/ios-depends/boost/boost.sh
  76. +5 0 tools/osx/ios-depends/boost/user-config.jam-ios-4.2_armv7.in
  77. +3 3 tools/osx/ios-depends/config.mk
  78. +1 0  tools/osx/ios-depends/dpkg/Makefile
  79. +12 0 tools/osx/ios-depends/gettext/02-gettext-tools-stpncpy.patch
  80. +1 0  tools/osx/ios-depends/gettext/Makefile
  81. +52 0 tools/osx/ios-depends/libass/Makefile
  82. +54 0 tools/osx/ios-depends/libbluray/Makefile
  83. +55 0 tools/osx/ios-depends/libflac/Makefile
  84. +54 0 tools/osx/ios-depends/libmicrohttpd/Makefile
  85. +53 0 tools/osx/ios-depends/libmodplug/Makefile
  86. +14 5 tools/osx/ios-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch
  87. +1 7 tools/osx/ios-depends/librtmp/Makefile
  88. +0 36 tools/osx/ios-depends/openssl/01-build-armv7.patch
  89. +6 3 tools/osx/ios-depends/openssl/Makefile
  90. +1 0  tools/osx/ios-depends/pkg-config/Makefile
  91. +2 1  tools/osx/ios-depends/tar/Makefile
  92. +3 2 tools/osx/osx-depends/Makefile
  93. +1 4 tools/osx/osx-depends/afpfs-ng/Makefile
  94. +2 1  tools/osx/osx-depends/autoconf/Makefile
  95. +2 1  tools/osx/osx-depends/automake/Makefile
  96. +4 8 tools/osx/osx-depends/boost/Makefile
  97. +6 5 tools/osx/osx-depends/config.mk
  98. +1 4 tools/osx/osx-depends/curl/Makefile
  99. +1 0  tools/osx/osx-depends/dpkg/Makefile
  100. +0 3  tools/osx/osx-depends/expat/Makefile
  101. +0 3  tools/osx/osx-depends/faad2/Makefile
  102. +0 3  tools/osx/osx-depends/fontconfig/Makefile
  103. +0 3  tools/osx/osx-depends/freetype2/Makefile
  104. +0 3  tools/osx/osx-depends/fribidi/Makefile
  105. +1 5 tools/osx/osx-depends/gettext/Makefile
  106. +0 3  tools/osx/osx-depends/jpeg/Makefile
  107. +0 2  tools/osx/osx-depends/libGLEW/Makefile
  108. +52 0 tools/osx/osx-depends/libass/Makefile
  109. +54 0 tools/osx/osx-depends/libbluray/Makefile
  110. +1 5 tools/osx/osx-depends/libcdio/Makefile
  111. +55 0 tools/osx/osx-depends/libflac/Makefile
  112. +1 5 tools/osx/osx-depends/libgcrypt/Makefile
  113. +1 4 tools/osx/osx-depends/libgpg-error/Makefile
  114. +0 3  tools/osx/osx-depends/liblzo/Makefile
  115. +0 2  tools/osx/osx-depends/liblzo2/Makefile
  116. +0 3  tools/osx/osx-depends/libmad/Makefile
  117. +54 0 tools/osx/osx-depends/libmicrohttpd/Makefile
  118. +53 0 tools/osx/osx-depends/libmodplug/Makefile
  119. +0 3  tools/osx/osx-depends/libmpeg2/Makefile
  120. +0 3  tools/osx/osx-depends/libogg/Makefile
  121. +0 3  tools/osx/osx-depends/libpng/Makefile
  122. +14 5 tools/osx/osx-depends/librtmp/01-make_shared_lib_for_darwin-tag2.3.patch
  123. +2 7 tools/osx/osx-depends/librtmp/Makefile
  124. +0 3  tools/osx/osx-depends/libsamplerate/Makefile
  125. +0 3  tools/osx/osx-depends/libsdl/Makefile
  126. +0 3  tools/osx/osx-depends/libsdl_image/Makefile
  127. +0 3  tools/osx/osx-depends/libsdl_mixer/Makefile
  128. +1 4 tools/osx/osx-depends/libssh2/Makefile
  129. +53 0 tools/osx/osx-depends/libtool/Makefile
  130. +0 3  tools/osx/osx-depends/libvorbis/Makefile
  131. +0 3  tools/osx/osx-depends/libwavpack/Makefile
  132. +1 17 tools/osx/osx-depends/mysqlclient/Makefile
  133. +1 3 tools/osx/osx-depends/openssl/Makefile
  134. +0 3  tools/osx/osx-depends/pcre/Makefile
  135. +6 1 tools/osx/osx-depends/python26/Makefile
  136. +1 4 tools/osx/osx-depends/readline/Makefile
  137. +2 53 tools/osx/osx-depends/samba/Makefile
  138. +1 3 tools/osx/osx-depends/sqlite3/Makefile
  139. +1 0  tools/osx/osx-depends/tar/Makefile
  140. +0 3  tools/osx/osx-depends/tiff/Makefile
  141. +48 46 tools/osx/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
  142. +36 35 tools/osx/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
  143. +52 31 xbmc/Application.cpp
  144. +9 1 xbmc/Application.h
  145. +8 0 xbmc/ApplicationMessenger.cpp
  146. +8 16 xbmc/DllPaths_generated.h.in
  147. +0 14 xbmc/FileItem.cpp
  148. +3 5 xbmc/GUIInfoManager.cpp
  149. +3 1 xbmc/GUIViewState.cpp
  150. +25 39 xbmc/Util.cpp
  151. +1 1  xbmc/Util.h
  152. +37 7 xbmc/addons/Addon.cpp
  153. +19 4 xbmc/addons/Addon.h
  154. +67 27 xbmc/addons/AddonDatabase.cpp
  155. +3 4 xbmc/addons/AddonDatabase.h
  156. +1 1  xbmc/addons/AddonHelpers_GUI.cpp
  157. +16 23 xbmc/addons/AddonHelpers_PVR.cpp
  158. +1 0  xbmc/addons/AddonHelpers_PVR.h
  159. +2 0  xbmc/addons/AddonHelpers_local.h
  160. +144 51 xbmc/addons/AddonInstaller.cpp
  161. +42 2 xbmc/addons/AddonInstaller.h
  162. +7 39 xbmc/addons/AddonManager.cpp
  163. +0 5 xbmc/addons/AddonManager.h
  164. +1 1  xbmc/addons/GUIDialogAddonInfo.cpp
  165. +1 1  xbmc/addons/GUIWindowAddonBrowser.cpp
  166. +5 3 xbmc/addons/IAddon.h
  167. +21 15 xbmc/addons/Repository.cpp
  168. +5 3 xbmc/addons/Repository.h
  169. +4 1 xbmc/addons/Scraper.cpp
  170. +1 1  xbmc/addons/ScreenSaver.cpp
  171. +37 28 xbmc/cores/AudioRenderers/IOSAudioRenderer.cpp
  172. +4 0 xbmc/cores/AudioRenderers/IOSAudioRenderer.h
  173. +25 16 xbmc/cores/DllLoader/exports/emu_msvcrt.cpp
  174. +3 2 xbmc/cores/DllLoader/exports/wrapper.c
  175. +2 2 xbmc/cores/DllLoader/exports/wrapper_mach_alias
  176. +8 1 xbmc/cores/VideoRenderers/LinuxRendererGL.cpp
  177. +534 247 xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp
  178. +24 8 xbmc/cores/VideoRenderers/LinuxRendererGLES.h
  179. +2 1  xbmc/cores/VideoRenderers/Makefile.in
  180. +11 16 xbmc/cores/VideoRenderers/OverlayRendererDX.cpp
  181. +19 20 xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
  182. +1 0  xbmc/cores/VideoRenderers/RenderFlags.h
  183. +9 0 xbmc/cores/VideoRenderers/RenderManager.h
  184. +12 4 xbmc/cores/VideoRenderers/yuv2rgb.neon.S
  185. +28 0 xbmc/cores/dvdplayer/DVDCodecs/DVDFactoryCodec.cpp
  186. +23 1 xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodec.h
  187. +8 1 xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp
  188. +1 1  xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVideoToolBox.cpp
  189. +12 3 xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp
  190. +5 5 xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxPVRClient.cpp
  191. +1 1  xbmc/cores/dvdplayer/DVDDemuxers/DVDFactoryDemuxer.cpp
  192. +1 1  xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStream.h
  193. +10 1 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamBluray.cpp
  194. +1 1  xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h
  195. +2 2 xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.cpp
  196. +1 1  xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamPVRManager.h
  197. +1 1  xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamTV.h
  198. +13 13 xbmc/cores/dvdplayer/DVDPlayer.cpp
  199. +9 1 xbmc/cores/dvdplayer/DVDPlayerVideo.cpp
  200. +2 2 xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
  201. +1 1  xbmc/cores/paplayer/ASAPCodec.cpp
  202. +6 0 xbmc/cores/paplayer/CDDAcodec.cpp
  203. +1 0  xbmc/dbwrappers/mysqldataset.cpp
  204. +1 1  xbmc/dialogs/GUIDialogKeyboard.cpp
  205. +2 6 xbmc/epg/Epg.cpp
  206. +1 1  xbmc/epg/Epg.h
  207. +20 3 xbmc/epg/EpgContainer.cpp
  208. +1 0  xbmc/epg/EpgContainer.h
  209. +2 2 xbmc/epg/EpgDatabase.cpp
  210. +32 0 xbmc/epg/EpgInfoTag.cpp
  211. +3 0  xbmc/epg/EpgInfoTag.h
  212. +15 6 xbmc/filesystem/AddonsDirectory.cpp
  213. +1 1  xbmc/filesystem/FileCurl.cpp
  214. +19 6 xbmc/filesystem/FileSmb.cpp
  215. +1 1  xbmc/filesystem/FileSmb.h
  216. +4 12 xbmc/filesystem/MusicDatabaseDirectory.cpp
  217. +19 9 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.cpp
  218. +17 9 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNode.h
  219. +12 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.cpp
  220. +3 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbum.h
  221. +12 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilations.cpp
  222. +3 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilations.h
  223. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilationsSongs.cpp
  224. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumCompilationsSongs.h
  225. +12 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAdded.cpp
  226. +3 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAdded.h
  227. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAddedSong.cpp
  228. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyAddedSong.h
  229. +12 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayed.cpp
  230. +3 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayed.h
  231. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayedSong.cpp
  232. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumRecentlyPlayedSong.h
  233. +10 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100.cpp
  234. +3 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100.h
  235. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100Song.cpp
  236. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeAlbumTop100Song.h
  237. +12 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.cpp
  238. +3 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeArtist.h
  239. +10 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeGenre.cpp
  240. +3 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeGenre.h
  241. +40 39 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.cpp
  242. +3 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeOverview.h
  243. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeRoot.cpp
  244. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeRoot.h
  245. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSingles.cpp
  246. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSingles.h
  247. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSong.cpp
  248. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSong.h
  249. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSongTop100.cpp
  250. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeSongTop100.h
  251. +20 12 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.cpp
  252. +3 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeTop100.h
  253. +7 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYear.cpp
  254. +3 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYear.h
  255. +12 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.cpp
  256. +3 2 xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearAlbum.h
  257. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearSong.cpp
  258. +1 1  xbmc/filesystem/MusicDatabaseDirectory/DirectoryNodeYearSong.h
  259. +2 0  xbmc/filesystem/MusicSearchDirectory.cpp
  260. +16 13 xbmc/filesystem/PVRFile.cpp
  261. +1 0  xbmc/filesystem/SmartPlaylistDirectory.cpp
  262. +2 0  xbmc/filesystem/SpecialProtocol.cpp
  263. +5 13 xbmc/filesystem/VideoDatabaseDirectory.cpp
  264. +19 9 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.cpp
  265. +17 9 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNode.h
  266. +10 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeActor.cpp
  267. +3 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeActor.h
  268. +10 4 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeCountry.cpp
  269. +3 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeCountry.h
  270. +10 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeDirector.cpp
  271. +3 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeDirector.h
  272. +1 1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.cpp
  273. +1 1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeEpisodes.h
  274. +10 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeGenre.cpp
  275. +3 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeGenre.h
  276. +35 38 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.cpp
  277. +3 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMoviesOverview.h
  278. +10 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideoAlbum.cpp
  279. +3 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideoAlbum.h
  280. +25 27 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.cpp
  281. +3 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideosOverview.h
  282. +23 14 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.cpp
  283. +3 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeOverview.h
  284. +2 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.cpp
  285. +2 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedEpisodes.h
  286. +2 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.cpp
  287. +2 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMovies.h
  288. +2 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.cpp
  289. +2 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRecentlyAddedMusicVideos.h
  290. +1 1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.cpp
  291. +1 1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeRoot.h
  292. +17 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.cpp
  293. +3 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSeasons.h
  294. +10 4 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSets.cpp
  295. +3 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeSets.h
  296. +10 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeStudio.cpp
  297. +3 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeStudio.h
  298. +1 1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.cpp
  299. +1 1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMovies.h
  300. +1 1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.cpp
  301. +1 1  xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleMusicVideos.h
  302. +10 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.cpp
  303. +3 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTitleTvShows.h
  304. +24 21 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.cpp
  305. +3 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeTvShowsOverview.h
  306. +7 2 xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeYear.cpp
Sorry, we could not display the entire diff because too many files (494) changed.
36 Makefile.in
@@ -111,10 +111,6 @@ DVDPCODECS_DIRS= \
111 111 lib \
112 112 lib/libdvd \
113 113
114   -ifneq (@USE_EXTERNAL_LIBASS@,1)
115   -DVDPCODECS_DIRS+=lib/libass/xbmc
116   -endif
117   -
118 114 PAPCODECS_DIRS= \
119 115 lib/xbadpcm \
120 116 lib/nosefart \
@@ -142,12 +138,8 @@ LIB_DIRS=\
142 138 lib/libapetag \
143 139 xbmc/interfaces/python/linux \
144 140 lib/cpluff \
145   - lib/libmodplug \
146 141 lib/xbmc-dll-symbols \
147 142 lib/jsoncpp/src/lib_json
148   -ifeq ($(findstring osx,@ARCH@), osx)
149   -LIB_DIRS+=lib/libmicrohttpd
150   -endif
151 143
152 144 SS_DIRS=\
153 145 xbmc/screensavers/rsxs-0.9/xbmc
@@ -437,22 +429,8 @@ ifeq ($(findstring osx,@ARCH@), osx)
437 429 else
438 430 cp lib/cpluff/libcpluff/.libs/libcpluff.so $@
439 431 endif
440   -lib/libmodplug/src/.libs/libmodplug.a: force
441   - $(MAKE) -C lib/libmodplug
442   -system/players/paplayer/libmodplug-@ARCH@.so: lib/libmodplug/src/.libs/libmodplug.a
443   -ifeq (@ARCH@, powerpc-osx)
444   - $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -lbundle1.o -o $@ $<
445   -endif
446   -ifeq (@ARCH@, x86-osx)
447   - $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -arch @ARCHTYPE@ -o $@ $<
448   -endif
449   -ifeq (@ARCH@, arm-osx)
450   - $(CXX) $(LDFLAGS) -all_load -bundle -flat_namespace -undefined dynamic_lookup -read_only_relocs suppress -arch armv7 -o $@ $<
451   -endif
452 432 lib/xbmc-dll-symbols/dll-symbols.a: force
453 433 $(MAKE) -C lib/xbmc-dll-symbols
454   -lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a: force
455   - $(MAKE) -C lib/libmicrohttpd
456 434
457 435 exports:
458 436 $(MAKE) xbmc/cores/DllLoader/exports/exports.a
@@ -496,9 +474,6 @@ python: dllloader
496 474 dvdpcodecs: dllloader
497 475 $(MAKE) -C lib
498 476 $(MAKE) -C lib/libdvd
499   -ifneq (@USE_EXTERNAL_LIBASS@,1)
500   - $(MAKE) -C lib/libass/xbmc
501   -endif
502 477 eventclients:
503 478 ifeq ($(findstring osx,@ARCH@), osx)
504 479 ifneq ($(findstring arm,@ARCH@), arm)
@@ -537,11 +512,7 @@ imagelib: dllloader
537 512 $(MAKE) -C lib/cximage-6.0
538 513
539 514 codecs: papcodecs dvdpcodecs
540   -ifeq ($(findstring osx,@ARCH@), osx)
541   -libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-@ARCH@.so system/players/paplayer/libmodplug-@ARCH@.so
542   -else
543 515 libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-@ARCH@.so
544   -endif
545 516 externals: libaddon codecs libs python pvrclients visualizations screensavers
546 517
547 518 xcode_depends: \
@@ -556,8 +527,7 @@ xcode_depends: \
556 527 xbmc/interfaces/interfaces.a \
557 528 xbmc/interfaces/http-api/http-api.a \
558 529 xbmc/interfaces/json-rpc/json-rpc.a \
559   - lib/jsoncpp/src/lib_json/libjsoncpp.a \
560   - lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a
  530 + lib/jsoncpp/src/lib_json/libjsoncpp.a
561 531
562 532 # platform independend objects
563 533 OBJSXBMC= \
@@ -640,18 +610,14 @@ OBJSXBMC+= \
640 610 lib/UnrarXLib/UnrarXLib.a
641 611 endif
642 612
643   -ifneq ($(findstring arm,@ARCH@), arm)
644   -# Can't include libhts for arm due to GPLv3
645 613 OBJSXBMC+= \
646 614 lib/libhts/libhts.a
647   -endif
648 615
649 616 # platform dependend objects
650 617 ifeq ($(findstring osx,@ARCH@), osx)
651 618 OBJSXBMC += \
652 619 xbmc/osx/osx.a \
653 620 xbmc/windowing/osx/windowing_osx.a \
654   - lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a \
655 621 xbmc/threads/darwin/threads_darwin.a \
656 622 xbmc/powermanagement/osx/powermanagement.a \
657 623 xbmc/network/osx/network.a \
93 README.ios
... ... @@ -0,0 +1,93 @@
  1 +TOC
  2 +1. Introduction
  3 +2. Getting the source code
  4 +3. Install required libs
  5 + 3.1. Install Xcode
  6 + 3.2. Install Cross libs and runtime environment
  7 +4. How to compile and run
  8 + 4.1 Using XCode
  9 + 4.2 Using Command line
  10 +5. Gesture Handling on iPad/iPhone/iPod touch
  11 +
  12 +-----------------------------------------------------------------------------
  13 +1. Introduction
  14 +-----------------------------------------------------------------------------
  15 +
  16 +This is a platform port of XBMC for the Apple iOS operating system.
  17 +The current build system is Xcode 3.2.5 and iOS SDK 4.2
  18 +There are two ways to build XBMC for Mac.
  19 +
  20 +1) command-line or
  21 +2) Xcode.
  22 +
  23 +Generally, Xcode is the easiest as it presents the build system in a GUI environment.
  24 +The command-line build is still under development.
  25 +
  26 +XBMC for Mac is composed of a main binary with numerous dynamic libraries and
  27 +codecs that support a multitude of music and video formats.
  28 +
  29 +NOTE TO NEW OS X USERS: All lines that are prefixed with the '$' character are
  30 +commands that need to be typed into a Terminal window. Note that the '$'
  31 +character itself should NOT be typed as part of the command.
  32 +
  33 +
  34 +-----------------------------------------------------------------------------
  35 +2. Getting the source code
  36 +-----------------------------------------------------------------------------
  37 +
  38 + $ cd $HOME
  39 + $ git clone git://github.com/xbmc/xbmc.git xbmc
  40 +
  41 +-----------------------------------------------------------------------------
  42 +3.0 Install Xcode
  43 +-----------------------------------------------------------------------------
  44 +Install latest Xcode. You can download it from Apple's site after registration at
  45 +(http://developer.apple.com/tools/download).
  46 +The preferred version is Xcode 3.2.5 and iOS SDK 4.2.
  47 +
  48 +-----------------------------------------------------------------------------
  49 +3.1 Install Cross libs and runtime environment
  50 +-----------------------------------------------------------------------------
  51 +
  52 + $ cd $HOME/XBMC
  53 + $ sudo mkdir -p /usr/local/bin; sudo cp tools/osx/ios-depends/gas-preprocessor/gas-preprocessor.pl /usr/local/bin/
  54 + $ make -C tools/osx/ios-depends
  55 +
  56 +-----------------------------------------------------------------------------
  57 +4. How to compile
  58 +-----------------------------------------------------------------------------
  59 +Both Xcode and Terminal compilation require that build environment be setup
  60 +from the step 3.1.
  61 +
  62 + $ cd $HOME/XBMC
  63 + $ make -C tools/osx/ios-depends/xbmc
  64 + $ make clean
  65 + $ make xcode_depends
  66 +
  67 +-----------------------------------------------------------------------------
  68 +4.1 Using Xcode
  69 +-----------------------------------------------------------------------------
  70 +Start XCode and open the XBMC project (XBMC-IOS.xcodeproj or XBMC-ATV2.xcodeproj)
  71 +located in $HOME/XBMC.
  72 +
  73 +There are two relevant build targets : Release and Debug. Compile always for device
  74 +end not simulator.
  75 +
  76 +-----------------------------------------------------------------------------
  77 +4.2 Using Terminal (command-line)
  78 +-----------------------------------------------------------------------------
  79 +
  80 + $ cd $HOME/XBMC
  81 + $ xcodebuild -project XBMC-IOS.xcodeproj -target XBMC -configuration Release build ONLY_ACTIVE_ARCH=YES ARCHS=armv7 VALID_ARCHS=armv7 IPHONEOS_DEPLOYMENT_TARGET=4.1 SDKROOT=iphoneos4.2
  82 +
  83 +or
  84 +
  85 + $ xcodebuild -project XBMC-ATV2.xcodeproj -target XBMC -configuration Release build ONLY_ACTIVE_ARCH=YES ARCHS=armv7 VALID_ARCHS=armv7 IPHONEOS_DEPLOYMENT_TARGET=4.1 SDKROOT=iphoneos4.2
  86 +
  87 +
  88 +5. Gesture Handling on iPad/iPhone/iPod touch
  89 +
  90 + Double Tap : Right Mouse Click
  91 + Swipe Left : Backspace
  92 + Swipe Right : Tab
  93 +
2  README.linux
@@ -44,7 +44,7 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
44 44 libfreetype6-dev, libfontconfig-dev, libbz2-dev, libfribidi-dev,
45 45 libsqlite3-dev, libmysqlclient-dev, libasound-dev, libpng12-dev | libpng-dev,
46 46 libpcre3-dev, liblzo2-dev, libcdio-dev, libsdl-dev, libsdl-image1.2-dev,
47   - libsdl-mixer1.2-dev, libenca-dev, libjasper-dev, libxt-dev, libxtst-dev,
  47 + libsdl-mixer1.2-dev, libenca-dev, libjasper-dev, libxt-dev,
48 48 libxmu-dev, libxinerama-dev, libcurl4-gnutls-dev | libcurl-dev,
49 49 libdbus-1-dev, libhal-storage-dev, libhal-dev, libpulse-dev,
50 50 libavahi-common-dev, libavahi-client-dev, libxrandr-dev, libavcodec-dev,
2  README.ubuntu
@@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:
44 44
45 45 For Ubuntu (all versions >= 7.04):
46 46
47   - # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxtst-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
  47 + # sudo apt-get install subversion make g++ gcc gawk pmount libtool nasm yasm automake cmake gperf zip unzip bison libsdl-dev libsdl-image1.2-dev libsdl-gfx1.2-dev libsdl-mixer1.2-dev libfribidi-dev liblzo2-dev libfreetype6-dev libsqlite3-dev libogg-dev libasound-dev python-sqlite libglew-dev libcurl3 libcurl4-gnutls-dev libxrandr-dev libxrender-dev libmad0-dev libogg-dev libvorbisenc2 libsmbclient-dev libmysqlclient-dev libpcre3-dev libdbus-1-dev libhal-dev libhal-storage-dev libjasper-dev libfontconfig-dev libbz2-dev libboost-dev libenca-dev libxt-dev libxmu-dev libpng-dev libjpeg-dev libpulse-dev mesa-utils libcdio-dev libsamplerate-dev libmpeg3-dev libflac-dev libiso9660-dev libass-dev libssl-dev fp-compiler gdc libwavpack-dev libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs
48 48
49 49 For Ubuntu Maverick (10.10):
50 50 # sudo apt-get install autopoint
6,969 XBMC-ATV2.xcodeproj/project.pbxproj
6,969 additions, 0 deletions not shown
6,988 XBMC-IOS.xcodeproj/project.pbxproj
6,988 additions, 0 deletions not shown
146 XBMC.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
3 3 archiveVersion = 1;
4 4 classes = {
5 5 };
6   - objectVersion = 42;
  6 + objectVersion = 45;
7 7 objects = {
8 8
9 9 /* Begin PBXAggregateTarget section */
@@ -1208,16 +1208,10 @@
1208 1208 F56C8D47131F5E85000AD0F6 /* libmad.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D2E131F5E84000AD0F6 /* libmad.dylib */; };
1209 1209 F56C8D49131F5E85000AD0F6 /* libmpeg2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D30131F5E84000AD0F6 /* libmpeg2.dylib */; };
1210 1210 F56C8D4A131F5E85000AD0F6 /* libwavpack.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D31131F5E84000AD0F6 /* libwavpack.dylib */; };
1211   - F56C8D4B131F5E85000AD0F6 /* libogg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D32131F5E84000AD0F6 /* libogg.dylib */; };
1212   - F56C8D4C131F5E85000AD0F6 /* libvorbis.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D33131F5E85000AD0F6 /* libvorbis.dylib */; };
1213   - F56C8D4D131F5E85000AD0F6 /* libvorbisfile.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D34131F5E85000AD0F6 /* libvorbisfile.dylib */; };
1214   - F56C8D4E131F5E85000AD0F6 /* libvorbisenc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D35131F5E85000AD0F6 /* libvorbisenc.dylib */; };
1215 1211 F56C8D4F131F5E85000AD0F6 /* libfribidi.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D36131F5E85000AD0F6 /* libfribidi.dylib */; };
1216 1212 F56C8D50131F5E85000AD0F6 /* libcdio.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D37131F5E85000AD0F6 /* libcdio.dylib */; };
1217 1213 F56C8D51131F5E85000AD0F6 /* libsamplerate.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D38131F5E85000AD0F6 /* libsamplerate.dylib */; };
1218   - F56C8D52131F5E85000AD0F6 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D39131F5E85000AD0F6 /* libcurl.dylib */; };
1219 1214 F56C8D53131F5E85000AD0F6 /* libsmbclient.dylib.0 in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3A131F5E85000AD0F6 /* libsmbclient.dylib.0 */; };
1220   - F56C8D54131F5E85000AD0F6 /* libtalloc.dylib.2 in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3B131F5E85000AD0F6 /* libtalloc.dylib.2 */; };
1221 1215 F56C8D55131F5E85000AD0F6 /* libfreetype.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3D131F5E85000AD0F6 /* libfreetype.dylib */; };
1222 1216 F56C8D56131F5E85000AD0F6 /* libfontconfig.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3E131F5E85000AD0F6 /* libfontconfig.dylib */; };
1223 1217 F56C8D57131F5E85000AD0F6 /* libmysqlclient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3F131F5E85000AD0F6 /* libmysqlclient.dylib */; };
@@ -1231,21 +1225,17 @@
1231 1225 F56C8D5F131F5E85000AD0F6 /* libmad.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D2E131F5E84000AD0F6 /* libmad.dylib */; };
1232 1226 F56C8D61131F5E85000AD0F6 /* libmpeg2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D30131F5E84000AD0F6 /* libmpeg2.dylib */; };
1233 1227 F56C8D62131F5E85000AD0F6 /* libwavpack.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D31131F5E84000AD0F6 /* libwavpack.dylib */; };
1234   - F56C8D63131F5E85000AD0F6 /* libogg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D32131F5E84000AD0F6 /* libogg.dylib */; };
1235   - F56C8D64131F5E85000AD0F6 /* libvorbis.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D33131F5E85000AD0F6 /* libvorbis.dylib */; };
1236   - F56C8D65131F5E85000AD0F6 /* libvorbisfile.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D34131F5E85000AD0F6 /* libvorbisfile.dylib */; };
1237   - F56C8D66131F5E85000AD0F6 /* libvorbisenc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D35131F5E85000AD0F6 /* libvorbisenc.dylib */; };
1238 1228 F56C8D67131F5E85000AD0F6 /* libfribidi.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D36131F5E85000AD0F6 /* libfribidi.dylib */; };
1239 1229 F56C8D68131F5E85000AD0F6 /* libcdio.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D37131F5E85000AD0F6 /* libcdio.dylib */; };
1240 1230 F56C8D69131F5E85000AD0F6 /* libsamplerate.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D38131F5E85000AD0F6 /* libsamplerate.dylib */; };
1241   - F56C8D6A131F5E85000AD0F6 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D39131F5E85000AD0F6 /* libcurl.dylib */; };
1242 1231 F56C8D6B131F5E86000AD0F6 /* libsmbclient.dylib.0 in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3A131F5E85000AD0F6 /* libsmbclient.dylib.0 */; };
1243   - F56C8D6C131F5E86000AD0F6 /* libtalloc.dylib.2 in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3B131F5E85000AD0F6 /* libtalloc.dylib.2 */; };
1244 1232 F56C8D6D131F5E86000AD0F6 /* libfreetype.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3D131F5E85000AD0F6 /* libfreetype.dylib */; };
1245 1233 F56C8D6E131F5E86000AD0F6 /* libfontconfig.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3E131F5E85000AD0F6 /* libfontconfig.dylib */; };
1246 1234 F56C8D6F131F5E86000AD0F6 /* libmysqlclient.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D3F131F5E85000AD0F6 /* libmysqlclient.dylib */; };
1247 1235 F56C8D70131F5E86000AD0F6 /* libpython2.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D40131F5E85000AD0F6 /* libpython2.6.dylib */; };
1248 1236 F56C8D71131F5E86000AD0F6 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D41131F5E85000AD0F6 /* libsqlite3.dylib */; };
  1237 + F57A1D1E1329B15300498CC7 /* AutoPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = F57A1D1D1329B15300498CC7 /* AutoPool.mm */; };
  1238 + F57A1D1F1329B15300498CC7 /* AutoPool.mm in Sources */ = {isa = PBXBuildFile; fileRef = F57A1D1D1329B15300498CC7 /* AutoPool.mm */; };
1249 1239 F57A1E3A132AAB0E00498CC7 /* libSDL.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57A1E39132AAB0E00498CC7 /* libSDL.dylib */; };
1250 1240 F57A1E3B132AAB0E00498CC7 /* libSDL.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57A1E39132AAB0E00498CC7 /* libSDL.dylib */; };
1251 1241 F57A1E3D132AAB1A00498CC7 /* libSDL_mixer.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F57A1E3C132AAB1A00498CC7 /* libSDL_mixer.dylib */; };
@@ -1848,8 +1838,6 @@
1848 1838 F5A7A6F81128934D0059D6AA /* http-api.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A7A6F61128934C0059D6AA /* http-api.a */; };
1849 1839 F5A7A702112893E50059D6AA /* AnnouncementManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7A700112893E50059D6AA /* AnnouncementManager.cpp */; };
1850 1840 F5A7A703112893E50059D6AA /* AnnouncementManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7A700112893E50059D6AA /* AnnouncementManager.cpp */; };
1851   - F5A7A8131128F4DA0059D6AA /* libmicrohttpd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A7A8121128F4DA0059D6AA /* libmicrohttpd.a */; };
1852   - F5A7A8141128F4DA0059D6AA /* libmicrohttpd.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F5A7A8121128F4DA0059D6AA /* libmicrohttpd.a */; };
1853 1841 F5A7A85B112908F00059D6AA /* WebServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7A859112908F00059D6AA /* WebServer.cpp */; };
1854 1842 F5A7A85C112908F00059D6AA /* WebServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7A859112908F00059D6AA /* WebServer.cpp */; };
1855 1843 F5A7B376113AFB5F0059D6AA /* FileSFTP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5A7B374113AFB5F0059D6AA /* FileSFTP.cpp */; };
@@ -1865,6 +1853,18 @@
1865 1853 F5AACA970FB3E2B800DBB77C /* GUIDialogSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AACA950FB3E2B800DBB77C /* GUIDialogSlider.cpp */; };
1866 1854 F5AACA980FB3E2B800DBB77C /* GUIDialogSlider.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AACA950FB3E2B800DBB77C /* GUIDialogSlider.cpp */; };
1867 1855 F5AD1EA80F488A1A0065EB5D /* GUIWindowKaraokeLyrics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5AD1EA70F488A1A0065EB5D /* GUIWindowKaraokeLyrics.cpp */; };
  1856 + F5B13868133081390045076D /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138641330811D0045076D /* libmicrohttpd.dylib */; };
  1857 + F5B138691330813A0045076D /* libmicrohttpd.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B138641330811D0045076D /* libmicrohttpd.dylib */; };
  1858 + F5B13AD1133319310045076D /* libass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13AD0133319310045076D /* libass.dylib */; };
  1859 + F5B13AD2133319310045076D /* libass.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F5B13AD0133319310045076D /* libass.dylib */; };
  1860 + F5B13C8D1334056B0045076D /* DarwinUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B13C8C1334056B0045076D /* DarwinUtils.mm */; };
  1861 + F5B13C8E1334056B0045076D /* DarwinUtils.mm in Sources */ = {isa = PBXBuildFile; fileRef = F5B13C8C1334056B0045076D /* DarwinUtils.mm */; };
  1862 + F5B5CBB5133865FA007A4B4C /* libogg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D32131F5E84000AD0F6 /* libogg.dylib */; };
  1863 + F5B5CBB6133865FB007A4B4C /* libogg.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D32131F5E84000AD0F6 /* libogg.dylib */; };
  1864 + F5B5CBB91338661B007A4B4C /* libvorbis.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D33131F5E85000AD0F6 /* libvorbis.dylib */; };
  1865 + F5B5CBBA1338661C007A4B4C /* libvorbis.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D33131F5E85000AD0F6 /* libvorbis.dylib */; };
  1866 + F5B5CBD61338680F007A4B4C /* libvorbisenc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D35131F5E85000AD0F6 /* libvorbisenc.dylib */; };
  1867 + F5B5CBD713386811007A4B4C /* libvorbisenc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D35131F5E85000AD0F6 /* libvorbisenc.dylib */; };
1868 1868 F5BDB80C120202F400F0B710 /* DVDSubtitleTagSami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB80B120202F400F0B710 /* DVDSubtitleTagSami.cpp */; };
1869 1869 F5BDB80D120202F400F0B710 /* DVDSubtitleTagSami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB80B120202F400F0B710 /* DVDSubtitleTagSami.cpp */; };
1870 1870 F5BDB81A1202032400F0B710 /* DVDSubtitleTagMicroDVD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5BDB8191202032400F0B710 /* DVDSubtitleTagMicroDVD.cpp */; };
@@ -2471,8 +2471,8 @@
2471 2471 7C779E51104A58F900F444C4 /* GUIWindowTestPatternGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowTestPatternGL.h; sourceTree = "<group>"; };
2472 2472 7C7B2B2E1134F36400713D6D /* mysqldataset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = mysqldataset.cpp; sourceTree = "<group>"; };
2473 2473 7C7B2B2F1134F36400713D6D /* mysqldataset.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = mysqldataset.h; sourceTree = "<group>"; };
2474   - 7C84A59C12FA3C1600CD1714 /* SourcesDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourcesDirectory.cpp; path = xbmc/FileSystem/SourcesDirectory.cpp; sourceTree = SOURCE_ROOT; };
2475   - 7C84A59D12FA3C1600CD1714 /* SourcesDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourcesDirectory.h; path = xbmc/FileSystem/SourcesDirectory.h; sourceTree = SOURCE_ROOT; };
  2474 + 7C84A59C12FA3C1600CD1714 /* SourcesDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SourcesDirectory.cpp; path = xbmc/filesystem/SourcesDirectory.cpp; sourceTree = SOURCE_ROOT; };
  2475 + 7C84A59D12FA3C1600CD1714 /* SourcesDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SourcesDirectory.h; path = xbmc/filesystem/SourcesDirectory.h; sourceTree = SOURCE_ROOT; };
2476 2476 7C8A14541154CB2600E5FCFA /* TextureCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureCache.cpp; sourceTree = "<group>"; };
2477 2477 7C8A14551154CB2600E5FCFA /* TextureCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextureCache.h; sourceTree = "<group>"; };
2478 2478 7C8A187A115B2A8200E5FCFA /* TextureDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureDatabase.cpp; sourceTree = "<group>"; };
@@ -2708,11 +2708,6 @@
2708 2708 E38E148E0D25F9F900618676 /* EncoderWav.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EncoderWav.cpp; sourceTree = "<group>"; };
2709 2709 E38E148F0D25F9F900618676 /* EncoderWav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncoderWav.h; sourceTree = "<group>"; };
2710 2710 E38E14910D25F9F900618676 /* lame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lame.h; sourceTree = "<group>"; };
2711   - E38E14950D25F9F900618676 /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec.h; sourceTree = "<group>"; };
2712   - E38E14960D25F9F900618676 /* ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ogg.h; sourceTree = "<group>"; };
2713   - E38E14970D25F9F900618676 /* os_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = os_types.h; sourceTree = "<group>"; };
2714   - E38E14980D25F9F900618676 /* vorbisenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbisenc.h; sourceTree = "<group>"; };
2715   - E38E14990D25F9F900618676 /* vorbisfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbisfile.h; sourceTree = "<group>"; };
2716 2711 E38E149E0D25F9F900618676 /* coff.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = coff.cpp; sourceTree = "<group>"; };
2717 2712 E38E149F0D25F9F900618676 /* coff.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coff.h; sourceTree = "<group>"; };
2718 2713 E38E14A00D25F9F900618676 /* coffldr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = coffldr.h; sourceTree = "<group>"; };
@@ -3780,8 +3775,8 @@
3780 3775 F51CEF870F5C64A5004F4602 /* DVDInputStreamHTSP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DVDInputStreamHTSP.h; path = xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamHTSP.h; sourceTree = SOURCE_ROOT; };
3781 3776 F51CF2CE0F6055A4004F4602 /* sha1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = sha1.c; sourceTree = "<group>"; };
3782 3777 F51CF2CF0F6055A4004F4602 /* sha1.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sha1.h; sourceTree = "<group>"; };
3783   - F52910120EE1D5F0001167F0 /* DirectoryNodeMusicVideoAlbum.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DirectoryNodeMusicVideoAlbum.h; path = xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeMusicVideoAlbum.h; sourceTree = SOURCE_ROOT; };
3784   - F52910130EE1D5F0001167F0 /* DirectoryNodeMusicVideoAlbum.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryNodeMusicVideoAlbum.cpp; path = xbmc/FileSystem/VideoDatabaseDirectory/DirectoryNodeMusicVideoAlbum.cpp; sourceTree = SOURCE_ROOT; };
  3778 + F52910120EE1D5F0001167F0 /* DirectoryNodeMusicVideoAlbum.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = DirectoryNodeMusicVideoAlbum.h; path = xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideoAlbum.h; sourceTree = SOURCE_ROOT; };
  3779 + F52910130EE1D5F0001167F0 /* DirectoryNodeMusicVideoAlbum.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = DirectoryNodeMusicVideoAlbum.cpp; path = xbmc/filesystem/VideoDatabaseDirectory/DirectoryNodeMusicVideoAlbum.cpp; sourceTree = SOURCE_ROOT; };
3785 3780 F52B063911869862004B1D66 /* Skin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Skin.h; sourceTree = "<group>"; };
3786 3781 F52B063A11869862004B1D66 /* Skin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Skin.cpp; sourceTree = "<group>"; };
3787 3782 F52B06B81187CE18004B1D66 /* DVDVideoCodecVDA.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DVDVideoCodecVDA.cpp; path = xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp; sourceTree = SOURCE_ROOT; };
@@ -3844,20 +3839,18 @@
3844 3839 F56C8D31131F5E84000AD0F6 /* libwavpack.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libwavpack.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libwavpack.dylib"; sourceTree = "<absolute>"; };
3845 3840 F56C8D32131F5E84000AD0F6 /* libogg.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libogg.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libogg.dylib"; sourceTree = "<absolute>"; };
3846 3841 F56C8D33131F5E85000AD0F6 /* libvorbis.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbis.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libvorbis.dylib"; sourceTree = "<absolute>"; };
3847   - F56C8D34131F5E85000AD0F6 /* libvorbisfile.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisfile.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libvorbisfile.dylib"; sourceTree = "<absolute>"; };
3848 3842 F56C8D35131F5E85000AD0F6 /* libvorbisenc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvorbisenc.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libvorbisenc.dylib"; sourceTree = "<absolute>"; };
3849 3843 F56C8D36131F5E85000AD0F6 /* libfribidi.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfribidi.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libfribidi.dylib"; sourceTree = "<absolute>"; };
3850 3844 F56C8D37131F5E85000AD0F6 /* libcdio.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcdio.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libcdio.dylib"; sourceTree = "<absolute>"; };
3851 3845 F56C8D38131F5E85000AD0F6 /* libsamplerate.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsamplerate.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libsamplerate.dylib"; sourceTree = "<absolute>"; };
3852   - F56C8D39131F5E85000AD0F6 /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libcurl.dylib"; sourceTree = "<absolute>"; };
3853 3846 F56C8D3A131F5E85000AD0F6 /* libsmbclient.dylib.0 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsmbclient.dylib.0; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libsmbclient.dylib.0"; sourceTree = "<absolute>"; };
3854   - F56C8D3B131F5E85000AD0F6 /* libtalloc.dylib.2 */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libtalloc.dylib.2; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libtalloc.dylib.2"; sourceTree = "<absolute>"; };
3855   - F56C8D3C131F5E85000AD0F6 /* libtdb.dylib.1 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; fileEncoding = 4; name = libtdb.dylib.1; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libtdb.dylib.1"; sourceTree = "<absolute>"; };
3856 3847 F56C8D3D131F5E85000AD0F6 /* libfreetype.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfreetype.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libfreetype.dylib"; sourceTree = "<absolute>"; };
3857 3848 F56C8D3E131F5E85000AD0F6 /* libfontconfig.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfontconfig.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libfontconfig.dylib"; sourceTree = "<absolute>"; };
3858 3849 F56C8D3F131F5E85000AD0F6 /* libmysqlclient.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmysqlclient.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/mysql/libmysqlclient.dylib"; sourceTree = "<absolute>"; };
3859 3850 F56C8D40131F5E85000AD0F6 /* libpython2.6.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpython2.6.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libpython2.6.dylib"; sourceTree = "<absolute>"; };
3860 3851 F56C8D41131F5E85000AD0F6 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libsqlite3.dylib"; sourceTree = "<absolute>"; };
  3852 + F57A1D1C1329B15300498CC7 /* AutoPool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutoPool.h; sourceTree = "<group>"; };
  3853 + F57A1D1D1329B15300498CC7 /* AutoPool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AutoPool.mm; sourceTree = "<group>"; };
3861 3854 F57A1E39132AAB0E00498CC7 /* libSDL.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libSDL.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libSDL.dylib"; sourceTree = "<absolute>"; };
3862 3855 F57A1E3C132AAB1A00498CC7 /* libSDL_mixer.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libSDL_mixer.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libSDL_mixer.dylib"; sourceTree = "<absolute>"; };
3863 3856 F57B6F7E1071B8B500079ACB /* JobManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JobManager.cpp; sourceTree = "<group>"; };
@@ -3904,7 +3897,6 @@
3904 3897 F5A7A6F61128934C0059D6AA /* http-api.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "http-api.a"; path = "xbmc/interfaces/http-api/http-api.a"; sourceTree = "<group>"; };
3905 3898 F5A7A700112893E50059D6AA /* AnnouncementManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AnnouncementManager.cpp; sourceTree = "<group>"; };
3906 3899 F5A7A701112893E50059D6AA /* AnnouncementManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AnnouncementManager.h; sourceTree = "<group>"; };
3907   - F5A7A8121128F4DA0059D6AA /* libmicrohttpd.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libmicrohttpd.a; path = lib/libmicrohttpd/src/daemon/.libs/libmicrohttpd.a; sourceTree = "<group>"; };
3908 3900 F5A7A859112908F00059D6AA /* WebServer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebServer.cpp; sourceTree = "<group>"; };
3909 3901 F5A7A85A112908F00059D6AA /* WebServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebServer.h; sourceTree = "<group>"; };
3910 3902 F5A7B374113AFB5F0059D6AA /* FileSFTP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileSFTP.cpp; sourceTree = "<group>"; };
@@ -3922,6 +3914,10 @@
3922 3914 F5ACB5370FC3DF3D00AAA056 /* eprintf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = eprintf.cpp; sourceTree = "<group>"; };
3923 3915 F5AD1EA60F488A1A0065EB5D /* GUIWindowKaraokeLyrics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowKaraokeLyrics.h; sourceTree = "<group>"; };
3924 3916 F5AD1EA70F488A1A0065EB5D /* GUIWindowKaraokeLyrics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowKaraokeLyrics.cpp; sourceTree = "<group>"; };
  3917 + F5B138641330811D0045076D /* libmicrohttpd.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmicrohttpd.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libmicrohttpd.dylib"; sourceTree = "<absolute>"; };
  3918 + F5B13AD0133319310045076D /* libass.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libass.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libass.dylib"; sourceTree = "<absolute>"; };
  3919 + F5B13C8B1334056B0045076D /* DarwinUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DarwinUtils.h; sourceTree = "<group>"; };
  3920 + F5B13C8C1334056B0045076D /* DarwinUtils.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = DarwinUtils.mm; sourceTree = "<group>"; };
3925 3921 F5B413131065900C0035D105 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
3926 3922 F5BDB80A120202F400F0B710 /* DVDSubtitleTagSami.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDSubtitleTagSami.h; sourceTree = "<group>"; };
3927 3923 F5BDB80B120202F400F0B710 /* DVDSubtitleTagSami.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDSubtitleTagSami.cpp; sourceTree = "<group>"; };
@@ -4029,7 +4025,6 @@
4029 4025 F5A7A6F1112893330059D6AA /* libjsoncpp.a in Frameworks */,
4030 4026 F5A7A6F4112893440059D6AA /* json-rpc.a in Frameworks */,
4031 4027 F5A7A6F71128934C0059D6AA /* http-api.a in Frameworks */,
4032   - F5A7A8131128F4DA0059D6AA /* libmicrohttpd.a in Frameworks */,
4033 4028 F56C8CE2131F5DAF000AD0F6 /* libc.dylib in Frameworks */,
4034 4029 F56C8CE7131F5DC6000AD0F6 /* libz.dylib in Frameworks */,
4035 4030 F56C8CEA131F5DCC000AD0F6 /* libm.dylib in Frameworks */,
@@ -4045,16 +4040,10 @@
4045 4040 F56C8D47131F5E85000AD0F6 /* libmad.dylib in Frameworks */,
4046 4041 F56C8D49131F5E85000AD0F6 /* libmpeg2.dylib in Frameworks */,
4047 4042 F56C8D4A131F5E85000AD0F6 /* libwavpack.dylib in Frameworks */,
4048   - F56C8D4B131F5E85000AD0F6 /* libogg.dylib in Frameworks */,
4049   - F56C8D4C131F5E85000AD0F6 /* libvorbis.dylib in Frameworks */,
4050   - F56C8D4D131F5E85000AD0F6 /* libvorbisfile.dylib in Frameworks */,
4051   - F56C8D4E131F5E85000AD0F6 /* libvorbisenc.dylib in Frameworks */,
4052 4043 F56C8D4F131F5E85000AD0F6 /* libfribidi.dylib in Frameworks */,
4053 4044 F56C8D50131F5E85000AD0F6 /* libcdio.dylib in Frameworks */,
4054 4045 F56C8D51131F5E85000AD0F6 /* libsamplerate.dylib in Frameworks */,
4055   - F56C8D52131F5E85000AD0F6 /* libcurl.dylib in Frameworks */,
4056 4046 F56C8D53131F5E85000AD0F6 /* libsmbclient.dylib.0 in Frameworks */,
4057   - F56C8D54131F5E85000AD0F6 /* libtalloc.dylib.2 in Frameworks */,
4058 4047 F56C8D55131F5E85000AD0F6 /* libfreetype.dylib in Frameworks */,
4059 4048 F56C8D56131F5E85000AD0F6 /* libfontconfig.dylib in Frameworks */,
4060 4049 F56C8D57131F5E85000AD0F6 /* libmysqlclient.dylib in Frameworks */,
@@ -4062,6 +4051,11 @@
4062 4051 F56C8D59131F5E85000AD0F6 /* libsqlite3.dylib in Frameworks */,
4063 4052 F57A1E3A132AAB0E00498CC7 /* libSDL.dylib in Frameworks */,
4064 4053 F57A1E3D132AAB1A00498CC7 /* libSDL_mixer.dylib in Frameworks */,
  4054 + F5B13868133081390045076D /* libmicrohttpd.dylib in Frameworks */,
  4055 + F5B13AD1133319310045076D /* libass.dylib in Frameworks */,
  4056 + F5B5CBB5133865FA007A4B4C /* libogg.dylib in Frameworks */,
  4057 + F5B5CBB91338661B007A4B4C /* libvorbis.dylib in Frameworks */,
  4058 + F5B5CBD61338680F007A4B4C /* libvorbisenc.dylib in Frameworks */,
4065 4059 );
4066 4060 runOnlyForDeploymentPostprocessing = 0;
4067 4061 };
@@ -4095,7 +4089,6 @@
4095 4089 F5A7A6F2112893330059D6AA /* libjsoncpp.a in Frameworks */,
4096 4090 F5A7A6F5112893440059D6AA /* json-rpc.a in Frameworks */,
4097 4091 F5A7A6F81128934D0059D6AA /* http-api.a in Frameworks */,
4098   - F5A7A8141128F4DA0059D6AA /* libmicrohttpd.a in Frameworks */,
4099 4092 F56C8CE3131F5DAF000AD0F6 /* libc.dylib in Frameworks */,
4100 4093 F56C8CE8131F5DC6000AD0F6 /* libz.dylib in Frameworks */,
4101 4094 F56C8CEB131F5DCC000AD0F6 /* libm.dylib in Frameworks */,
@@ -4111,16 +4104,10 @@
4111 4104 F56C8D5F131F5E85000AD0F6 /* libmad.dylib in Frameworks */,
4112 4105 F56C8D61131F5E85000AD0F6 /* libmpeg2.dylib in Frameworks */,
4113 4106 F56C8D62131F5E85000AD0F6 /* libwavpack.dylib in Frameworks */,
4114   - F56C8D63131F5E85000AD0F6 /* libogg.dylib in Frameworks */,
4115   - F56C8D64131F5E85000AD0F6 /* libvorbis.dylib in Frameworks */,
4116   - F56C8D65131F5E85000AD0F6 /* libvorbisfile.dylib in Frameworks */,
4117   - F56C8D66131F5E85000AD0F6 /* libvorbisenc.dylib in Frameworks */,
4118 4107 F56C8D67131F5E85000AD0F6 /* libfribidi.dylib in Frameworks */,
4119 4108 F56C8D68131F5E85000AD0F6 /* libcdio.dylib in Frameworks */,
4120 4109 F56C8D69131F5E85000AD0F6 /* libsamplerate.dylib in Frameworks */,
4121   - F56C8D6A131F5E85000AD0F6 /* libcurl.dylib in Frameworks */,
4122 4110 F56C8D6B131F5E86000AD0F6 /* libsmbclient.dylib.0 in Frameworks */,
4123   - F56C8D6C131F5E86000AD0F6 /* libtalloc.dylib.2 in Frameworks */,
4124 4111 F56C8D6D131F5E86000AD0F6 /* libfreetype.dylib in Frameworks */,
4125 4112 F56C8D6E131F5E86000AD0F6 /* libfontconfig.dylib in Frameworks */,
4126 4113 F56C8D6F131F5E86000AD0F6 /* libmysqlclient.dylib in Frameworks */,
@@ -4128,6 +4115,11 @@
4128 4115 F56C8D71131F5E86000AD0F6 /* libsqlite3.dylib in Frameworks */,
4129 4116 F57A1E3B132AAB0E00498CC7 /* libSDL.dylib in Frameworks */,
4130 4117 F57A1E3E132AAB1A00498CC7 /* libSDL_mixer.dylib in Frameworks */,
  4118 + F5B138691330813A0045076D /* libmicrohttpd.dylib in Frameworks */,
  4119 + F5B13AD2133319310045076D /* libass.dylib in Frameworks */,
  4120 + F5B5CBB6133865FB007A4B4C /* libogg.dylib in Frameworks */,
  4121 + F5B5CBBA1338661C007A4B4C /* libvorbis.dylib in Frameworks */,
  4122 + F5B5CBD713386811007A4B4C /* libvorbisenc.dylib in Frameworks */,
4131 4123 );
4132 4124 runOnlyForDeploymentPostprocessing = 0;
4133 4125 };
@@ -5275,6 +5267,8 @@
5275 5267 E37D5CB40D3023BB0081D327 /* osx */ = {
5276 5268 isa = PBXGroup;
5277 5269 children = (
  5270 + F57A1D1C1329B15300498CC7 /* AutoPool.h */,
  5271 + F57A1D1D1329B15300498CC7 /* AutoPool.mm */,
5278 5272 6E2FACD20E26E92800DF79EA /* Info.plist */,
5279 5273 F5EA04280F72EB88005C2EC5 /* SDLMain.mm */,
5280 5274 F5EA04E80F72F9CA005C2EC5 /* SDLMain.h */,
@@ -5282,6 +5276,8 @@
5282 5276 83A72B930FBC8DFF00171871 /* CoreAudio.h */,
5283 5277 F5EA05C00F733812005C2EC5 /* CocoaInterface.mm */,
5284 5278 F5EA05C30F73381A005C2EC5 /* CocoaInterface.h */,
  5279 + F5B13C8B1334056B0045076D /* DarwinUtils.h */,
  5280 + F5B13C8C1334056B0045076D /* DarwinUtils.mm */,
5285 5281 E306D12C0DDF7B590052C2AD /* XBMCHelper.cpp */,
5286 5282 E306D12D0DDF7B590052C2AD /* XBMCHelper.h */,
5287 5283 F51CEEEE0F5C5D20004F4602 /* OSXGNUReplacements.c */,
@@ -5422,7 +5418,6 @@
5422 5418 E38E148E0D25F9F900618676 /* EncoderWav.cpp */,
5423 5419 E38E148F0D25F9F900618676 /* EncoderWav.h */,
5424 5420 E38E14900D25F9F900618676 /* lame */,
5425   - E38E14940D25F9F900618676 /* oggvorbis */,
5426 5421 );
5427 5422 path = cdrip;
5428 5423 sourceTree = "<group>";
@@ -5435,18 +5430,6 @@
5435 5430 path = lame;
5436 5431 sourceTree = "<group>";
5437 5432 };
5438   - E38E14940D25F9F900618676 /* oggvorbis */ = {
5439   - isa = PBXGroup;
5440   - children = (
5441   - E38E14950D25F9F900618676 /* codec.h */,
5442   - E38E14960D25F9F900618676 /* ogg.h */,
5443   - E38E14970D25F9F900618676 /* os_types.h */,
5444   - E38E14980D25F9F900618676 /* vorbisenc.h */,
5445   - E38E14990D25F9F900618676 /* vorbisfile.h */,
5446   - );
5447   - path = oggvorbis;
5448   - sourceTree = "<group>";
5449   - };
5450 5433 E38E149A0D25F9F900618676 /* cores */ = {
5451 5434 isa = PBXGroup;
5452 5435 children = (
@@ -7224,20 +7207,17 @@
7224 7207 F56C8D2B131F5E84000AD0F6 /* libpcre.dylib */,
7225 7208 F56C8D2C131F5E84000AD0F6 /* libpcrecpp.dylib */,
7226 7209 F56C8D2D131F5E84000AD0F6 /* libcrypto.dylib */,
  7210 + F5B13AD0133319310045076D /* libass.dylib */,
7227 7211 F56C8D2E131F5E84000AD0F6 /* libmad.dylib */,
7228 7212 F56C8D30131F5E84000AD0F6 /* libmpeg2.dylib */,
7229 7213 F56C8D31131F5E84000AD0F6 /* libwavpack.dylib */,
7230 7214 F56C8D32131F5E84000AD0F6 /* libogg.dylib */,
7231 7215 F56C8D33131F5E85000AD0F6 /* libvorbis.dylib */,
7232   - F56C8D34131F5E85000AD0F6 /* libvorbisfile.dylib */,
7233 7216 F56C8D35131F5E85000AD0F6 /* libvorbisenc.dylib */,
7234 7217 F56C8D36131F5E85000AD0F6 /* libfribidi.dylib */,
7235 7218 F56C8D37131F5E85000AD0F6 /* libcdio.dylib */,
7236 7219 F56C8D38131F5E85000AD0F6 /* libsamplerate.dylib */,
7237   - F56C8D39131F5E85000AD0F6 /* libcurl.dylib */,
7238 7220 F56C8D3A131F5E85000AD0F6 /* libsmbclient.dylib.0 */,
7239   - F56C8D3B131F5E85000AD0F6 /* libtalloc.dylib.2 */,
7240   - F56C8D3C131F5E85000AD0F6 /* libtdb.dylib.1 */,
7241 7221 F56C8D3D131F5E85000AD0F6 /* libfreetype.dylib */,
7242 7222 F56C8D3E131F5E85000AD0F6 /* libfontconfig.dylib */,
7243 7223 F56C8D3F131F5E85000AD0F6 /* libmysqlclient.dylib */,
@@ -7246,6 +7226,7 @@
7246 7226 E38E24250D26317D00618676 /* libGLEW.dylib */,
7247 7227 F57A1E39132AAB0E00498CC7 /* libSDL.dylib */,
7248 7228 F57A1E3C132AAB1A00498CC7 /* libSDL_mixer.dylib */,
  7229 + F5B138641330811D0045076D /* libmicrohttpd.dylib */,
7249 7230 );
7250 7231 name = "External Libs";
7251 7232 sourceTree = "<group>";
@@ -7259,7 +7240,6 @@
7259 7240 F5A7A6F61128934C0059D6AA /* http-api.a */,
7260 7241 F5A7A6F3112893440059D6AA /* json-rpc.a */,
7261 7242 F5A7A6F0112893330059D6AA /* libjsoncpp.a */,
7262   - F5A7A8121128F4DA0059D6AA /* libmicrohttpd.a */,
7263 7243 F5A1C86A0F6B048000A96ABD /* x86 */,
7264 7244 F5A1C8690F6B047D00A96ABD /* ppc */,
7265 7245 );
@@ -7471,7 +7451,7 @@
7471 7451 08FB7793FE84155DC02AAC07 /* Project object */ = {
7472 7452 isa = PBXProject;
7473 7453 buildConfigurationList = 1DEB924B08733DCA0010E9CD /* Build configuration list for PBXProject "XBMC" */;
7474   - compatibilityVersion = "Xcode 2.4";
  7454 + compatibilityVersion = "Xcode 3.1";
7475 7455 developmentRegion = English;
7476 7456 hasScannedForEncodings = 1;
7477 7457 knownRegions = (
@@ -7506,7 +7486,7 @@
7506 7486 );
7507 7487 runOnlyForDeploymentPostprocessing = 0;
7508 7488 shellPath = /bin/sh;
7509   - shellScript = "#set -x\n\nEXTERNAL_LIBS=/Users/Shared/xbmc-depends/osx-10.4_i386\n\nTARGET_NAME=$PRODUCT_NAME\nTARGET_CONTENTS=$TARGET_BUILD_DIR/$TARGET_NAME/Contents\n\nTARGET_BINARY=$TARGET_CONTENTS/MacOS/XBMC\nTARGET_FRAMEWORKS=$TARGET_CONTENTS/Frameworks\nDYLIB_NAMEPATH=@executable_path/../Frameworks\nXBMC_HOME=$TARGET_CONTENTS/Resources/XBMC\n\nmkdir -p \"$TARGET_CONTENTS/MacOS\"\nmkdir -p \"$TARGET_CONTENTS/Resources\"\nmkdir -p \"$TARGET_CONTENTS/Frameworks\"\n\ncp -f \"$TARGET_BUILD_DIR/XBMC\" \"$TARGET_BINARY\"\ncp -f \"$SRCROOT/media/xbmc.icns\" \"$TARGET_CONTENTS/Resources/\"\ncp -f \"$SRCROOT/xbmc/osx/Info.plist\" \"$TARGET_CONTENTS/\"\n\n# start clean so we don't keep old dylibs\nrm -rf \"$TARGET_CONTENTS/Frameworks/*\"\n\n# rsync command for packaging external python\nmkdir -p \"$TARGET_CONTENTS\"/Frameworks/usr/lib\nPYTHONSYNC=\"rsync -av --exclude .DS_Store --exclude *.a --exclude test --exclude tests\"\n${PYTHONSYNC} \"$EXTERNAL_LIBS/lib/python2.6\" \"$TARGET_FRAMEWORKS/usr/lib/\"\nrm -rf \"$TARGET_FRAMEWORKS/usr/lib/python2.6/config\"\n\n# Copy all of XBMC's dylib dependencies and rename their locations to inside the Framework\necho \"Checking $TARGET_BINARY\"\nfor a in $(otool -L \"$TARGET_BINARY\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do \n\techo \"Processing $a\"\n\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$TARGET_BINARY\"\ndone\nls $TARGET_FRAMEWORKS/*\n\nREWIND=\"1\"\n# Copy all the *.so dylib dependencies and rename their locations to inside the Framework\necho \"Checking $TARGET_FRAMEWORKS/usr/lib for so files\"\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$TARGET_FRAMEWORKS\"/usr/lib -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\t\t\t\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\techo \" changing $a to $DYLIB_NAMEPATH/$(basename $a)\"\n\t\t\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\nls $TARGET_FRAMEWORKS/*\n\nREWIND=\"1\"\n# Copy all the *osx.so dylib dependencies and rename their locations to inside the Framework\necho \"Checking $XBMC_HOME/system for so files\"\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$XBMC_HOME\"/system -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_FRAMEWORKS\"\n\t\t\t\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\techo \" changing $a to $DYLIB_NAMEPATH/$(basename $a)\"\n\t\t\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\nls $TARGET_FRAMEWORKS/*\n\nREWIND=\"1\"\n# Copy all the addon/*.so dylib dependencies and rename their locations to inside the Framework\necho \"Checking $XBMC_HOME/addon for so files\"\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$XBMC_HOME\"/addons -name \"*.so\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\t\t\t\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\techo \" changing $a to $DYLIB_NAMEPATH/$(basename $a)\"\n\t\t\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\nls $TARGET_FRAMEWORKS/*\n\nREWIND=\"1\"\n# Copy all the addon/*.xbs dylib dependencies and rename their locations to inside the Framework\necho \"Checking $XBMC_HOME/addon for xbs files\"\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in $(find \"$XBMC_HOME\"/addons -name \"*.xbs\" -print) ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\t\t\t\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\techo \" changing $a to $DYLIB_NAMEPATH/$(basename $a)\"\n\t\t\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$b\"\n\t\tdone \n\tdone\ndone\nls $TARGET_FRAMEWORKS/*\n\nREWIND=\"1\"\n# Copy all the dylib dependencies and rename their locations to inside the Framework\necho \"Checking $TARGET_FRAMEWORKS for dylib files\"\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in \"$TARGET_FRAMEWORKS/\"*dylib* ; do\n\t\techo \"Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n\t\t\techo \" Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n\t\t\t\techo \" Copying $a to Frameworks\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\t\t\t\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\techo \" changing $a to $DYLIB_NAMEPATH/$(basename $a)\"\n\t\t\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$TARGET_FRAMEWORKS/$(basename $b)\"\n\t\tdone \n\tdone\ndone\nls $TARGET_FRAMEWORKS/*\n";
  7489 + shellScript = "#set -x\n\nfunction check_dyloaded_depends\n{\n b=$(find \"$EXTERNAL_LIBS\" -name $1 -print)\n if [ -f \"$b\" ]; then\n #echo \"Processing $b\"\n if [ ! -f \"$TARGET_FRAMEWORKS/$(basename $b)\" ]; then\n echo \" Packaging $b\"\n cp -f \"$b\" \"$TARGET_FRAMEWORKS/\"\n chmod u+w \"$TARGET_FRAMEWORKS/$(basename $b)\"\n fi\n for a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n if [ -f \"$a\" ]; then\n if [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n echo \" Packaging $a\"\n cp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n chmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n install_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$TARGET_FRAMEWORKS/$(basename $b)\"\n fi\n fi\n done \n fi\n}\n\nfunction check_xbmc_dylib_depends\n{\n REWIND=\"1\"\n while [ $REWIND = \"1\" ]\n do\n let REWIND=\"0\"\n for b in $(find \"$1\" -name \"$2\" -print) ; do\n #echo \"Processing $b\"\n for a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n #echo \" Packaging $a\"\n if [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n echo \" Packaging $a\"\n cp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n chmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n let REWIND=\"1\"\n fi\n install_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$b\"\n done\n done\n done\n}\n\nEXTERNAL_LIBS=/Users/Shared/xbmc-depends/osx-10.4_i386\n\nTARGET_NAME=$PRODUCT_NAME\nTARGET_CONTENTS=$TARGET_BUILD_DIR/$TARGET_NAME/Contents\n\nTARGET_BINARY=$TARGET_CONTENTS/MacOS/XBMC\nTARGET_FRAMEWORKS=$TARGET_CONTENTS/Frameworks\nDYLIB_NAMEPATH=@executable_path/../Frameworks\nXBMC_HOME=$TARGET_CONTENTS/Resources/XBMC\n\nmkdir -p \"$TARGET_CONTENTS/MacOS\"\nmkdir -p \"$TARGET_CONTENTS/Resources\"\n# start clean so we don't keep old dylibs\nrm -rf \"$TARGET_CONTENTS/Frameworks\"\nmkdir -p \"$TARGET_CONTENTS/Frameworks\"\n\necho \"Package $TARGET_BUILD_DIR/XBMC\"\ncp -f \"$TARGET_BUILD_DIR/XBMC\" \"$TARGET_BINARY\"\ncp -f \"$SRCROOT/media/xbmc.icns\" \"$TARGET_CONTENTS/Resources/\"\ncp -f \"$SRCROOT/xbmc/osx/Info.plist\" \"$TARGET_CONTENTS/\"\n\n# Copy all of XBMC's dylib dependencies and rename their locations to inside the Framework\necho \"Checking $TARGET_BINARY dylib dependencies\"\nfor a in $(otool -L \"$TARGET_BINARY\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do \n\techo \" Packaging $a\"\n\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$TARGET_BINARY\"\ndone\n\necho \"Package $EXTERNAL_LIBS/lib/python2.6\"\nmkdir -p \"$TARGET_CONTENTS/Frameworks/lib\"\nPYTHONSYNC=\"rsync -aq --exclude .DS_Store --exclude *.a --exclude *.exe --exclude test --exclude tests\"\n${PYTHONSYNC} \"$EXTERNAL_LIBS/lib/python2.6\" \"$TARGET_FRAMEWORKS/lib/\"\nrm -rf \"$TARGET_FRAMEWORKS/lib/python2.6/config\"\n\necho \"Checking $TARGET_FRAMEWORKS/lib/python2.6 *.so for dylib dependencies\"\ncheck_xbmc_dylib_depends \"$TARGET_FRAMEWORKS\"/lib/python2.6 \"*.so\"\n\necho \"Checking $XBMC_HOME/system *.so for dylib dependencies\"\ncheck_xbmc_dylib_depends \"$XBMC_HOME\"/system \"*.so\"\n\necho \"Checking $XBMC_HOME/addons *.so for dylib dependencies\"\ncheck_xbmc_dylib_depends \"$XBMC_HOME\"/addons \"*.so\"\n\necho \"Checking $XBMC_HOME/addons *.xbs for dylib dependencies\"\ncheck_xbmc_dylib_depends \"$XBMC_HOME\"/addons \"*.xbs\"\n\necho \"Checking xbmc/DllPaths_generated.h for dylib dependencies\"\nfor a in $(grep .dylib \"$SRCROOT\"/xbmc/DllPaths_generated.h | awk '{print $3}' | sed s/\\\"//g) ; do\n check_dyloaded_depends $a\ndone\n\necho \"Checking $TARGET_FRAMEWORKS for missing dylib dependencies\"\nREWIND=\"1\"\nwhile [ $REWIND = \"1\" ]\ndo\n\tlet REWIND=\"0\"\n\tfor b in \"$TARGET_FRAMEWORKS/\"*dylib* ; do\n\t\t#echo \" Processing $b\"\n\t\tfor a in $(otool -L \"$b\" | grep \"$EXTERNAL_LIBS\" | awk ' { print $1 } ') ; do\n\t\t\t#echo \"Processing $a\"\n\t\t\tif [ ! -f \"$TARGET_FRAMEWORKS/$(basename $a)\" ]; then\n\t\t\t\techo \" Packaging $a\"\n\t\t\t\tcp -f \"$a\" \"$TARGET_FRAMEWORKS/\"\n\t\t\t\tchmod u+w \"$TARGET_FRAMEWORKS/$(basename $a)\"\n\t\t\t\tlet REWIND=\"1\"\n\t\t\tfi\n\t\t\tinstall_name_tool -change \"$a\" \"$DYLIB_NAMEPATH/$(basename $a)\" \"$TARGET_FRAMEWORKS/$(basename $b)\"\n\t\tdone \n\tdone\ndone\n";
7510 7490 };
7511 7491 81B8FC150E7D927A00354E2E /* update version info */ = {
7512 7492 isa = PBXShellScriptBuildPhase;
@@ -7534,7 +7514,7 @@
7534 7514 );
7535 7515 runOnlyForDeploymentPostprocessing = 0;
7536 7516 shellPath = /bin/bash;
7537   - shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \nSYNCSKIN=\"rsync -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/osx\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/osx\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi";
  7517 + shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \nSYNCSKIN=\"rsync -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/osx/XBMCHelper\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/org.xbmc.helper.plist\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/preflight\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi";
7538 7518 };
7539 7519 F5A1CBDF0F6B0B4700A96ABD /* copy frameworks */ = {
7540 7520 isa = PBXShellScriptBuildPhase;
@@ -7577,7 +7557,7 @@
7577 7557 );
7578 7558 runOnlyForDeploymentPostprocessing = 0;
7579 7559 shellPath = /bin/bash;
7580   - shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \nSYNCSKIN=\"rsync -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -av --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/osx\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/osx/XBMCHelper\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/org.xbmc.helper.plist\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/preflight\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi";
  7560 + shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\n#TARGET_NAME=XBMC.app\n#SRCROOT=/Users/Shared/xbmc_svn/XBMC\n#TARGET_BUILD_DIR=/Users/Shared/xbmc_svn/XBMC/build/Debug\n\n# rsync command with exclusions for items we don't want in the app package\nSYNC=\"rsync -aq --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *arm-osx.* --exclude *.zlib --exclude *.a\"\n\n# rsync command for excluding pngs and jpgs as well. Note that if the skin itself is not compiled\n# using XBMCTex then excluding the pngs and jpgs will most likely make the skin unusable \nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.png --exclude *.jpg --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude .DS_Store* --exclude skin.confluence\"\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/\"\n${SYNC} \"$SRCROOT/tools/osx/XBMCHelper\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/org.xbmc.helper.plist\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${SYNC} \"$SRCROOT/tools/osx/preflight\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/tools/\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/Contents/Resources/XBMC/extras/user\"\nfi\n\n\n\n# magic that gets the icon to update\ntouch \"$TARGET_BUILD_DIR/$TARGET_NAME\"\n\n# not sure we want to do this with out major testing, many scripts cannot handle the spaces in the app name\n#mv \"$TARGET_BUILD_DIR/$TARGET_NAME\" \"$TARGET_BUILD_DIR/XBMC Media Center.app\"\n\nfi";
7581 7561 showEnvVarsInLog = 0;
7582 7562 };
7583 7563 /* End PBXShellScriptBuildPhase section */
@@ -8502,6 +8482,8 @@
8502 8482 C8F3728B132A53E700E903AE /* PVRFile.cpp in Sources */,
8503 8483 C8F3728E132A541300E903AE /* DVDInputStreamPVRManager.cpp in Sources */,
8504 8484 C8F37293132A54F300E903AE /* Observer.cpp in Sources */,
  8485 + F57A1D1E1329B15300498CC7 /* AutoPool.mm in Sources */,
  8486 + F5B13C8D1334056B0045076D /* DarwinUtils.mm in Sources */,
8505 8487 );
8506 8488 runOnlyForDeploymentPostprocessing = 0;
8507 8489 };
@@ -9369,6 +9351,8 @@
9369 9351 7C4705AF12EF584C00369E51 /* AddonInstaller.cpp in Sources */,
9370 9352 18C1D22E13033F6A00CFFE59 /* GLUtils.cpp in Sources */,
9371 9353 7C84A59F12FA3C1600CD1714 /* SourcesDirectory.cpp in Sources */,
  9354 + F57A1D1F1329B15300498CC7 /* AutoPool.mm in Sources */,
  9355 + F5B13C8E1334056B0045076D /* DarwinUtils.mm in Sources */,
9372 9356 );
9373 9357 runOnlyForDeploymentPostprocessing = 0;
9374 9358 };
@@ -9440,22 +9424,18 @@
9440 9424 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)",
9441 9425 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)",
9442 9426 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)",
9443   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)",
9444   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)",
9445 9427 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)",
9446 9428 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)",
9447 9429 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)",
9448 9430 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)",
9449   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)",
  9431 + "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"",
  9432 + "\"$(SRCROOT)\"",
9450 9433 );
9451 9434 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
9452   - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10 = "\"$(SRCROOT)/lib/libmicrohttpd/src/daemon/.libs\"";
9453   - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11 = "\"$(SRCROOT)/lib/darwin/libSDL-OSX\"";
9454 9435 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12 = "\"$XBMC_DEPENDS/lib\"";
9455 9436 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13 = "\"$XBMC_DEPENDS/lib/mysql\"";
9456 9437 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14 = "\"$(SRCROOT)/xbmc/interfaces/http-api\"";
9457 9438 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15 = "\"$(SRCROOT)/xbmc/interfaces/json-rpc\"";
9458   - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
9459 9439 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/lib/libRTV\"";
9460 9440 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/lib/libXBMS\"";
9461 9441 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/lib/libXDAAP\"";
@@ -9531,22 +9511,18 @@
9531 9511 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_7)",
9532 9512 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_8)",
9533 9513 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_9)",
9534   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10)",
9535   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11)",
9536 9514 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12)",
9537 9515 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13)",
9538 9516 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14)",
9539 9517 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15)",
9540   - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16)",
  9518 + "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"",
  9519 + "\"$(SRCROOT)\"",
9541 9520 );
9542 9521 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)\"";
9543   - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_10 = "\"$(SRCROOT)/lib/libmicrohttpd/src/daemon/.libs\"";
9544   - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_11 = "\"$(SRCROOT)/lib/darwin/libSDL-OSX\"";
9545 9522 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_12 = "\"$XBMC_DEPENDS/lib\"";
9546 9523 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_13 = "\"$XBMC_DEPENDS/lib/mysql\"";
9547 9524 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_14 = "\"$(SRCROOT)/xbmc/interfaces/http-api\"";
9548 9525 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_15 = "\"$(SRCROOT)/xbmc/interfaces/json-rpc\"";
9549   - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_16 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
9550 9526 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/lib/libRTV\"";
9551 9527 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/lib/libXBMS\"";
9552 9528 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/lib/libXDAAP\"";
@@ -9580,7 +9556,7 @@
9580 9556 LIBRARY_SEARCH_PATHS = "";
9581 9557 MACOSX_DEPLOYMENT_TARGET = 10.4;
9582 9558 PREBINDING = NO;
9583   - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
  9559 + SDKROOT = macosx10.4;
9584 9560 USER_HEADER_SEARCH_PATHS = .;
9585 9561 VALID_ARCHS = "ppc i386";
9586 9562 };
@@ -9598,7 +9574,7 @@
9598 9574 LIBRARY_SEARCH_PATHS = "";
9599 9575 MACOSX_DEPLOYMENT_TARGET = 10.4;
9600 9576 PREBINDING = NO;
9601   - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
  9577 + SDKROOT = macosx10.4;
9602 9578 USER_HEADER_SEARCH_PATHS = .;
9603 9579 VALID_ARCHS = "ppc i386";
9604 9580 };
@@ -9675,9 +9651,7 @@
9675 9651 lib/cmyth/librefmem,
9676 9652 lib/libapetag/.libs,
9677 9653 lib/libsquish,
9678   - "lib/darwin/libSDL-OSX",
9679 9654 lib/jsoncpp/src/lib_json,
9680   - lib/libmicrohttpd/src/daemon/.libs,
9681 9655 "xbmc/interfaces/http-api",
9682 9656 "xbmc/interfaces/json-rpc",
9683 9657 /opt/local/lib,
@@ -9687,11 +9661,15 @@
9687 9661 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
9688 9662 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
9689 9663 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
  9664 + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
  9665 + "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"",
  9666 + "\"$(SRCROOT)\"",
9690 9667 );
9691 9668 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib\"";
9692 9669 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib/mysql\"";
9693 9670 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
9694 9671 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
  9672 + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
9695 9673 LINK_WITH_STANDARD_LIBRARIES = YES;
9696 9674 OTHER_LDFLAGS = (
9697 9675 "-headerpad_max_install_names",
@@ -9755,9 +9733,7 @@
9755 9733 lib/cmyth/librefmem,
9756 9734 lib/libapetag/.libs,
9757 9735 lib/libsquish,
9758   - "lib/darwin/libSDL-OSX",
9759 9736 lib/jsoncpp/src/lib_json,
9760   - lib/libmicrohttpd/src/daemon/.libs,
9761 9737 "xbmc/interfaces/http-api",
9762 9738 "xbmc/interfaces/json-rpc",
9763 9739 /opt/local/lib,
@@ -9767,11 +9743,15 @@
9767 9743 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)",
9768 9744 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)",
9769 9745 "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)",
  9746 + "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)",
  9747 + "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"",
  9748 + "\"$(SRCROOT)\"",
9770 9749 );
9771 9750 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib\"";
9772 9751 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../xbmc-depends/ios-4.2_arm7/lib/mysql\"";
9773 9752 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
9774 9753 LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
  9754 + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../xbmc-depends/osx-10.4_i386/lib\"";
9775 9755 LINK_WITH_STANDARD_LIBRARIES = YES;
9776 9756 OTHER_LDFLAGS = (
9777 9757 "-headerpad_max_install_names",
6 addons/library.xbmc.addon/libXBMC_addon.h
@@ -63,16 +63,16 @@ typedef enum queue_msg {
63 63 QUEUE_ERROR
64 64 } queue_msg_t;
65 65
66   -class cHelper_libXBMC_addon
  66 +class CHelper_libXBMC_addon
67 67 {
68 68 public:
69   - cHelper_libXBMC_addon()
  69 + CHelper_libXBMC_addon()
70 70 {
71 71 m_libXBMC_addon = NULL;
72 72 m_Handle = NULL;
73 73 }
74 74
75   - ~cHelper_libXBMC_addon()
  75 + ~CHelper_libXBMC_addon()
76 76 {
77 77 if (m_libXBMC_addon)
78 78 {
102 addons/library.xbmc.gui/libXBMC_gui.h
@@ -53,22 +53,22 @@ typedef void* GUIHANDLE;
53 53 #define ADDON_ACTION_PREVIOUS_MENU 10
54 54 #define ADDON_ACTION_CLOSE_DIALOG 51
55 55
56   -class cGUIWindow;
57   -class cGUISpinControl;
58   -class cGUIRadioButton;
59   -class cGUIProgressControl;
60   -class cListItem;
  56 +class CAddonGUIWindow;
  57 +class CAddonGUISpinControl;
  58 +class CAddonGUIRadioButton;
  59 +class CAddonGUIProgressControl;
  60 +class CAddonListItem;
61 61
62   -class cHelper_libXBMC_gui
  62 +class CHelper_libXBMC_gui
63 63 {
64 64 public:
65   - cHelper_libXBMC_gui()
  65 + CHelper_libXBMC_gui()
66 66 {
67 67 m_libXBMC_gui = NULL;
68 68 m_Handle = NULL;
69 69 }
70 70
71   - ~cHelper_libXBMC_gui()
  71 + ~CHelper_libXBMC_gui()
72 72 {
73 73 if (m_libXBMC_gui)
74 74 {
@@ -120,43 +120,43 @@ class cHelper_libXBMC_gui
120 120 dlsym(m_libXBMC_gui, "GUI_get_video_resolution");
121 121 if (GetVideoResolution == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
122 122
123   - Window_create = (cGUIWindow* (*)(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog))
  123 + Window_create = (CAddonGUIWindow* (*)(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog))
124 124 dlsym(m_libXBMC_gui, "GUI_Window_create");
125 125 if (Window_create == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
126 126
127   - Window_destroy = (void (*)(cGUIWindow* p))
  127 + Window_destroy = (void (*)(CAddonGUIWindow* p))
128 128 dlsym(m_libXBMC_gui, "GUI_Window_destroy");
129 129 if (Window_destroy == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
130 130
131   - Control_getSpin = (cGUISpinControl* (*)(cGUIWindow *window, int controlId))
  131 + Control_getSpin = (CAddonGUISpinControl* (*)(CAddonGUIWindow *window, int controlId))
132 132 dlsym(m_libXBMC_gui, "GUI_control_get_spin");
133 133 if (Control_getSpin == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
134 134
135   - Control_releaseSpin = (void (*)(cGUISpinControl* p))
  135 + Control_releaseSpin = (void (*)(CAddonGUISpinControl* p))
136 136 dlsym(m_libXBMC_gui, "GUI_control_release_spin");
137 137 if (Control_releaseSpin == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
138 138
139   - Control_getRadioButton = (cGUIRadioButton* (*)(cGUIWindow *window, int controlId))
  139 + Control_getRadioButton = (CAddonGUIRadioButton* (*)(CAddonGUIWindow *window, int controlId))
140 140 dlsym(m_libXBMC_gui, "GUI_control_get_radiobutton");
141 141 if (Control_getRadioButton == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
142 142
143   - Control_releaseRadioButton = (void (*)(cGUIRadioButton* p))
  143 + Control_releaseRadioButton = (void (*)(CAddonGUIRadioButton* p))
144 144 dlsym(m_libXBMC_gui, "GUI_control_release_radiobutton");
145 145 if (Control_releaseRadioButton == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
146 146
147   - Control_getProgress = (cGUIProgressControl* (*)(cGUIWindow *window, int controlId))
  147 + Control_getProgress = (CAddonGUIProgressControl* (*)(CAddonGUIWindow *window, int controlId))
148 148 dlsym(m_libXBMC_gui, "GUI_control_get_progress");
149 149 if (Control_getProgress == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
150 150
151   - Control_releaseProgress = (void (*)(cGUIProgressControl* p))
  151 + Control_releaseProgress = (void (*)(CAddonGUIProgressControl* p))
152 152 dlsym(m_libXBMC_gui, "GUI_control_release_progress");
153 153 if (Control_releaseProgress == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
154 154
155   - ListItem_create = (cListItem* (*)(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path))
  155 + ListItem_create = (CAddonListItem* (*)(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path))
156 156 dlsym(m_libXBMC_gui, "GUI_ListItem_create");
157 157 if (ListItem_create == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
158 158
159   - ListItem_destroy = (void (*)(cListItem* p))
  159 + ListItem_destroy = (void (*)(CAddonListItem* p))
160 160 dlsym(m_libXBMC_gui, "GUI_ListItem_destroy");
161 161 if (ListItem_destroy == NULL) { fprintf(stderr, "Unable to assign function %s\n", dlerror()); return false; }
162 162
@@ -169,16 +169,16 @@ class cHelper_libXBMC_gui
169 169 int (*GetScreenHeight)();
170 170 int (*GetScreenWidth)();
171 171 int (*GetVideoResolution)();
172   - cGUIWindow* (*Window_create)(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog);
173   - void (*Window_destroy)(cGUIWindow* p);
174   - cGUISpinControl* (*Control_getSpin)(cGUIWindow *window, int controlId);
175   - void (*Control_releaseSpin)(cGUISpinControl* p);
176   - cGUIRadioButton* (*Control_getRadioButton)(cGUIWindow *window, int controlId);
177   - void (*Control_releaseRadioButton)(cGUIRadioButton* p);
178   - cGUIProgressControl* (*Control_getProgress)(cGUIWindow *window, int controlId);
179   - void (*Control_releaseProgress)(cGUIProgressControl* p);
180   - cListItem* (*ListItem_create)(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path);
181   - void (*ListItem_destroy)(cListItem* p);
  172 + CAddonGUIWindow* (*Window_create)(const char *xmlFilename, const char *defaultSkin, bool forceFallback, bool asDialog);
  173 + void (*Window_destroy)(CAddonGUIWindow* p);
  174 + CAddonGUISpinControl* (*Control_getSpin)(CAddonGUIWindow *window, int controlId);
  175 + void (*Control_releaseSpin)(CAddonGUISpinControl* p);
  176 + CAddonGUIRadioButton* (*Control_getRadioButton)(CAddonGUIWindow *window, int controlId);
  177 + void (*Control_releaseRadioButton)(CAddonGUIRadioButton* p);
  178 + CAddonGUIProgressControl* (*Control_getProgress)(CAddonGUIWindow *window, int controlId);
  179 + void (*Control_releaseProgress)(CAddonGUIProgressControl* p);
  180 + CAddonListItem* (*ListItem_create)(const char *label, const char *label2, const char *iconImage, const char *thumbnailImage, const char *path);
  181 + void (*ListItem_destroy)(CAddonListItem* p);
182 182
183 183 protected:
184 184 int (*GUI_register_me)(void *HANDLE);
@@ -193,11 +193,11 @@ class cHelper_libXBMC_gui
193 193 };
194 194 };
195 195
196   -class cGUISpinControl
  196 +class CAddonGUISpinControl
197 197 {
198 198 public:
199   - cGUISpinControl(cGUIWindow *window, int controlId);
200   - virtual ~cGUISpinControl(void) {}
  199 + CAddonGUISpinControl(CAddonGUIWindow *window, int controlId);
  200 + virtual ~CAddonGUISpinControl(void) {}
201 201
202 202 virtual void SetVisible(bool yesNo);
203 203 virtual void SetText(const char *label);
@@ -207,16 +207,16 @@ class cGUISpinControl
207 207 virtual void SetValue(int iValue);
208 208
209 209 private:
210   - cGUIWindow *m_Window;
  210 + CAddonGUIWindow *m_Window;
211 211 int m_ControlId;
212 212 GUIHANDLE m_SpinHandle;
213