Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into pvr-ppa

  • Loading branch information...
commit b485416c410db9981a33e9935581e99b732da19c 2 parents 615e173 + 38ce959
@opdenkamp opdenkamp authored
Showing with 9,683 additions and 18,467 deletions.
  1. +16 −12 .gitignore
  2. +6 −13 Makefile.in
  3. +2 −2 Makefile.include.in
  4. +11 −7 README.ios
  5. +3 −3 README.linux
  6. +6 −3 README.osx
  7. +2 −2 README.ubuntu
  8. +130 −95 XBMC-ATV2.xcodeproj/project.pbxproj
  9. +128 −95 XBMC-IOS.xcodeproj/project.pbxproj
  10. +168 −109 XBMC.xcodeproj/project.pbxproj
  11. +2 −2 addons/skin.confluence/720p/DialogAddonInfo.xml
  12. +1 −0  addons/skin.confluence/720p/DialogContextMenu.xml
  13. +1 −1  addons/skin.confluence/720p/DialogSeekBar.xml
  14. +47 −4 addons/skin.confluence/720p/Home.xml
  15. +97 −6 addons/skin.confluence/720p/IncludesHomeMenuItems.xml
  16. +326 −248 addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml
  17. +1 −1  addons/skin.confluence/720p/Settings.xml
  18. +3 −3 addons/skin.confluence/720p/ViewsAddonBrowser.xml
  19. +2 −2 addons/skin.confluence/720p/ViewsMusicLibrary.xml
  20. +125 −483 addons/skin.confluence/720p/custom_SkinSetting_1111.xml
  21. +5 −5 addons/skin.confluence/720p/includes.xml
  22. +1 −1  addons/skin.confluence/build.bat
  23. +2 −3 addons/skin.confluence/colors/defaults.xml
  24. +13 −0 addons/skin.confluence/language/Catalan/strings.xml
  25. +12 −0 addons/skin.confluence/language/Chinese (Simple)/strings.xml
  26. +31 −4 addons/skin.confluence/language/Dutch/strings.xml
  27. +2 −2 addons/skin.confluence/language/English/strings.xml
  28. +31 −3 addons/skin.confluence/language/French/strings.xml
  29. +10 −4 addons/skin.confluence/language/German/strings.xml
  30. +7 −7 addons/skin.confluence/language/Icelandic/strings.xml
  31. +1 −1  addons/skin.confluence/language/Japanese/strings.xml
  32. +193 −0 addons/skin.confluence/language/Slovenian/strings.xml
  33. BIN  addons/skin.confluence/media/flagging/audio/10.png
  34. BIN  addons/skin.confluence/media/flagging/audio/3.png
  35. BIN  addons/skin.confluence/media/flagging/audio/4.png
  36. BIN  addons/skin.confluence/media/flagging/audio/5.png
  37. BIN  addons/skin.confluence/media/flagging/audio/7.png
  38. BIN  addons/skin.confluence/media/flagging/lists/1080.png
  39. BIN  addons/skin.confluence/media/flagging/lists/720.png
  40. +12 −1 addons/visualization.milkdrop/resources/language/Dutch/strings.xml
  41. +8 −0 addons/visualization.projectm/resources/language/Dutch/strings.xml
  42. +116 −35 addons/webinterface.default/css/core.css
  43. +1 −1  addons/webinterface.default/index.html
  44. +24 −0 addons/webinterface.default/js/Core.js
  45. +204 −64 addons/webinterface.default/js/MediaLibrary.js
  46. +16 −7 addons/webinterface.default/js/NowPlayingManager.js
  47. +110 −39 configure.in
  48. +21 −0 language/Basque/langinfo.xml
  49. +2,280 −0 language/Basque/strings.xml
  50. +26 −21 language/Catalan/strings.xml
  51. +222 −17 language/Chinese (Traditional)/strings.xml
  52. +222 −23 language/Dutch/strings.xml
  53. +12 −0 language/English/strings.xml
  54. +434 −3 language/French/strings.xml
  55. +5 −1 language/German/strings.xml
  56. +19 −19 language/Icelandic/strings.xml
  57. +236 −2 language/Polish/strings.xml
  58. +9 −2 language/Slovenian/langinfo.xml
  59. +2,156 −1,249 language/Slovenian/strings.xml
  60. +5 −7 lib/DllAvCodec.h
  61. +249 −0 lib/DllAvFilter.h
  62. +19 −0 lib/DllAvUtil.h
  63. +15 −15 lib/DllPostProc.h
  64. +0 −163 lib/DllWAVPack.h
  65. +17 −1 lib/Makefile.in
  66. +6 −0 lib/SlingboxLib/Makefile
  67. +986 −0 lib/SlingboxLib/SlingboxLib.cpp
  68. +408 −0 lib/SlingboxLib/SlingboxLib.h
  69. +9 −9 lib/UnrarXLib/extract.cpp
  70. +7 −7 lib/UnrarXLib/rdwrfn.cpp
  71. +6 −5 lib/UnrarXLib/rdwrfn.hpp
  72. +3 −3 lib/UnrarXLib/unpack.cpp
  73. +1 −1  lib/UnrarXLib/unpack15.cpp
  74. +1 −1  lib/addons/script.module.pil/Makefile.in
  75. +3 −2 lib/asap/mads/Makefile
  76. +6 −1 lib/asap/win32/build_xbmc_win32.sh
  77. +16 −5 lib/cmyth/libcmyth/connection.c
  78. +0 −1  lib/cximage-6.0/Makefile.in
  79. +10 −3 lib/ffmpeg/build_xbmc_win32.sh
  80. +1 −0  lib/ffmpeg/libavcodec/dvbsubdec.c
  81. +2 −0  lib/ffmpeg/libavcodec/dxva2.h
  82. +15 −2 lib/ffmpeg/libavcodec/dxva2_h264.c
  83. +1 −1  lib/ffmpeg/libavcodec/mpegvideo.c
  84. +30 −3 lib/ffmpeg/libavfilter/vf_yadif.c
  85. +68 −0 lib/ffmpeg/libavformat/flvdec.c
  86. +105 −0 lib/ffmpeg/patches/0047-Backporting-ffmpeg-feature-to-parse-flv-fileposition.patch
  87. +31 −0 lib/ffmpeg/patches/0048-Dont-mark-genereted-dummy-frame-as-keyframe.patch
  88. +70 −0 lib/ffmpeg/patches/0049-Added-ability-to-enable-workaround-for-dxva2-decodin.patch
  89. +25 −0 lib/ffmpeg/patches/0050-Patch-for-memory-leaks-in-DVB-subtitles-decoder.patch
  90. +0 −1  lib/jsoncpp/AUTHORS
  91. +0 −132 lib/jsoncpp/README.txt
  92. +0 −248 lib/jsoncpp/SConstruct
  93. +0 −1,534 lib/jsoncpp/doc/doxyfile.in
  94. +0 −23 lib/jsoncpp/doc/footer.html
  95. +0 −24 lib/jsoncpp/doc/header.html
  96. +0 −126 lib/jsoncpp/doc/jsoncpp.dox
  97. +0 −1  lib/jsoncpp/doc/readme.txt
  98. +0 −45 lib/jsoncpp/doc/roadmap.dox
  99. +0 −24 lib/jsoncpp/include/json/autolink.h
  100. +0 −82 lib/jsoncpp/include/json/config.h
  101. +0 −47 lib/jsoncpp/include/json/features.h
  102. +0 −42 lib/jsoncpp/include/json/forwards.h
  103. +0 −15 lib/jsoncpp/include/json/json.h
  104. +0 −201 lib/jsoncpp/include/json/reader.h
  105. +0 −1,101 lib/jsoncpp/include/json/value.h
  106. +0 −183 lib/jsoncpp/include/json/writer.h
  107. +0 −46 lib/jsoncpp/makefiles/vs71/jsoncpp.sln
  108. +0 −119 lib/jsoncpp/makefiles/vs71/jsontest.vcproj
  109. +0 −214 lib/jsoncpp/makefiles/vs71/lib_json.vcproj
  110. +0 −130 lib/jsoncpp/makefiles/vs71/test_lib_json.vcproj
  111. +0 −53 lib/jsoncpp/scons-tools/globtool.py
  112. +0 −179 lib/jsoncpp/scons-tools/srcdist.py
  113. +0 −79 lib/jsoncpp/scons-tools/substinfile.py
  114. +0 −82 lib/jsoncpp/scons-tools/targz.py
  115. +0 −269 lib/jsoncpp/src/jsontestrunner/main.cpp
  116. +0 −9 lib/jsoncpp/src/jsontestrunner/sconscript
  117. +0 −9 lib/jsoncpp/src/lib_json/Makefile.in
  118. +0 −130 lib/jsoncpp/src/lib_json/json_batchallocator.h
  119. +0 −453 lib/jsoncpp/src/lib_json/json_internalarray.inl
  120. +0 −612 lib/jsoncpp/src/lib_json/json_internalmap.inl
  121. +0 −870 lib/jsoncpp/src/lib_json/json_reader.cpp
  122. +0 −93 lib/jsoncpp/src/lib_json/json_tool.h
  123. +0 −1,840 lib/jsoncpp/src/lib_json/json_value.cpp
  124. +0 −297 lib/jsoncpp/src/lib_json/json_valueiterator.inl
  125. +0 −836 lib/jsoncpp/src/lib_json/json_writer.cpp
  126. +0 −8 lib/jsoncpp/src/lib_json/sconscript
  127. +0 −608 lib/jsoncpp/src/test_lib_json/jsontest.cpp
  128. +0 −259 lib/jsoncpp/src/test_lib_json/jsontest.h
  129. +0 −271 lib/jsoncpp/src/test_lib_json/main.cpp
  130. +0 −10 lib/jsoncpp/src/test_lib_json/sconscript
  131. +0 −10 lib/jsoncpp/test/cleantests.py
  132. +0 −1  lib/jsoncpp/test/data/test_array_01.expected
  133. +0 −1  lib/jsoncpp/test/data/test_array_01.json
  134. +0 −2  lib/jsoncpp/test/data/test_array_02.expected
  135. +0 −1  lib/jsoncpp/test/data/test_array_02.json
  136. +0 −6 lib/jsoncpp/test/data/test_array_03.expected
  137. +0 −1  lib/jsoncpp/test/data/test_array_03.json
  138. +0 −5 lib/jsoncpp/test/data/test_array_04.expected
  139. +0 −1  lib/jsoncpp/test/data/test_array_04.json
  140. +0 −100 lib/jsoncpp/test/data/test_array_05.expected
  141. +0 −1  lib/jsoncpp/test/data/test_array_05.json
  142. +0 −5 lib/jsoncpp/test/data/test_array_06.expected
  143. +0 −4 lib/jsoncpp/test/data/test_array_06.json
  144. +0 −1  lib/jsoncpp/test/data/test_basic_01.expected
  145. +0 −1  lib/jsoncpp/test/data/test_basic_01.json
  146. +0 −1  lib/jsoncpp/test/data/test_basic_02.expected
  147. +0 −1  lib/jsoncpp/test/data/test_basic_02.json
  148. +0 −3  lib/jsoncpp/test/data/test_basic_03.expected
  149. +0 −3  lib/jsoncpp/test/data/test_basic_03.json
  150. +0 −2  lib/jsoncpp/test/data/test_basic_04.expected
  151. +0 −2  lib/jsoncpp/test/data/test_basic_04.json
  152. +0 −2  lib/jsoncpp/test/data/test_basic_05.expected
  153. +0 −2  lib/jsoncpp/test/data/test_basic_05.json
  154. +0 −2  lib/jsoncpp/test/data/test_basic_06.expected
  155. +0 −2  lib/jsoncpp/test/data/test_basic_06.json
  156. +0 −2  lib/jsoncpp/test/data/test_basic_07.expected
  157. +0 −2  lib/jsoncpp/test/data/test_basic_07.json
  158. +0 −2  lib/jsoncpp/test/data/test_basic_08.expected
  159. +0 −3  lib/jsoncpp/test/data/test_basic_08.json
  160. +0 −2  lib/jsoncpp/test/data/test_basic_09.expected
  161. +0 −4 lib/jsoncpp/test/data/test_basic_09.json
  162. +0 −8 lib/jsoncpp/test/data/test_comment_01.expected
  163. +0 −8 lib/jsoncpp/test/data/test_comment_01.json
  164. +0 −20 lib/jsoncpp/test/data/test_complex_01.expected
  165. +0 −17 lib/jsoncpp/test/data/test_complex_01.json
  166. +0 −1  lib/jsoncpp/test/data/test_integer_01.expected
  167. +0 −2  lib/jsoncpp/test/data/test_integer_01.json
  168. +0 −1  lib/jsoncpp/test/data/test_integer_02.expected
  169. +0 −2  lib/jsoncpp/test/data/test_integer_02.json
  170. +0 −1  lib/jsoncpp/test/data/test_integer_03.expected
  171. +0 −2  lib/jsoncpp/test/data/test_integer_03.json
  172. +0 −2  lib/jsoncpp/test/data/test_integer_04.expected
  173. +0 −3  lib/jsoncpp/test/data/test_integer_04.json
  174. +0 −2  lib/jsoncpp/test/data/test_integer_05.expected
  175. +0 −2  lib/jsoncpp/test/data/test_integer_05.json
  176. +0 −1  lib/jsoncpp/test/data/test_integer_06_64bits.expected
  177. +0 −2  lib/jsoncpp/test/data/test_integer_06_64bits.json
  178. +0 −1  lib/jsoncpp/test/data/test_integer_07_64bits.expected
  179. +0 −2  lib/jsoncpp/test/data/test_integer_07_64bits.json
  180. +0 −1  lib/jsoncpp/test/data/test_integer_08_64bits.expected
  181. +0 −2  lib/jsoncpp/test/data/test_integer_08_64bits.json
  182. +0 −2,122 lib/jsoncpp/test/data/test_large_01.expected
  183. +0 −2  lib/jsoncpp/test/data/test_large_01.json
  184. +0 −1  lib/jsoncpp/test/data/test_object_01.expected
  185. +0 −1  lib/jsoncpp/test/data/test_object_01.json
  186. +0 −2  lib/jsoncpp/test/data/test_object_02.expected
  187. +0 −1  lib/jsoncpp/test/data/test_object_02.json
  188. +0 −4 lib/jsoncpp/test/data/test_object_03.expected
  189. +0 −5 lib/jsoncpp/test/data/test_object_03.json
  190. +0 −2  lib/jsoncpp/test/data/test_object_04.expected
  191. +0 −3  lib/jsoncpp/test/data/test_object_04.json
  192. +0 −3  lib/jsoncpp/test/data/test_preserve_comment_01.expected
  193. +0 −14 lib/jsoncpp/test/data/test_preserve_comment_01.json
  194. +0 −2  lib/jsoncpp/test/data/test_real_01.expected
  195. +0 −3  lib/jsoncpp/test/data/test_real_01.json
  196. +0 −2  lib/jsoncpp/test/data/test_real_02.expected
  197. +0 −3  lib/jsoncpp/test/data/test_real_02.json
  198. +0 −2  lib/jsoncpp/test/data/test_real_03.expected
  199. +0 −3  lib/jsoncpp/test/data/test_real_03.json
  200. +0 −2  lib/jsoncpp/test/data/test_real_04.expected
  201. +0 −3  lib/jsoncpp/test/data/test_real_04.json
  202. +0 −3  lib/jsoncpp/test/data/test_real_05.expected
  203. +0 −3  lib/jsoncpp/test/data/test_real_05.json
  204. +0 −3  lib/jsoncpp/test/data/test_real_06.expected
  205. +0 −3  lib/jsoncpp/test/data/test_real_06.json
  206. +0 −3  lib/jsoncpp/test/data/test_real_07.expected
  207. +0 −3  lib/jsoncpp/test/data/test_real_07.json
  208. +0 −1  lib/jsoncpp/test/data/test_string_01.expected
  209. +0 −1  lib/jsoncpp/test/data/test_string_01.json
  210. +0 −1  lib/jsoncpp/test/data/test_string_02.expected
  211. +0 −1  lib/jsoncpp/test/data/test_string_02.json
  212. +0 −1  lib/jsoncpp/test/data/test_string_03.expected
  213. +0 −1  lib/jsoncpp/test/data/test_string_03.json
  214. +0 −1  lib/jsoncpp/test/data/test_string_unicode_01.expected
  215. +0 −1  lib/jsoncpp/test/data/test_string_unicode_01.json
  216. +0 −1  lib/jsoncpp/test/data/test_string_unicode_02.expected
  217. +0 −1  lib/jsoncpp/test/data/test_string_unicode_02.json
  218. +0 −1  lib/jsoncpp/test/data/test_string_unicode_03.expected
  219. +0 −1  lib/jsoncpp/test/data/test_string_unicode_03.json
  220. +0 −1  lib/jsoncpp/test/data/test_string_unicode_04.expected
  221. +0 −1  lib/jsoncpp/test/data/test_string_unicode_04.json
  222. +0 −2  lib/jsoncpp/test/data/test_string_unicode_05.expected
  223. +0 −1  lib/jsoncpp/test/data/test_string_unicode_05.json
  224. +0 −11 lib/jsoncpp/test/generate_expected.py
  225. +0 −1  lib/jsoncpp/test/jsonchecker/fail1.json
  226. +0 −1  lib/jsoncpp/test/jsonchecker/fail10.json
  227. +0 −1  lib/jsoncpp/test/jsonchecker/fail11.json
  228. +0 −1  lib/jsoncpp/test/jsonchecker/fail12.json
  229. +0 −1  lib/jsoncpp/test/jsonchecker/fail13.json
  230. +0 −1  lib/jsoncpp/test/jsonchecker/fail14.json
  231. +0 −1  lib/jsoncpp/test/jsonchecker/fail15.json
  232. +0 −1  lib/jsoncpp/test/jsonchecker/fail16.json
  233. +0 −1  lib/jsoncpp/test/jsonchecker/fail17.json
  234. +0 −1  lib/jsoncpp/test/jsonchecker/fail18.json
  235. +0 −1  lib/jsoncpp/test/jsonchecker/fail19.json
  236. +0 −1  lib/jsoncpp/test/jsonchecker/fail2.json
  237. +0 −1  lib/jsoncpp/test/jsonchecker/fail20.json
  238. +0 −1  lib/jsoncpp/test/jsonchecker/fail21.json
  239. +0 −1  lib/jsoncpp/test/jsonchecker/fail22.json
  240. +0 −1  lib/jsoncpp/test/jsonchecker/fail23.json
  241. +0 −1  lib/jsoncpp/test/jsonchecker/fail24.json
  242. +0 −1  lib/jsoncpp/test/jsonchecker/fail25.json
  243. +0 −1  lib/jsoncpp/test/jsonchecker/fail26.json
  244. +0 −2  lib/jsoncpp/test/jsonchecker/fail27.json
  245. +0 −2  lib/jsoncpp/test/jsonchecker/fail28.json
  246. +0 −1  lib/jsoncpp/test/jsonchecker/fail29.json
  247. +0 −1  lib/jsoncpp/test/jsonchecker/fail3.json
  248. +0 −1  lib/jsoncpp/test/jsonchecker/fail30.json
  249. +0 −1  lib/jsoncpp/test/jsonchecker/fail31.json
  250. +0 −1  lib/jsoncpp/test/jsonchecker/fail32.json
  251. +0 −1  lib/jsoncpp/test/jsonchecker/fail33.json
  252. +0 −1  lib/jsoncpp/test/jsonchecker/fail4.json
  253. +0 −1  lib/jsoncpp/test/jsonchecker/fail5.json
  254. +0 −1  lib/jsoncpp/test/jsonchecker/fail6.json
  255. +0 −1  lib/jsoncpp/test/jsonchecker/fail7.json
  256. +0 −1  lib/jsoncpp/test/jsonchecker/fail8.json
  257. +0 −1  lib/jsoncpp/test/jsonchecker/fail9.json
  258. +0 −58 lib/jsoncpp/test/jsonchecker/pass1.json
  259. +0 −1  lib/jsoncpp/test/jsonchecker/pass2.json
  260. +0 −6 lib/jsoncpp/test/jsonchecker/pass3.json
  261. +0 −3  lib/jsoncpp/test/jsonchecker/readme.txt
  262. +0 −64 lib/jsoncpp/test/pyjsontestrunner.py
  263. +0 −134 lib/jsoncpp/test/runjsontests.py
  264. +0 −73 lib/jsoncpp/test/rununittests.py
  265. +0 −6 lib/libRTV/GuideParser.cpp
  266. +8 −3 lib/libdvd/build-xbmc-win32.sh
  267. +8 −2 lib/libmpeg2/make-xbmc-lib-win32.sh
  268. +22 −15 {tools/osx/ios-depends/expat → lib/libnfs}/Makefile
  269. +12 −0 lib/libnfs/printf.patch
  270. +0 −28 lib/win32/libmicrohttpd_win32/AUTHORS
  271. +0 −510 lib/win32/libmicrohttpd_win32/COPYING
  272. +0 −412 lib/win32/libmicrohttpd_win32/ChangeLog
  273. +0 −365 lib/win32/libmicrohttpd_win32/INSTALL
  274. +0 −2  lib/win32/libmicrohttpd_win32/NEWS
  275. +0 −129 lib/win32/libmicrohttpd_win32/README
  276. BIN  lib/win32/libmicrohttpd_win32/bin/libgcrypt-11.dll
  277. BIN  lib/win32/libmicrohttpd_win32/bin/libgpg-error-0.dll
  278. BIN  lib/win32/libmicrohttpd_win32/bin/libiconv-2.dll
  279. BIN  lib/win32/libmicrohttpd_win32/bin/libintl-8.dll
  280. BIN  lib/win32/libmicrohttpd_win32/bin/libmicrohttpd-5.dll
  281. BIN  lib/win32/libmicrohttpd_win32/bin/libplibc-1.dll
  282. BIN  lib/win32/libmicrohttpd_win32/bin/pthreadGC2.dll
Sorry, we could not display the entire diff because too many files (1,309) changed.
View
28 .gitignore
@@ -1,8 +1,12 @@
# global patterns
+testMain
# commonly used editors
# vim
*.swp
+# Eclipse
+*.project
+*.cproject
# generated files etc
config.cache
@@ -142,6 +146,12 @@ autom4te.cache
# /lib/asap/
/lib/asap/Makefile
+/lib/asap/players.h
+/lib/asap/players/*.obx
+/lib/asap/win32/xbmc_asap.dll
+/lib/asap/win32/xbmc_asap.lib
+/lib/asap/xbmc/xbmc_asap.res
+
# /lib/addons/
/lib/addons/library.xbmc.addon/Makefile
@@ -244,10 +254,6 @@ lib/cmyth/Makefile
/lib/libass/m4/ltversion.m4
/lib/libass/m4/lt~obsolete.m4
-# /lib/libcdio
-/lib/libcdio/Debug
-/lib/libcdio/Release
-
# /lib/libiconv
/lib/libiconv/libiconv_win32/Debug
/lib/libiconv/libiconv_win32/Release
@@ -322,7 +328,8 @@ lib/cmyth/Makefile
/project/Win32BuildSetup/dependencies/pcre.dll
/project/Win32BuildSetup/dependencies/pcrecpp.dll
/project/Win32BuildSetup/dependencies/python26.dll
-project/Win32BuildSetup/dependencies/libcdio-10.dll
+/project/Win32BuildSetup/dependencies/libcdio-12.dll
+/project/Win32BuildSetup/dependencies/vcredist
# /project/Win32BuildSetup/
/project/Win32BuildSetup/BuildLog.htm
@@ -360,6 +367,7 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/project/VS2010Express/libs
/project/VS2010Express/objs
/project/VS2010Express/ipch
+/project/VS2010Express/*.vsp
# /skin/
/skin/Confluence/media/Textures.xbt
@@ -393,6 +401,7 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/system/players/dvdplayer/avcore-0.dll
/system/players/dvdplayer/avformat-52.dll
/system/players/dvdplayer/avutil-50.dll
+/system/players/dvdplayer/avfilter-1.dll
/system/players/dvdplayer/freetype6.dll
/system/players/dvdplayer/libass.dll
/system/players/dvdplayer/libdvdcss-2.dll
@@ -401,13 +410,12 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/system/players/dvdplayer/libfontconfig-1.dll
/system/players/dvdplayer/librtmp.dll
/system/players/dvdplayer/postproc-51.dll
-/system/players/dvdplayer/swscale-0.6.1.dll
+/system/players/dvdplayer/swscale-0.dll
/system/players/dvdplayer/libbluray.dll
/system/players/dvdplayer/libmpeg2-0.dll
/system/players/dvdplayer/libmad.dll
# /system/players/paplayer
-/system/players/paplayer/wavpack.dll
/system/players/paplayer/libmodplug.dll
/system/players/paplayer/StSoundLibrary.dll
/system/players/paplayer/vorbisfile.dll
@@ -674,6 +682,7 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/lib/libmpeg2/libtool
/lib/libmpeg2/configure.lineno
/lib/libmpeg2/Makefile
+/lib/libmpeg2/src/*.exe
# /lib/libmpeg2/doc/
/lib/libmpeg2/doc/Makefile
@@ -903,11 +912,6 @@ project/Win32BuildSetup/dependencies/libcdio-10.dll
/lib/win32/libsamplerate/libsamplerate_win32/Debug
/lib/win32/libsamplerate/libsamplerate_win32/Release
-# /lib/win32/libwavpack/
-/lib/win32/libwavpack/Makefile
-/lib/win32/libwavpack/Debug
-/lib/win32/libwavpack/Release
-
# /lib/win32/sqlite
/lib/win32/sqlite/libsqlite_win32/Debug
/lib/win32/sqlite/libsqlite_win32/Release
View
19 Makefile.in
@@ -64,6 +64,7 @@ BIN_DIRS= \
xbmc/dbwrappers \
lib/UnrarXLib \
lib/libsquish \
+ lib/SlingboxLib \
xbmc/visualizations \
xbmc/screensavers \
xbmc/pvr \
@@ -82,7 +83,6 @@ BIN_DIRS= \
xbmc/input/linux \
xbmc/osx \
xbmc/threads \
- xbmc/threads/posix \
xbmc/windowing \
ifeq (@USE_OPENGL@,1)
@@ -134,8 +134,7 @@ LIB_DIRS=\
lib/libid3tag \
lib/libapetag \
lib/cpluff \
- lib/xbmc-dll-symbols \
- lib/jsoncpp/src/lib_json
+ lib/xbmc-dll-symbols
SS_DIRS=\
xbmc/screensavers/rsxs-0.9/xbmc
@@ -352,8 +351,6 @@ lib/libUPnP/libupnp.a: force
$(MAKE) -C lib/libUPnP
lib/libXDAAP/libxdaap.a: force
$(MAKE) -C lib/libXDAAP
-lib/jsoncpp/src/lib_json/libjsoncpp.a: force
- $(MAKE) -C lib/jsoncpp/src/lib_json
xbmc/interfaces/http-api/http-api.a: force
$(MAKE) -C xbmc/interfaces/http-api
xbmc/interfaces/json-rpc/json-rpc.a: force
@@ -364,12 +361,10 @@ lib/UnrarXLib/UnrarXLib.a: force
$(MAKE) -C lib/UnrarXLib
lib/libsquish/libsquish.a: force
$(MAKE) -C lib/libsquish
+lib/SlingboxLib/SlingboxLib.a: force
+ $(MAKE) -C lib/SlingboxLib
xbmc/linux/linux.a: force
$(MAKE) -C xbmc/linux
-xbmc/threads/posix/threads_posix.a: force
- $(MAKE) -C xbmc/threads/posix
-xbmc/threads/darwin/threads_darwin.a: force
- $(MAKE) -C xbmc/threads/darwin
xbmc/addons/addons.a: force
$(MAKE) -C xbmc/addons
xbmc/settings/settings.a: force
@@ -489,7 +484,7 @@ xcode_depends: \
lib/libapetag/.libs/libapetag.a \
lib/libRTV/librtv.a \
lib/libXDAAP/libxdaap.a \
- lib/jsoncpp/src/lib_json/libjsoncpp.a
+ lib/SlingboxLib/SlingboxLib.a
# platform independend objects
OBJSXBMC= \
@@ -547,10 +542,10 @@ OBJSXBMC= \
xbmc/interfaces/interfaces.a \
xbmc/cdrip/cdrip.a \
xbmc/interfaces/json-rpc/json-rpc.a \
- lib/jsoncpp/src/lib_json/libjsoncpp.a \
xbmc/interfaces/http-api/http-api.a \
xbmc/dbwrappers/dbwrappers.a \
lib/libsquish/libsquish.a \
+ lib/SlingboxLib/SlingboxLib.a \
lib/libapetag/.libs/libapetag.a \
lib/xbmc-dll-symbols/dll-symbols.a \
xbmc/rendering/rendering.a \
@@ -580,7 +575,6 @@ ifeq ($(findstring osx,@ARCH@), osx)
OBJSXBMC += \
xbmc/osx/osx.a \
xbmc/windowing/osx/windowing_osx.a \
- xbmc/threads/darwin/threads_darwin.a \
xbmc/powermanagement/osx/powermanagement.a \
xbmc/network/osx/network.a \
xbmc/storage/osx/storage.a \
@@ -588,7 +582,6 @@ OBJSXBMC += \
else
OBJSXBMC += \
- xbmc/threads/posix/threads_posix.a \
xbmc/input/linux/input_linux.a \
xbmc/network/linux/network_linux.a \
xbmc/powermanagement/linux/powermanagement_linux.a \
View
4 Makefile.include.in
@@ -38,14 +38,14 @@ ifneq (@USE_EXTERNAL_FFMPEG@,1)
INCLUDES+=-I@abs_top_srcdir@/lib/ffmpeg
endif
INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
+INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
DEFINES+= \
- -D_LINUX \
+ @ARCH_DEFINES@ \
-D_FILE_DEFINED \
-D__STDC_CONSTANT_MACROS \
-DBIN_INSTALL_PATH="\"$(libdir)/xbmc\"" \
-DINSTALL_PATH="\"$(datarootdir)/xbmc\"" \
@SDL_DEFINES@ \
- @ARCH_DEFINES@ \
@DEFS@ \
ifeq ($(findstring osx,$(ARCH)), osx)
View
18 README.ios
@@ -14,7 +14,7 @@ TOC
-----------------------------------------------------------------------------
This is a platform port of XBMC for the Apple iOS operating system.
-The current build system is Xcode 3.2.5 and iOS SDK 4.2
+The current build system is Xcode 3.x and iOS SDK 4.2/4.3
There are two ways to build XBMC for Mac.
1) command-line or
@@ -50,8 +50,11 @@ The preferred version is Xcode 3.2.5 and iOS SDK 4.2.
-----------------------------------------------------------------------------
$ cd $HOME/XBMC
- $ sudo mkdir -p /usr/local/bin; sudo cp tools/osx/ios-depends/gas-preprocessor/gas-preprocessor.pl /usr/local/bin/
- $ make -C tools/osx/ios-depends
+ $ sudo mkdir -p /usr/local/bin; sudo cp tools/darwin/depends/gas-preprocessor/gas-preprocessor.pl /usr/local/bin/
+ $ cd tools/darwin/depends
+ $ ./bootstrap
+ $ ./configure --with-darwin=ios
+ $ make
-----------------------------------------------------------------------------
4. How to compile
@@ -60,7 +63,7 @@ Both Xcode and Terminal compilation require that build environment be setup
from the step 3.1.
$ cd $HOME/XBMC
- $ make -C tools/osx/ios-depends/xbmc
+ $ make -C tools/darwin/depends/xbmc
$ make clean
$ make xcode_depends
@@ -87,7 +90,8 @@ or
5. Gesture Handling on iPad/iPhone/iPod touch
- Double Tap : Right Mouse Click
- Swipe Left : Backspace
- Swipe Right : Tab
+double finger swipe left -> back
+double finger tap -> right mouse
+single finger tap -> left mouse
+panning, and flicking -> panning and flicking works for media lists only at the moment ... scrollbars and other stuff are only clickable (single tap), for now
View
6 README.linux
@@ -50,10 +50,10 @@ Build-Depends: debhelper (>= 7.0.50~), python-support, cmake,
libavahi-common-dev, libavahi-client-dev, libxrandr-dev, libavcodec-dev,
libavformat-dev, libavutil-dev, libpostproc-dev, libswscale-dev,
libmpeg2-4-dev, libass-dev (>= 0.9.8), libmpcdec-dev, libflac-dev,
- libwavpack-dev, python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev,
- libbluetooth-dev, zlib1g-dev, libsmbclient-dev,
+ python-dev, gawk, gperf, nasm [!amd64], libcwiid1-dev,
+ libbluetooth-dev, zlib1g-dev, libsmbclient-dev, libboost-thread-dev
libiso9660-dev, libssl-dev, lsb-release, libvdpau-dev, libmicrohttpd-dev,
- libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev
+ libmodplug-dev, librtmp-dev, libcrystalhd-dev, curl, python-dev, libyajl-dev
*** For developers and anyone else who compiles frequently it is recommended to
use ccache
View
9 README.osx
@@ -49,7 +49,10 @@ if you are running a previous Xcode 3.x version. Xcode 3.x only runs on 10.5.
-----------------------------------------------------------------------------
$ cd $HOME/XBMC
- $ make -C tools/osx/osx-depends
+ $ cd tools/darwin/depends
+ $ ./bootstrap
+ $ ./configure --with-darwin=osx
+ $ make
-----------------------------------------------------------------------------
4. How to compile
@@ -58,7 +61,7 @@ Both Xcode and Terminal compilation require that build environment be setup
first. This is a simple step and involves the following:
$ cd $HOME/XBMC
- $ make -C tools/osx/osx-depends/xbmc
+ $ make -C tools/darwin/depends/xbmc
$ make clean
$ make xcode_depends
@@ -137,7 +140,7 @@ distribution.
1. build XBMC.app from XCode so that the application bundle is correctly updated.
- 2. make -C tools/PackageMaker/
+ 2. make -C tools/darwin/packaging/xbmc-osx
3. If completed successfully, a disk image named XBMC_for_Mac.dmg will be
present in the users XBMC build directory:
View
4 README.ubuntu
@@ -44,7 +44,7 @@ Two methods exist to install the required Ubuntu packages:
For Ubuntu (all versions >= 7.04):
- # 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 python-dev
+ # sudo apt-get install git-core 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 libmpeg2-4-dev libmicrohttpd-dev libmodplug-dev libssh-dev gettext cvs python-dev libyajl-dev libboost-thread-dev
For Ubuntu Maverick (10.10):
# sudo apt-get install autopoint
@@ -70,7 +70,7 @@ PPA to your system here:
The PPA used for XBMC (developpement version) is located on the following page:
- http://launchpad.net/~team-xbmc-svn/+archive/ppa
+ http://launchpad.net/~team-xbmc/+archive/unstable
[Note 1] Click on "Technical details about this PPA" to display the sources.list entries.
View
225 XBMC-ATV2.xcodeproj/project.pbxproj
@@ -9,8 +9,21 @@
/* Begin PBXBuildFile section */
188B485E1392DF9500BD58AD /* PVRDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 188B485A1392DF9500BD58AD /* PVRDirectory.cpp */; };
188B485F1392DF9500BD58AD /* PVRFile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 188B485C1392DF9500BD58AD /* PVRFile.cpp */; };
+ 1830216013B8E35300770920 /* controledit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1830215F13B8E35300770920 /* controledit.cpp */; };
+ 18404DFB1396C43B00863BBA /* Slingbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18404DF91396C43B00863BBA /* Slingbox.cpp */; };
+ 18404DFD1396C44F00863BBA /* SlingboxLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18404DFC1396C44F00863BBA /* SlingboxLib.a */; };
+ 1840B796139968DB007C848B /* JSONVariantParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1840B792139968DB007C848B /* JSONVariantParser.cpp */; };
+ 1840B797139968DB007C848B /* JSONVariantWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1840B794139968DB007C848B /* JSONVariantWriter.cpp */; };
18ACF8E313597B0000B67371 /* RecentlyAddedJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18ACF8E113597B0000B67371 /* RecentlyAddedJob.cpp */; };
+ 18B7013C13A6ABBA0009C1AF /* AddonVersion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7013A13A6ABBA0009C1AF /* AddonVersion.cpp */; };
+ 18B7013F13A6ABD20009C1AF /* KeymapLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7013D13A6ABD20009C1AF /* KeymapLoader.cpp */; };
+ 18ECC9AA13CF17EB00A9ED6C /* StreamUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18ECC9A813CF17EB00A9ED6C /* StreamUtils.cpp */; };
4D5D2E131301753F006ABC13 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5D2E121301753F006ABC13 /* CFNetwork.framework */; };
+ 7C0A7ECD13A5DBF900AFC2BD /* AppParamParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7ECB13A5DBF900AFC2BD /* AppParamParser.cpp */; };
+ 7C0A7FC813A9E75400AFC2BD /* DirtyRegionSolvers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FC413A9E75400AFC2BD /* DirtyRegionSolvers.cpp */; };
+ 7C0A7FC913A9E75400AFC2BD /* DirtyRegionTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FC613A9E75400AFC2BD /* DirtyRegionTracker.cpp */; };
+ 7C0A7FCC13A9E76E00AFC2BD /* GUIWindowDebugInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FCA13A9E76E00AFC2BD /* GUIWindowDebugInfo.cpp */; };
+ 7C89627013B702F3003631FE /* GUIWindowScreensaverDim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C89626E13B702F3003631FE /* GUIWindowScreensaverDim.cpp */; };
7C99B73F133D372300FC2B16 /* CacheCircular.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B73D133D372300FC2B16 /* CacheCircular.cpp */; };
7C99B7AA134072CD00FC2B16 /* GUIDialogPlayEject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B7A8134072CD00FC2B16 /* GUIDialogPlayEject.cpp */; };
C807119F135DB842002F601B /* InputOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C807119D135DB842002F601B /* InputOperations.cpp */; };
@@ -67,8 +80,12 @@
C8AD444A13924E8400A75578 /* DVDDemuxPVRClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8AD444813924E8400A75578 /* DVDDemuxPVRClient.cpp */; };
C8AD444D13924E9000A75578 /* DVDInputStreamPVRManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8AD444B13924E9000A75578 /* DVDInputStreamPVRManager.cpp */; };
C8EC5D51136954E400CCC10D /* XBMC_keytable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8EC5D4F136954E400CCC10D /* XBMC_keytable.cpp */; };
+ DF0DF16C13A3AF82008ED511 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF16813A3AF82008ED511 /* FileNFS.cpp */; };
+ DF0DF16D13A3AF82008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF16A13A3AF82008ED511 /* NFSDirectory.cpp */; };
+ DF27E25C13C23CCA002514FE /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF27E25A13C23CCA002514FE /* InertialScrollingHandler.cpp */; };
F54D9E0712B65FFF006870F9 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F54D9E0612B65FFF006870F9 /* libc.dylib */; };
F54D9E8E12B71457006870F9 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F54D9E8D12B71457006870F9 /* CoreAudio.framework */; };
+ F558F66F13AFE81500631E12 /* ThreadLocal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F558F66D13AFE81500631E12 /* ThreadLocal.cpp */; };
F56B15FB12CD6922009B4C96 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15FA12CD6922009B4C96 /* CoreVideo.framework */; };
F56B15FD12CD6930009B4C96 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15FC12CD6930009B4C96 /* AudioToolbox.framework */; };
F56B15FF12CD695C009B4C96 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15FE12CD695C009B4C96 /* CoreGraphics.framework */; };
@@ -259,12 +276,10 @@
F56C793B131EC154000AD0F6 /* SPCCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C732B131EC151000AD0F6 /* SPCCodec.cpp */; };
F56C793C131EC154000AD0F6 /* TimidityCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C732D131EC151000AD0F6 /* TimidityCodec.cpp */; };
F56C793D131EC154000AD0F6 /* WAVcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C732F131EC151000AD0F6 /* WAVcodec.cpp */; };
- F56C793E131EC154000AD0F6 /* WAVPackcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7331131EC151000AD0F6 /* WAVPackcodec.cpp */; };
F56C793F131EC154000AD0F6 /* YMCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7333131EC151000AD0F6 /* YMCodec.cpp */; };
F56C7941131EC154000AD0F6 /* AudioRendererFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C733A131EC151000AD0F6 /* AudioRendererFactory.cpp */; };
F56C7942131EC154000AD0F6 /* NullDirectSound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C733B131EC151000AD0F6 /* NullDirectSound.cpp */; };
F56C7943131EC154000AD0F6 /* BaseRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C733E131EC151000AD0F6 /* BaseRenderer.cpp */; };
- F56C7944131EC154000AD0F6 /* LinuxRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7340131EC151000AD0F6 /* LinuxRenderer.cpp */; };
F56C7946131EC154000AD0F6 /* OverlayRendererGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7344131EC151000AD0F6 /* OverlayRendererGL.cpp */; };
F56C7947131EC154000AD0F6 /* OverlayRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7346131EC151000AD0F6 /* OverlayRenderer.cpp */; };
F56C7948131EC154000AD0F6 /* OverlayRendererUtil.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7348131EC151000AD0F6 /* OverlayRendererUtil.cpp */; };
@@ -562,7 +577,6 @@
F56C7A71131EC155000AD0F6 /* XBPyThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75A1131EC152000AD0F6 /* XBPyThread.cpp */; };
F56C7A72131EC155000AD0F6 /* AnnouncementManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75A3131EC152000AD0F6 /* AnnouncementManager.cpp */; };
F56C7A73131EC155000AD0F6 /* Builtins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75A5131EC153000AD0F6 /* Builtins.cpp */; };
- F56C7A74131EC155000AD0F6 /* XCriticalSection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75AB131EC153000AD0F6 /* XCriticalSection.cpp */; };
F56C7A75131EC155000AD0F6 /* ConvUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75AD131EC153000AD0F6 /* ConvUtils.cpp */; };
F56C7A76131EC155000AD0F6 /* LinuxResourceCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75AF131EC153000AD0F6 /* LinuxResourceCounter.cpp */; };
F56C7A77131EC155000AD0F6 /* LinuxTimezone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C75B1131EC153000AD0F6 /* LinuxTimezone.cpp */; };
@@ -705,15 +719,9 @@
F56C7B06131EC155000AD0F6 /* IoSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76EE131EC153000AD0F6 /* IoSupport.cpp */; };
F56C7B07131EC155000AD0F6 /* MediaManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76F0131EC153000AD0F6 /* MediaManager.cpp */; };
F56C7B08131EC155000AD0F6 /* cdioSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76F2131EC153000AD0F6 /* cdioSupport.cpp */; };
- F56C7B09131EC155000AD0F6 /* SemaphoreDarwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76F6131EC153000AD0F6 /* SemaphoreDarwin.cpp */; };
F56C7B0A131EC155000AD0F6 /* Atomics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76F8131EC153000AD0F6 /* Atomics.cpp */; };
- F56C7B0B131EC155000AD0F6 /* CriticalSection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76FA131EC153000AD0F6 /* CriticalSection.cpp */; };
F56C7B0C131EC155000AD0F6 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76FC131EC153000AD0F6 /* Event.cpp */; };
F56C7B0D131EC155000AD0F6 /* LockFree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C76FF131EC153000AD0F6 /* LockFree.cpp */; };
- F56C7B0E131EC155000AD0F6 /* Mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7701131EC153000AD0F6 /* Mutex.cpp */; };
- F56C7B0F131EC155000AD0F6 /* Semaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7703131EC153000AD0F6 /* Semaphore.cpp */; };
- F56C7B10131EC155000AD0F6 /* SharedSection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7705131EC153000AD0F6 /* SharedSection.cpp */; };
- F56C7B11131EC155000AD0F6 /* SingleLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7707131EC153000AD0F6 /* SingleLock.cpp */; };
F56C7B12131EC155000AD0F6 /* Thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7709131EC153000AD0F6 /* Thread.cpp */; };
F56C7B13131EC155000AD0F6 /* GLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C770D131EC153000AD0F6 /* GLUtils.cpp */; };
F56C7B14131EC155000AD0F6 /* XMLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7710131EC153000AD0F6 /* XMLUtils.cpp */; };
@@ -841,7 +849,6 @@
F56C7BE6131EC455000AD0F6 /* LinuxRendererGLES.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BE4131EC455000AD0F6 /* LinuxRendererGLES.cpp */; };
F56C7BE9131EC46E000AD0F6 /* yuv2rgb.neon.S in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BE7131EC46E000AD0F6 /* yuv2rgb.neon.S */; };
F56C7BEC131EC495000AD0F6 /* IOSAudioRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BEA131EC495000AD0F6 /* IOSAudioRenderer.cpp */; };
- F56C7BF2131EC4CE000AD0F6 /* XBMC_mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BEF131EC4CE000AD0F6 /* XBMC_mutex.cpp */; };
F56C7BF5131EC4E8000AD0F6 /* fastmemcpy-arm.S in Sources */ = {isa = PBXBuildFile; fileRef = F56C7BF3131EC4E8000AD0F6 /* fastmemcpy-arm.S */; };
F56C7D83131EF8D9000AD0F6 /* NptZip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7CB2131EF8D8000AD0F6 /* NptZip.cpp */; };
F56C7D84131EF8D9000AD0F6 /* NptStreams.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7CB4131EF8D8000AD0F6 /* NptStreams.cpp */; };
@@ -931,7 +938,6 @@
F56C7DE0131EF8D9000AD0F6 /* PltMediaServer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7D6A131EF8D9000AD0F6 /* PltMediaServer.cpp */; };
F56C7DE1131EF8D9000AD0F6 /* PltSyncMediaBrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7D6C131EF8D9000AD0F6 /* PltSyncMediaBrowser.cpp */; };
F56C7DE2131EF8D9000AD0F6 /* PltLightSample.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7D72131EF8D9000AD0F6 /* PltLightSample.cpp */; };
- F56C7EE1131F0965000AD0F6 /* libjsoncpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C7EE0131F0965000AD0F6 /* libjsoncpp.a */; };
F56C7F30131F0BB4000AD0F6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F56C7F2E131F0BB4000AD0F6 /* InfoPlist.strings */; };
F56C7FB0131F36BF000AD0F6 /* DVDVideoCodecVideoToolBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C7FAE131F36BF000AD0F6 /* DVDVideoCodecVideoToolBox.cpp */; };
F57A1DBD1329FB0A00498CC7 /* SourcesDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F57A1DBB1329FB0A00498CC7 /* SourcesDirectory.cpp */; };
@@ -974,13 +980,39 @@
188B485B1392DF9500BD58AD /* PVRDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRDirectory.h; sourceTree = "<group>"; };
188B485C1392DF9500BD58AD /* PVRFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PVRFile.cpp; sourceTree = "<group>"; };
188B485D1392DF9500BD58AD /* PVRFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PVRFile.h; sourceTree = "<group>"; };
+ 1830215F13B8E35300770920 /* controledit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controledit.cpp; sourceTree = "<group>"; };
+ 18404DF91396C43B00863BBA /* Slingbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Slingbox.cpp; sourceTree = "<group>"; };
+ 18404DFA1396C43B00863BBA /* Slingbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Slingbox.h; sourceTree = "<group>"; };
+ 18404DFC1396C44F00863BBA /* SlingboxLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = SlingboxLib.a; path = lib/SlingboxLib/SlingboxLib.a; sourceTree = "<group>"; };
+ 1840B792139968DB007C848B /* JSONVariantParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONVariantParser.cpp; sourceTree = "<group>"; };
+ 1840B793139968DB007C848B /* JSONVariantParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONVariantParser.h; sourceTree = "<group>"; };
+ 1840B794139968DB007C848B /* JSONVariantWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONVariantWriter.cpp; sourceTree = "<group>"; };
+ 1840B795139968DB007C848B /* JSONVariantWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONVariantWriter.h; sourceTree = "<group>"; };
18ACF8E113597B0000B67371 /* RecentlyAddedJob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecentlyAddedJob.cpp; sourceTree = "<group>"; };
18ACF8E213597B0000B67371 /* RecentlyAddedJob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecentlyAddedJob.h; sourceTree = "<group>"; };
+ 18B7013A13A6ABBA0009C1AF /* AddonVersion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonVersion.cpp; sourceTree = "<group>"; };
+ 18B7013B13A6ABBA0009C1AF /* AddonVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonVersion.h; sourceTree = "<group>"; };
+ 18B7013D13A6ABD20009C1AF /* KeymapLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeymapLoader.cpp; sourceTree = "<group>"; };
+ 18B7013E13A6ABD20009C1AF /* KeymapLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeymapLoader.h; sourceTree = "<group>"; };
+ 18ECC9A813CF17EB00A9ED6C /* StreamUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StreamUtils.cpp; sourceTree = "<group>"; };
+ 18ECC9A913CF17EB00A9ED6C /* StreamUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamUtils.h; sourceTree = "<group>"; };
4D5D2E121301753F006ABC13 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
+ 7C0A7ECB13A5DBF900AFC2BD /* AppParamParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppParamParser.cpp; sourceTree = "<group>"; };
+ 7C0A7ECC13A5DBF900AFC2BD /* AppParamParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppParamParser.h; sourceTree = "<group>"; };
+ 7C0A7FC313A9E75400AFC2BD /* DirtyRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirtyRegion.h; sourceTree = "<group>"; };
+ 7C0A7FC413A9E75400AFC2BD /* DirtyRegionSolvers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirtyRegionSolvers.cpp; sourceTree = "<group>"; };
+ 7C0A7FC513A9E75400AFC2BD /* DirtyRegionSolvers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirtyRegionSolvers.h; sourceTree = "<group>"; };
+ 7C0A7FC613A9E75400AFC2BD /* DirtyRegionTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirtyRegionTracker.cpp; sourceTree = "<group>"; };
+ 7C0A7FC713A9E75400AFC2BD /* DirtyRegionTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirtyRegionTracker.h; sourceTree = "<group>"; };
+ 7C0A7FCA13A9E76E00AFC2BD /* GUIWindowDebugInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowDebugInfo.cpp; sourceTree = "<group>"; };
+ 7C0A7FCB13A9E76E00AFC2BD /* GUIWindowDebugInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowDebugInfo.h; sourceTree = "<group>"; };
+ 7C89626E13B702F3003631FE /* GUIWindowScreensaverDim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowScreensaverDim.cpp; sourceTree = "<group>"; };
+ 7C89626F13B702F3003631FE /* GUIWindowScreensaverDim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowScreensaverDim.h; sourceTree = "<group>"; };
7C99B73D133D372300FC2B16 /* CacheCircular.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheCircular.cpp; sourceTree = "<group>"; };
7C99B73E133D372300FC2B16 /* CacheCircular.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheCircular.h; sourceTree = "<group>"; };
7C99B7A8134072CD00FC2B16 /* GUIDialogPlayEject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPlayEject.cpp; sourceTree = "<group>"; };
7C99B7A9134072CD00FC2B16 /* GUIDialogPlayEject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPlayEject.h; sourceTree = "<group>"; };
+ 8316267613B670FF004AED87 /* README.ios */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.ios; sourceTree = "<group>"; };
8D576316048677EA00EA77CD /* XBMC.frappliance */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = XBMC.frappliance; sourceTree = BUILT_PRODUCTS_DIR; };
A192FD47135E46C800D92E9B /* IOSAudioRingBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOSAudioRingBuffer.h; path = AudioRenderers/IOSAudioRingBuffer.h; sourceTree = "<group>"; };
C807119D135DB842002F601B /* InputOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InputOperations.cpp; sourceTree = "<group>"; };
@@ -1091,8 +1123,17 @@
C8AD444C13924E9000A75578 /* DVDInputStreamPVRManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDInputStreamPVRManager.h; sourceTree = "<group>"; };
C8EC5D4F136954E400CCC10D /* XBMC_keytable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMC_keytable.cpp; sourceTree = "<group>"; };
C8EC5D50136954E400CCC10D /* XBMC_keytable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_keytable.h; sourceTree = "<group>"; };
+ DF0DF16813A3AF82008ED511 /* FileNFS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileNFS.cpp; sourceTree = "<group>"; };
+ DF0DF16913A3AF82008ED511 /* FileNFS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileNFS.h; sourceTree = "<group>"; };
+ DF0DF16A13A3AF82008ED511 /* NFSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSDirectory.cpp; sourceTree = "<group>"; };
+ DF0DF16B13A3AF82008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = "<group>"; };
+ DF27E25A13C23CCA002514FE /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = "<group>"; };
+ DF27E25B13C23CCA002514FE /* InertialScrollingHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InertialScrollingHandler.h; sourceTree = "<group>"; };
F54D9E0612B65FFF006870F9 /* libc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libc.dylib; path = usr/lib/libc.dylib; sourceTree = SDKROOT; };
F54D9E8D12B71457006870F9 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
+ F558F66813AFE7F300631E12 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
+ F558F66D13AFE81500631E12 /* ThreadLocal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadLocal.cpp; sourceTree = "<group>"; };
+ F558F66E13AFE81500631E12 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
F56B15FA12CD6922009B4C96 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
F56B15FC12CD6930009B4C96 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
F56B15FE12CD695C009B4C96 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -1105,7 +1146,6 @@
F56C7055131EC150000AD0F6 /* DllStSound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllStSound.h; sourceTree = "<group>"; };
F56C7056131EC150000AD0F6 /* DllTimidity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllTimidity.h; sourceTree = "<group>"; };
F56C7057131EC150000AD0F6 /* DllVorbisfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllVorbisfile.h; sourceTree = "<group>"; };
- F56C7058131EC150000AD0F6 /* DllWAVPack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllWAVPack.h; sourceTree = "<group>"; };
F56C705A131EC150000AD0F6 /* tinystr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinystr.cpp; sourceTree = "<group>"; };
F56C705B131EC150000AD0F6 /* tinystr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinystr.h; sourceTree = "<group>"; };
F56C705C131EC150000AD0F6 /* tinyxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxml.cpp; sourceTree = "<group>"; };
@@ -1317,11 +1357,6 @@
F56C7211131EC151000AD0F6 /* EncoderWav.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EncoderWav.cpp; sourceTree = "<group>"; };
F56C7212131EC151000AD0F6 /* EncoderWav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncoderWav.h; sourceTree = "<group>"; };
F56C7214131EC151000AD0F6 /* lame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lame.h; sourceTree = "<group>"; };
- F56C7216131EC151000AD0F6 /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec.h; sourceTree = "<group>"; };
- F56C7217131EC151000AD0F6 /* ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ogg.h; sourceTree = "<group>"; };
- F56C7218131EC151000AD0F6 /* os_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = os_types.h; sourceTree = "<group>"; };
- F56C7219131EC151000AD0F6 /* vorbisenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbisenc.h; sourceTree = "<group>"; };
- F56C721A131EC151000AD0F6 /* vorbisfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbisfile.h; sourceTree = "<group>"; };
F56C721D131EC151000AD0F6 /* PlayerCoreConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlayerCoreConfig.h; path = playercorefactory/PlayerCoreConfig.h; sourceTree = "<group>"; };
F56C721E131EC151000AD0F6 /* PlayerCoreFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PlayerCoreFactory.cpp; path = playercorefactory/PlayerCoreFactory.cpp; sourceTree = "<group>"; };
F56C721F131EC151000AD0F6 /* PlayerCoreFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlayerCoreFactory.h; path = playercorefactory/PlayerCoreFactory.h; sourceTree = "<group>"; };
@@ -1574,8 +1609,6 @@
F56C732E131EC151000AD0F6 /* TimidityCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimidityCodec.h; sourceTree = "<group>"; };
F56C732F131EC151000AD0F6 /* WAVcodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WAVcodec.cpp; sourceTree = "<group>"; };
F56C7330131EC151000AD0F6 /* WAVcodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAVcodec.h; sourceTree = "<group>"; };
- F56C7331131EC151000AD0F6 /* WAVPackcodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WAVPackcodec.cpp; sourceTree = "<group>"; };
- F56C7332131EC151000AD0F6 /* WAVPackcodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAVPackcodec.h; sourceTree = "<group>"; };
F56C7333131EC151000AD0F6 /* YMCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YMCodec.cpp; sourceTree = "<group>"; };
F56C7334131EC151000AD0F6 /* YMCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMCodec.h; sourceTree = "<group>"; };
F56C7338131EC151000AD0F6 /* IAudioRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IAudioRenderer.h; path = AudioRenderers/IAudioRenderer.h; sourceTree = "<group>"; };
@@ -1585,8 +1618,6 @@
F56C733C131EC151000AD0F6 /* NullDirectSound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NullDirectSound.h; path = AudioRenderers/NullDirectSound.h; sourceTree = "<group>"; };
F56C733E131EC151000AD0F6 /* BaseRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseRenderer.cpp; sourceTree = "<group>"; };
F56C733F131EC151000AD0F6 /* BaseRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseRenderer.h; sourceTree = "<group>"; };
- F56C7340131EC151000AD0F6 /* LinuxRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinuxRenderer.cpp; sourceTree = "<group>"; };
- F56C7341131EC151000AD0F6 /* LinuxRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinuxRenderer.h; sourceTree = "<group>"; };
F56C7344131EC151000AD0F6 /* OverlayRendererGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OverlayRendererGL.cpp; sourceTree = "<group>"; };
F56C7345131EC151000AD0F6 /* OverlayRendererGL.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OverlayRendererGL.h; sourceTree = "<group>"; };
F56C7346131EC151000AD0F6 /* OverlayRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OverlayRenderer.cpp; sourceTree = "<group>"; };
@@ -1604,7 +1635,6 @@
F56C7353131EC151000AD0F6 /* YUV2RGBShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YUV2RGBShader.cpp; sourceTree = "<group>"; };
F56C7354131EC151000AD0F6 /* YUV2RGBShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YUV2RGBShader.h; sourceTree = "<group>"; };
F56C7355131EC151000AD0F6 /* WinRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WinRenderer.h; sourceTree = "<group>"; };
- F56C7356131EC151000AD0F6 /* WinRenderManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WinRenderManager.h; sourceTree = "<group>"; };
F56C7358131EC151000AD0F6 /* Database.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Database.cpp; sourceTree = "<group>"; };
F56C7359131EC151000AD0F6 /* Database.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Database.h; sourceTree = "<group>"; };
F56C735A131EC151000AD0F6 /* dataset.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = dataset.cpp; sourceTree = "<group>"; };
@@ -1917,7 +1947,6 @@
F56C7493131EC152000AD0F6 /* VirtualDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualDirectory.h; sourceTree = "<group>"; };
F56C7498131EC152000AD0F6 /* ZeroconfDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZeroconfDirectory.h; sourceTree = "<group>"; };
F56C7499131EC152000AD0F6 /* ZeroconfDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZeroconfDirectory.cpp; sourceTree = "<group>"; };
- F56C749A131EC152000AD0F6 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
F56C749B131EC152000AD0F6 /* ZipDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZipDirectory.cpp; sourceTree = "<group>"; };
F56C749C131EC152000AD0F6 /* ZipDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipDirectory.h; sourceTree = "<group>"; };
F56C749D131EC152000AD0F6 /* ZipManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZipManager.cpp; sourceTree = "<group>"; };
@@ -2181,8 +2210,6 @@
F56C75A7131EC153000AD0F6 /* IAnnouncer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IAnnouncer.h; sourceTree = "<group>"; };
F56C75A9131EC153000AD0F6 /* stat_utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stat_utf8.h; sourceTree = "<group>"; };
F56C75AA131EC153000AD0F6 /* stdio_utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stdio_utf8.h; sourceTree = "<group>"; };
- F56C75AB131EC153000AD0F6 /* XCriticalSection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XCriticalSection.cpp; sourceTree = "<group>"; };
- F56C75AC131EC153000AD0F6 /* XCriticalSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XCriticalSection.h; sourceTree = "<group>"; };
F56C75AD131EC153000AD0F6 /* ConvUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConvUtils.cpp; sourceTree = "<group>"; };
F56C75AE131EC153000AD0F6 /* ConvUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConvUtils.h; sourceTree = "<group>"; };
F56C75AF131EC153000AD0F6 /* LinuxResourceCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinuxResourceCounter.cpp; sourceTree = "<group>"; };
@@ -2476,24 +2503,14 @@
F56C76F1131EC153000AD0F6 /* MediaManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaManager.h; sourceTree = "<group>"; };
F56C76F2131EC153000AD0F6 /* cdioSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cdioSupport.cpp; sourceTree = "<group>"; };
F56C76F3131EC153000AD0F6 /* cdioSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdioSupport.h; sourceTree = "<group>"; };
- F56C76F6131EC153000AD0F6 /* SemaphoreDarwin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SemaphoreDarwin.cpp; sourceTree = "<group>"; };
- F56C76F7131EC153000AD0F6 /* SemaphoreDarwin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SemaphoreDarwin.h; sourceTree = "<group>"; };
F56C76F8131EC153000AD0F6 /* Atomics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Atomics.cpp; sourceTree = "<group>"; };
F56C76F9131EC153000AD0F6 /* Atomics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Atomics.h; sourceTree = "<group>"; };
- F56C76FA131EC153000AD0F6 /* CriticalSection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CriticalSection.cpp; sourceTree = "<group>"; };
F56C76FB131EC153000AD0F6 /* CriticalSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CriticalSection.h; sourceTree = "<group>"; };
F56C76FC131EC153000AD0F6 /* Event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Event.cpp; sourceTree = "<group>"; };
F56C76FD131EC153000AD0F6 /* Event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Event.h; sourceTree = "<group>"; };
- F56C76FE131EC153000AD0F6 /* ISemaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ISemaphore.h; sourceTree = "<group>"; };
F56C76FF131EC153000AD0F6 /* LockFree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LockFree.cpp; sourceTree = "<group>"; };
F56C7700131EC153000AD0F6 /* LockFree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LockFree.h; sourceTree = "<group>"; };
- F56C7701131EC153000AD0F6 /* Mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mutex.cpp; sourceTree = "<group>"; };
- F56C7702131EC153000AD0F6 /* Mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mutex.h; sourceTree = "<group>"; };
- F56C7703131EC153000AD0F6 /* Semaphore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Semaphore.cpp; sourceTree = "<group>"; };
- F56C7704131EC153000AD0F6 /* Semaphore.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Semaphore.hpp; sourceTree = "<group>"; };
- F56C7705131EC153000AD0F6 /* SharedSection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedSection.cpp; sourceTree = "<group>"; };
F56C7706131EC153000AD0F6 /* SharedSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedSection.h; sourceTree = "<group>"; };
- F56C7707131EC153000AD0F6 /* SingleLock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SingleLock.cpp; sourceTree = "<group>"; };
F56C7708131EC153000AD0F6 /* SingleLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleLock.h; sourceTree = "<group>"; };
F56C7709131EC153000AD0F6 /* Thread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Thread.cpp; sourceTree = "<group>"; };
F56C770A131EC153000AD0F6 /* Thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Thread.h; sourceTree = "<group>"; };
@@ -2762,8 +2779,6 @@
F56C7BE8131EC46E000AD0F6 /* yuv2rgb.neon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = yuv2rgb.neon.h; sourceTree = "<group>"; };
F56C7BEA131EC495000AD0F6 /* IOSAudioRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IOSAudioRenderer.cpp; path = AudioRenderers/IOSAudioRenderer.cpp; sourceTree = "<group>"; };
F56C7BEB131EC495000AD0F6 /* IOSAudioRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOSAudioRenderer.h; path = AudioRenderers/IOSAudioRenderer.h; sourceTree = "<group>"; };
- F56C7BEF131EC4CE000AD0F6 /* XBMC_mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMC_mutex.cpp; sourceTree = "<group>"; };
- F56C7BF0131EC4CE000AD0F6 /* XBMC_mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_mutex.h; sourceTree = "<group>"; };
F56C7BF3131EC4E8000AD0F6 /* fastmemcpy-arm.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = "fastmemcpy-arm.S"; sourceTree = "<group>"; };
F56C7BF4131EC4E8000AD0F6 /* fastmemcpy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fastmemcpy.h; sourceTree = "<group>"; };
F56C7CA6131EF8D8000AD0F6 /* README.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = README.txt; path = Neptune/README.txt; sourceTree = "<group>"; };
@@ -2958,7 +2973,6 @@
F56C7D72131EF8D9000AD0F6 /* PltLightSample.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PltLightSample.cpp; sourceTree = "<group>"; };
F56C7D73131EF8D9000AD0F6 /* PltLightSample.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PltLightSample.h; sourceTree = "<group>"; };
F56C7D78131EF8D9000AD0F6 /* SsdpProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SsdpProxy.h; sourceTree = "<group>"; };
- F56C7EE0131F0965000AD0F6 /* libjsoncpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjsoncpp.a; path = lib/jsoncpp/src/lib_json/libjsoncpp.a; sourceTree = "<group>"; };
F56C7F2F131F0BB4000AD0F6 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; };
F56C7FAE131F36BF000AD0F6 /* DVDVideoCodecVideoToolBox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DVDVideoCodecVideoToolBox.cpp; sourceTree = "<group>"; };
F56C7FAF131F36BF000AD0F6 /* DVDVideoCodecVideoToolBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DVDVideoCodecVideoToolBox.h; sourceTree = "<group>"; };
@@ -3047,6 +3061,7 @@
4D5D2E131301753F006ABC13 /* CFNetwork.framework in Frameworks */,
F56C7EE1131F0965000AD0F6 /* libjsoncpp.a in Frameworks */,
C8AD427E139239EA00A75578 /* libTcpSocket.a in Frameworks */,
+ 18404DFD1396C44F00863BBA /* SlingboxLib.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3056,6 +3071,7 @@
089C166AFE841209C02AAC07 /* XBMC-frapp */ = {
isa = PBXGroup;
children = (
+ 8316267513B670D7004AED87 /* Documentation */,
F56C704E131EC150000AD0F6 /* Source */,
F589AE6D12890B6700D8079E /* Internal Libs */,
F5899DC91287212700D8079E /* System Libs and Frameworks */,
@@ -3224,6 +3240,12 @@
C8AD43FC13924D5300A75578 /* GUIWindowPVRTimers.h */,
);
path = windows;
+ 8316267513B670D7004AED87 /* Documentation */ = {
+ isa = PBXGroup;
+ children = (
+ 8316267613B670FF004AED87 /* README.ios */,
+ );
+ name = Documentation;
sourceTree = "<group>";
};
F56C704E131EC150000AD0F6 /* Source */ = {
@@ -3246,7 +3268,6 @@
F56C7055131EC150000AD0F6 /* DllStSound.h */,
F56C7056131EC150000AD0F6 /* DllTimidity.h */,
F56C7057131EC150000AD0F6 /* DllVorbisfile.h */,
- F56C7058131EC150000AD0F6 /* DllWAVPack.h */,
F56C7059131EC150000AD0F6 /* tinyXML */,
F56C7060131EC150000AD0F6 /* libexif */,
F56C7062131EC150000AD0F6 /* libhdhomerun */,
@@ -3255,7 +3276,6 @@
F56C707D131EC150000AD0F6 /* libRTV */,
F56C7088131EC150000AD0F6 /* libsquish */,
F56C7CA5131EF8D8000AD0F6 /* libUPnP */,
- F56C7163131EC151000AD0F6 /* libXBMS */,
F56C7164131EC151000AD0F6 /* libXDAAP */,
F56C716A131EC151000AD0F6 /* UnrarXLib */,
);
@@ -3353,13 +3373,6 @@
name = libsquish;
sourceTree = "<group>";
};
- F56C7163131EC151000AD0F6 /* libXBMS */ = {
- isa = PBXGroup;
- children = (
- );
- path = libXBMS;
- sourceTree = "<group>";
- };
F56C7164131EC151000AD0F6 /* libXDAAP */ = {
isa = PBXGroup;
children = (
@@ -3552,6 +3565,8 @@
F56C77EA131EC154000AD0F6 /* GUIViewControl.h */,
F56C77EB131EC154000AD0F6 /* GUIViewState.cpp */,
F56C77EC131EC154000AD0F6 /* GUIViewState.h */,
+ DF27E25A13C23CCA002514FE /* InertialScrollingHandler.cpp */,
+ DF27E25B13C23CCA002514FE /* InertialScrollingHandler.h */,
F56C77ED131EC154000AD0F6 /* IProgressCallback.h */,
F56C77EE131EC154000AD0F6 /* LangInfo.cpp */,
F56C77EF131EC154000AD0F6 /* LangInfo.h */,
@@ -3627,6 +3642,8 @@
F56C71EF131EC151000AD0F6 /* AddonManager.h */,
F56C71F0131EC151000AD0F6 /* AddonStatusHandler.cpp */,
F56C71F1131EC151000AD0F6 /* AddonStatusHandler.h */,
+ 18B7013A13A6ABBA0009C1AF /* AddonVersion.cpp */,
+ 18B7013B13A6ABBA0009C1AF /* AddonVersion.h */,
F56C71F2131EC151000AD0F6 /* DllAddon.h */,
F56C71F5131EC151000AD0F6 /* IAddon.h */,
F56C71F6131EC151000AD0F6 /* Scraper.cpp */,
@@ -3681,11 +3698,6 @@
F56C7215131EC151000AD0F6 /* oggvorbis */ = {
isa = PBXGroup;
children = (
- F56C7216131EC151000AD0F6 /* codec.h */,
- F56C7217131EC151000AD0F6 /* ogg.h */,
- F56C7218131EC151000AD0F6 /* os_types.h */,
- F56C7219131EC151000AD0F6 /* vorbisenc.h */,
- F56C721A131EC151000AD0F6 /* vorbisfile.h */,
);
path = oggvorbis;
sourceTree = "<group>";
@@ -4105,8 +4117,6 @@
F56C732E131EC151000AD0F6 /* TimidityCodec.h */,
F56C732F131EC151000AD0F6 /* WAVcodec.cpp */,
F56C7330131EC151000AD0F6 /* WAVcodec.h */,
- F56C7331131EC151000AD0F6 /* WAVPackcodec.cpp */,
- F56C7332131EC151000AD0F6 /* WAVPackcodec.h */,
F56C7333131EC151000AD0F6 /* YMCodec.cpp */,
F56C7334131EC151000AD0F6 /* YMCodec.h */,
);
@@ -4133,8 +4143,6 @@
children = (
F56C733E131EC151000AD0F6 /* BaseRenderer.cpp */,
F56C733F131EC151000AD0F6 /* BaseRenderer.h */,
- F56C7340131EC151000AD0F6 /* LinuxRenderer.cpp */,
- F56C7341131EC151000AD0F6 /* LinuxRenderer.h */,
F56C7BE4131EC455000AD0F6 /* LinuxRendererGLES.cpp */,
F56C7BE5131EC455000AD0F6 /* LinuxRendererGLES.h */,
F56C7344131EC151000AD0F6 /* OverlayRendererGL.cpp */,
@@ -4149,7 +4157,6 @@
F56C734D131EC151000AD0F6 /* RenderManager.h */,
F56C734E131EC151000AD0F6 /* VideoShaders */,
F56C7355131EC151000AD0F6 /* WinRenderer.h */,
- F56C7356131EC151000AD0F6 /* WinRenderManager.h */,
F56C7BE7131EC46E000AD0F6 /* yuv2rgb.neon.S */,
F56C7BE8131EC46E000AD0F6 /* yuv2rgb.neon.h */,
);
@@ -4254,6 +4261,10 @@
188B485B1392DF9500BD58AD /* PVRDirectory.h */,
188B485C1392DF9500BD58AD /* PVRFile.cpp */,
188B485D1392DF9500BD58AD /* PVRFile.h */,
+ DF0DF16813A3AF82008ED511 /* FileNFS.cpp */,
+ DF0DF16913A3AF82008ED511 /* FileNFS.h */,
+ DF0DF16A13A3AF82008ED511 /* NFSDirectory.cpp */,
+ DF0DF16B13A3AF82008ED511 /* NFSDirectory.h */,
F57A1DBB1329FB0A00498CC7 /* SourcesDirectory.cpp */,
F57A1DBC1329FB0A00498CC7 /* SourcesDirectory.h */,
F56C7396131EC151000AD0F6 /* SpecialProtocol.cpp */,
@@ -4398,6 +4409,8 @@
F56C744D131EC152000AD0F6 /* SFTPDirectory.h */,
F56C744E131EC152000AD0F6 /* SIDFileDirectory.cpp */,
F56C744F131EC152000AD0F6 /* SIDFileDirectory.h */,
+ 18404DF91396C43B00863BBA /* Slingbox.cpp */,
+ 18404DFA1396C43B00863BBA /* Slingbox.h */,
F56C7450131EC152000AD0F6 /* SmartPlaylistDirectory.cpp */,
F56C7451131EC152000AD0F6 /* SmartPlaylistDirectory.h */,
F56C7452131EC152000AD0F6 /* SMBDirectory.h */,
@@ -4422,7 +4435,6 @@
F56C7493131EC152000AD0F6 /* VirtualDirectory.h */,
F56C7498131EC152000AD0F6 /* ZeroconfDirectory.h */,
F56C7499131EC152000AD0F6 /* ZeroconfDirectory.cpp */,
- F56C749A131EC152000AD0F6 /* zconf.h */,
F56C749B131EC152000AD0F6 /* ZipDirectory.cpp */,
F56C749C131EC152000AD0F6 /* ZipDirectory.h */,
F56C749D131EC152000AD0F6 /* ZipManager.cpp */,
@@ -4543,6 +4555,11 @@
F56C74A2131EC152000AD0F6 /* D3DResource.h */,
F56C74A3131EC152000AD0F6 /* DDSImage.h */,
F56C74A4131EC152000AD0F6 /* DirectXGraphics.h */,
+ 7C0A7FC313A9E75400AFC2BD /* DirtyRegion.h */,
+ 7C0A7FC413A9E75400AFC2BD /* DirtyRegionSolvers.cpp */,
+ 7C0A7FC513A9E75400AFC2BD /* DirtyRegionSolvers.h */,
+ 7C0A7FC613A9E75400AFC2BD /* DirtyRegionTracker.cpp */,
+ 7C0A7FC713A9E75400AFC2BD /* DirtyRegionTracker.h */,
F56C74A5131EC152000AD0F6 /* FrameBufferObject.h */,
F56C74A6131EC152000AD0F6 /* Geometry.h */,
F56C74A7131EC152000AD0F6 /* GraphicContext.h */,
@@ -4730,6 +4747,8 @@
F56C7557131EC152000AD0F6 /* KeyboardLayoutConfiguration.h */,
F56C7558131EC152000AD0F6 /* KeyboardStat.cpp */,
F56C7559131EC152000AD0F6 /* KeyboardStat.h */,
+ 18B7013D13A6ABD20009C1AF /* KeymapLoader.cpp */,
+ 18B7013E13A6ABD20009C1AF /* KeymapLoader.h */,
F56C755A131EC152000AD0F6 /* MouseStat.cpp */,
F56C755B131EC152000AD0F6 /* MouseStat.h */,
F56C755C131EC152000AD0F6 /* SDLJoystick.cpp */,
@@ -4788,6 +4807,7 @@
F56C7570131EC152000AD0F6 /* control.h */,
F56C7571131EC152000AD0F6 /* controlbutton.cpp */,
F56C7572131EC152000AD0F6 /* controlcheckmark.cpp */,
+ 1830215F13B8E35300770920 /* controledit.cpp */,
F56C7573131EC152000AD0F6 /* controlfadelabel.cpp */,
F56C7574131EC152000AD0F6 /* controlgroup.cpp */,
F56C7575131EC152000AD0F6 /* controlimage.cpp */,
@@ -4839,8 +4859,6 @@
children = (
F56C75A9131EC153000AD0F6 /* stat_utf8.h */,
F56C75AA131EC153000AD0F6 /* stdio_utf8.h */,
- F56C75AB131EC153000AD0F6 /* XCriticalSection.cpp */,
- F56C75AC131EC153000AD0F6 /* XCriticalSection.h */,
F56C75AD131EC153000AD0F6 /* ConvUtils.cpp */,
F56C75AE131EC153000AD0F6 /* ConvUtils.h */,
F56C75AF131EC153000AD0F6 /* LinuxResourceCounter.cpp */,
@@ -5255,6 +5273,8 @@
F56C76D2131EC153000AD0F6 /* GUISettings.h */,
F56C76D3131EC153000AD0F6 /* AdvancedSettings.cpp */,
F56C76D4131EC153000AD0F6 /* AdvancedSettings.h */,
+ 7C0A7ECB13A5DBF900AFC2BD /* AppParamParser.cpp */,
+ 7C0A7ECC13A5DBF900AFC2BD /* AppParamParser.h */,
F56C76D5131EC153000AD0F6 /* GUIWindowSettings.cpp */,
F56C76D6131EC153000AD0F6 /* GUIWindowSettings.h */,
F56C76D7131EC153000AD0F6 /* GUIWindowSettingsCategory.cpp */,
@@ -5306,41 +5326,24 @@
F56C76F4131EC153000AD0F6 /* threads */ = {
isa = PBXGroup;
children = (
- F56C76F5131EC153000AD0F6 /* darwin */,
F56C76F8131EC153000AD0F6 /* Atomics.cpp */,
F56C76F9131EC153000AD0F6 /* Atomics.h */,
- F56C76FA131EC153000AD0F6 /* CriticalSection.cpp */,
+ F558F66813AFE7F300631E12 /* Condition.h */,
F56C76FB131EC153000AD0F6 /* CriticalSection.h */,
F56C76FC131EC153000AD0F6 /* Event.cpp */,
F56C76FD131EC153000AD0F6 /* Event.h */,
- F56C76FE131EC153000AD0F6 /* ISemaphore.h */,
F56C76FF131EC153000AD0F6 /* LockFree.cpp */,
F56C7700131EC153000AD0F6 /* LockFree.h */,
- F56C7701131EC153000AD0F6 /* Mutex.cpp */,
- F56C7702131EC153000AD0F6 /* Mutex.h */,
- F56C7703131EC153000AD0F6 /* Semaphore.cpp */,
- F56C7704131EC153000AD0F6 /* Semaphore.hpp */,
- F56C7705131EC153000AD0F6 /* SharedSection.cpp */,
F56C7706131EC153000AD0F6 /* SharedSection.h */,
- F56C7707131EC153000AD0F6 /* SingleLock.cpp */,
F56C7708131EC153000AD0F6 /* SingleLock.h */,
F56C7709131EC153000AD0F6 /* Thread.cpp */,
F56C770A131EC153000AD0F6 /* Thread.h */,
- F56C7BEF131EC4CE000AD0F6 /* XBMC_mutex.cpp */,
- F56C7BF0131EC4CE000AD0F6 /* XBMC_mutex.h */,
+ F558F66D13AFE81500631E12 /* ThreadLocal.cpp */,
+ F558F66E13AFE81500631E12 /* ThreadLocal.h */,
);
path = threads;
sourceTree = "<group>";
};
- F56C76F5131EC153000AD0F6 /* darwin */ = {
- isa = PBXGroup;
- children = (
- F56C76F6131EC153000AD0F6 /* SemaphoreDarwin.cpp */,
- F56C76F7131EC153000AD0F6 /* SemaphoreDarwin.h */,
- );
- path = darwin;
- sourceTree = "<group>";
- };
F56C770B131EC153000AD0F6 /* utils */ = {
isa = PBXGroup;
children = (
@@ -5406,6 +5409,10 @@
F56C7745131EC154000AD0F6 /* JobManager.cpp */,
F56C7746131EC154000AD0F6 /* JobManager.h */,
F56C7747131EC154000AD0F6 /* Job.h */,
+ 1840B792139968DB007C848B /* JSONVariantParser.cpp */,
+ 1840B793139968DB007C848B /* JSONVariantParser.h */,
+ 1840B794139968DB007C848B /* JSONVariantWriter.cpp */,
+ 1840B795139968DB007C848B /* JSONVariantWriter.h */,
F56C7748131EC154000AD0F6 /* LCD.cpp */,
F56C7749131EC154000AD0F6 /* LCD.h */,
F56C774A131EC154000AD0F6 /* log.cpp */,
@@ -5438,6 +5445,8 @@
F56C7765131EC154000AD0F6 /* Stopwatch.h */,
F56C7766131EC154000AD0F6 /* StreamDetails.cpp */,
F56C7767131EC154000AD0F6 /* StreamDetails.h */,
+ 18ECC9A813CF17EB00A9ED6C /* StreamUtils.cpp */,
+ 18ECC9A913CF17EB00A9ED6C /* StreamUtils.h */,
F56C7768131EC154000AD0F6 /* SystemInfo.cpp */,
F56C7769131EC154000AD0F6 /* SystemInfo.h */,
F56C776A131EC154000AD0F6 /* TimeUtils.cpp */,
@@ -5556,6 +5565,8 @@
children = (
F56C77B9131EC154000AD0F6 /* GUIMediaWindow.cpp */,
F56C77BA131EC154000AD0F6 /* GUIMediaWindow.h */,
+ 7C0A7FCA13A9E76E00AFC2BD /* GUIWindowDebugInfo.cpp */,
+ 7C0A7FCB13A9E76E00AFC2BD /* GUIWindowDebugInfo.h */,
F56C77BB131EC154000AD0F6 /* GUIWindowFileManager.cpp */,
F56C77BC131EC154000AD0F6 /* GUIWindowFileManager.h */,
F56C77BD131EC154000AD0F6 /* GUIWindowHome.cpp */,
@@ -5566,6 +5577,8 @@
F56C77C2131EC154000AD0F6 /* GUIWindowPointer.h */,
F56C77C3131EC154000AD0F6 /* GUIWindowScreensaver.cpp */,
F56C77C4131EC154000AD0F6 /* GUIWindowScreensaver.h */,
+ 7C89626E13B702F3003631FE /* GUIWindowScreensaverDim.cpp */,
+ 7C89626F13B702F3003631FE /* GUIWindowScreensaverDim.h */,
F56C77C5131EC154000AD0F6 /* GUIWindowStartup.cpp */,
F56C77C6131EC154000AD0F6 /* GUIWindowStartup.h */,
F56C77C7131EC154000AD0F6 /* GUIWindowSystemInfo.cpp */,
@@ -6000,10 +6013,10 @@
children = (
C8AD427D139239EA00A75578 /* libTcpSocket.a */,
F589AE7012890B9E00D8079E /* libapetag.a */,
- F56C7EE0131F0965000AD0F6 /* libjsoncpp.a */,
F589AE7D12890BEF00D8079E /* libsquish.a */,
F589AE7E12890BEF00D8079E /* librtv.a */,
F589AE8012890BEF00D8079E /* libxdaap.a */,
+ 18404DFC1396C44F00863BBA /* SlingboxLib.a */,
);
name = "Internal Libs";
sourceTree = "<group>";
@@ -6129,7 +6142,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\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 *x86-osx.* --exclude *.zlib --exclude *.zip --exclude *.a --exclude *.pyd --exclude *x86-osx.so --exclude *powerpc-osx.so\"\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 \n#SYNCSKIN=\"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\"\nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence --exclude screensaver.rsxs*\"\n\n# binary name is XBMC but we build XBMC.bin so to get a clean binary each time\nmv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/osx\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n#${SYNC} \"$SRCROOT/tools/osx\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\tmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Resources/XBMC/extras/user\"\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/extras/user\"\nfi\n\nfi";
+ shellScript = "#!/bin/bash\n\necho \"copy root files\"\n\nif [ \"$ACTION\" = build ] ; then\n\n# for external testing\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\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 *x86-osx.* --exclude *.zlib --exclude *.a --exclude *.pyd --exclude *x86-osx.so --exclude *powerpc-osx.so\"\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 \n#SYNCSKIN=\"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\"\nSYNCSKIN=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude *.dll --exclude *.DLL --exclude *linux.* --exclude *.bat\"\n\n# rsync command for including everything but the skins\nADDONSYNC=\"rsync -aq --exclude CVS* --exclude .svn* --exclude .cvsignore* --exclude .cvspass* --exclude .DS_Store* --exclude skin.confluence --exclude screensaver.rsxs*\"\n\n# binary name is XBMC but we build XBMC.bin so to get a clean binary each time\nmv $TARGET_BUILD_DIR/$TARGET_NAME/XBMC.bin $TARGET_BUILD_DIR/$TARGET_NAME/XBMC\n\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/language\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/sounds\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/system\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/userdata\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/media\"\nmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools/osx\"\n\n${SYNC} \"$SRCROOT/LICENSE.GPL\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n${SYNC} \"$SRCROOT/xbmc/osx/Credits.html\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/\"\n#${SYNC} \"$SRCROOT/tools/osx\"\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/tools\"\n${ADDONSYNC} \"$SRCROOT/addons\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/language\"\t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/media\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNCSKIN} \"$SRCROOT/addons/skin.confluence\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/backgrounds\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/addons/skin.confluence/icon.png\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/addons/skin.confluence\"\n${SYNC} \"$SRCROOT/sounds\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/system\" \t\t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n${SYNC} \"$SRCROOT/userdata\" \t\"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\n\n# copy extra packages if applicable\nif [ -d \"$SRCROOT/extras/system\" ]; then\n\t${SYNC} \"$SRCROOT/extras/system/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome\"\nfi\n\n# copy extra user packages if applicable\nif [ -d \"$SRCROOT/extras/user\" ]; then\n\tmkdir -p \"$TARGET_BUILD_DIR/$TARGET_NAME/Resources/XBMC/extras/user\"\n\t${SYNC} \"$SRCROOT/extras/user/\" \"$TARGET_BUILD_DIR/$TARGET_NAME/XBMCData/XBMCHome/extras/user\"\nfi\n\nfi";
showEnvVarsInLog = 0;
};
F589B48D128A697C00D8079E /* copy frameworks */ = {
@@ -6144,7 +6157,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/bash;
- 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/ios-4.2_arm7\n\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\nTARGET_CONTENTS=$TARGET_BUILD_DIR/$TARGET_NAME\n\nTARGET_BINARY=$TARGET_CONTENTS/XBMC\nTARGET_FRAMEWORKS=$TARGET_CONTENTS/Frameworks\nDYLIB_NAMEPATH=@executable_path/Appliances/XBMC.frappliance/Frameworks\nXBMC_HOME=$TARGET_CONTENTS/XBMCData/XBMCHome\n\nmkdir -p \"$TARGET_CONTENTS\"\nmkdir -p \"$TARGET_CONTENTS/XBMCData/XBMCHome\"\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\"\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";
+ 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/ios-4.2_armv7\n\nTARGET_NAME=$PRODUCT_NAME.$WRAPPER_EXTENSION\nTARGET_CONTENTS=$TARGET_BUILD_DIR/$TARGET_NAME\n\nTARGET_BINARY=$TARGET_CONTENTS/XBMC\nTARGET_FRAMEWORKS=$TARGET_CONTENTS/Frameworks\nDYLIB_NAMEPATH=@executable_path/Appliances/XBMC.frappliance/Frameworks\nXBMC_HOME=$TARGET_CONTENTS/XBMCData/XBMCHome\n\nmkdir -p \"$TARGET_CONTENTS\"\nmkdir -p \"$TARGET_CONTENTS/XBMCData/XBMCHome\"\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\"\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";
};
/* End PBXShellScriptBuildPhase section */
@@ -6339,12 +6352,10 @@
F56C793B131EC154000AD0F6 /* SPCCodec.cpp in Sources */,
F56C793C131EC154000AD0F6 /* TimidityCodec.cpp in Sources */,
F56C793D131EC154000AD0F6 /* WAVcodec.cpp in Sources */,
- F56C793E131EC154000AD0F6 /* WAVPackcodec.cpp in Sources */,
F56C793F131EC154000AD0F6 /* YMCodec.cpp in Sources */,
F56C7941131EC154000AD0F6 /* AudioRendererFactory.cpp in Sources */,
F56C7942131EC154000AD0F6 /* NullDirectSound.cpp in Sources */,
F56C7943131EC154000AD0F6 /* BaseRenderer.cpp in Sources */,
- F56C7944131EC154000AD0F6 /* LinuxRenderer.cpp in Sources */,
F56C7946131EC154000AD0F6 /* OverlayRendererGL.cpp in Sources */,
F56C7947131EC154000AD0F6 /* OverlayRenderer.cpp in Sources */,
F56C7948131EC154000AD0F6 /* OverlayRendererUtil.cpp in Sources */,
@@ -6642,7 +6653,6 @@
F56C7A71131EC155000AD0F6 /* XBPyThread.cpp in Sources */,
F56C7A72131EC155000AD0F6 /* AnnouncementManager.cpp in Sources */,
F56C7A73131EC155000AD0F6 /* Builtins.cpp in Sources */,
- F56C7A74131EC155000AD0F6 /* XCriticalSection.cpp in Sources */,
F56C7A75131EC155000AD0F6 /* ConvUtils.cpp in Sources */,
F56C7A76131EC155000AD0F6 /* LinuxResourceCounter.cpp in Sources */,
F56C7A77131EC155000AD0F6 /* LinuxTimezone.cpp in Sources */,
@@ -6785,15 +6795,9 @@
F56C7B06131EC155000AD0F6 /* IoSupport.cpp in Sources */,
F56C7B07131EC155000AD0F6 /* MediaManager.cpp in Sources */,
F56C7B08131EC155000AD0F6 /* cdioSupport.cpp in Sources */,
- F56C7B09131EC155000AD0F6 /* SemaphoreDarwin.cpp in Sources */,
F56C7B0A131EC155000AD0F6 /* Atomics.cpp in Sources */,
- F56C7B0B131EC155000AD0F6 /* CriticalSection.cpp in Sources */,
F56C7B0C131EC155000AD0F6 /* Event.cpp in Sources */,
F56C7B0D131EC155000AD0F6 /* LockFree.cpp in Sources */,
- F56C7B0E131EC155000AD0F6 /* Mutex.cpp in Sources */,
- F56C7B0F131EC155000AD0F6 /* Semaphore.cpp in Sources */,
- F56C7B10131EC155000AD0F6 /* SharedSection.cpp in Sources */,
- F56C7B11131EC155000AD0F6 /* SingleLock.cpp in Sources */,
F56C7B12131EC155000AD0F6 /* Thread.cpp in Sources */,
F56C7B13131EC155000AD0F6 /* GLUtils.cpp in Sources */,
F56C7B14131EC155000AD0F6 /* XMLUtils.cpp in Sources */,
@@ -6920,7 +6924,6 @@
F56C7BE6131EC455000AD0F6 /* LinuxRendererGLES.cpp in Sources */,
F56C7BE9131EC46E000AD0F6 /* yuv2rgb.neon.S in Sources */,
F56C7BEC131EC495000AD0F6 /* IOSAudioRenderer.cpp in Sources */,
- F56C7BF2131EC4CE000AD0F6 /* XBMC_mutex.cpp in Sources */,
F56C7BF5131EC4E8000AD0F6 /* fastmemcpy-arm.S in Sources */,
F56C7D83131EF8D9000AD0F6 /* NptZip.cpp in Sources */,
F56C7D84131EF8D9000AD0F6 /* NptStreams.cpp in Sources */,
@@ -7086,6 +7089,22 @@
C8AD444D13924E9000A75578 /* DVDInputStreamPVRManager.cpp in Sources */,
188B485E1392DF9500BD58AD /* PVRDirectory.cpp in Sources */,
188B485F1392DF9500BD58AD /* PVRFile.cpp in Sources */,
+ 18404DFB1396C43B00863BBA /* Slingbox.cpp in Sources */,
+ 1840B796139968DB007C848B /* JSONVariantParser.cpp in Sources */,
+ 1840B797139968DB007C848B /* JSONVariantWriter.cpp in Sources */,
+ 7C0A7ECD13A5DBF900AFC2BD /* AppParamParser.cpp in Sources */,
+ 18B7013C13A6ABBA0009C1AF /* AddonVersion.cpp in Sources */,
+ 18B7013F13A6ABD20009C1AF /* KeymapLoader.cpp in Sources */,
+ 7C0A7FC813A9E75400AFC2BD /* DirtyRegionSolvers.cpp in Sources */,
+ 7C0A7FC913A9E75400AFC2BD /* DirtyRegionTracker.cpp in Sources */,
+ 7C0A7FCC13A9E76E00AFC2BD /* GUIWindowDebugInfo.cpp in Sources */,
+ DF0DF16C13A3AF82008ED511 /* FileNFS.cpp in Sources */,
+ DF0DF16D13A3AF82008ED511 /* NFSDirectory.cpp in Sources */,
+ F558F66F13AFE81500631E12 /* ThreadLocal.cpp in Sources */,
+ 7C89627013B702F3003631FE /* GUIWindowScreensaverDim.cpp in Sources */,
+ 1830216013B8E35300770920 /* controledit.cpp in Sources */,
+ DF27E25C13C23CCA002514FE /* InertialScrollingHandler.cpp in Sources */,
+ 18ECC9AA13CF17EB00A9ED6C /* StreamUtils.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -7123,6 +7142,9 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
_DEBUG,
+ TARGET_POSIX,
+ TARGET_DARWIN,
+ TARGET_DARWIN_IOS,
_LINUX,
_REENTRANT,
_FILE_DEFINED,
@@ -7132,6 +7154,7 @@
HAVE_CONFIG_H,
HAS_SPC_CODEC,
);
+ GCC_THUMB_SUPPORT = YES;
HEADER_SEARCH_PATHS = (
$SRCROOT,
xbmc,
@@ -7160,6 +7183,7 @@
"\"$(SRCROOT)/xbmc/interfaces/json-rpc\"",
"\"$(SRCROOT)/xbmc/interfaces/http-api\"",
"\"$(SRCROOT)/lib/libTcpSocket\"",
+ "\"$(SRCROOT)/lib/SlingboxLib\"",
);
OTHER_LDFLAGS = (
"-Wl,-headerpad_max_install_names",
@@ -7167,6 +7191,7 @@
"-Wl,-read_only_relocs,suppress",
"-Wl,-all_load",
"-L$XBMC_DEPENDS/lib",
+ "-lssh",
"-llzo2",
"-lpcre",
"-lpcrecpp",
@@ -7179,6 +7204,8 @@
"-lmicrohttpd",
"-lsmbclient",
"-lpython2.6",
+ "-lboost_thread",
+ "-lyajl",
"-L$XBMC_DEPENDS/lib/mysql",
"-lmysqlclient",
);
@@ -7187,7 +7214,7 @@
TARGETED_DEVICE_FAMILY = "2,3";
USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6";
WRAPPER_EXTENSION = frappliance;
- XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_arm7";
+ XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_armv7";
};
name = Debug;
};
@@ -7195,6 +7222,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
EXECUTABLE_EXTENSION = "";
@@ -7210,6 +7238,9 @@
GCC_OPTIMIZATION_LEVEL = 3;
GCC_PREPROCESSOR_DEFINITIONS = (
NDEBUG,
+ TARGET_POSIX,
+ TARGET_DARWIN,
+ TARGET_DARWIN_IOS,
_LINUX,
_REENTRANT,
_FILE_DEFINED,
@@ -7247,6 +7278,7 @@
"\"$(SRCROOT)/xbmc/interfaces/json-rpc\"",
"\"$(SRCROOT)/xbmc/interfaces/http-api\"",
"\"$(SRCROOT)/lib/libTcpSocket\"",
+ "\"$(SRCROOT)/lib/SlingboxLib\"",
);
OTHER_LDFLAGS = (
"-Wl,-headerpad_max_install_names",
@@ -7254,6 +7286,7 @@
"-Wl,-read_only_relocs,suppress",
"-Wl,-all_load",
"-L$XBMC_DEPENDS/lib",
+ "-lssh",
"-llzo2",
"-lpcre",
"-lpcrecpp",
@@ -7266,6 +7299,8 @@
"-lmicrohttpd",
"-lsmbclient",
"-lpython2.6",
+ "-lboost_thread",
+ "-lyajl",
"-L$XBMC_DEPENDS/lib/mysql",
"-lmysqlclient",
);
@@ -7274,7 +7309,7 @@
TARGETED_DEVICE_FAMILY = "2,3";
USER_HEADER_SEARCH_PATHS = "$XBMC_DEPENDS/include $XBMC_DEPENDS/include/mysql $XBMC_DEPENDS/include/freetype2 $XBMC_DEPENDS/include/python2.6";
WRAPPER_EXTENSION = frappliance;
- XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_arm7";
+ XBMC_DEPENDS = "/Users/Shared/xbmc-depends/ios-4.2_armv7";
};
name = Release;
};
View
223 XBMC-IOS.xcodeproj/project.pbxproj
@@ -7,9 +7,22 @@
objects = {
/* Begin PBXBuildFile section */
+ 1830219E13B8E37300770920 /* controledit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1830219D13B8E37300770920 /* controledit.cpp */; };
+ 18404DD31396C3D200863BBA /* SlingboxLib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 18404DD21396C3D200863BBA /* SlingboxLib.a */; };
+ 18404DD61396C3F300863BBA /* Slingbox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18404DD41396C3F300863BBA /* Slingbox.cpp */; };
+ 1840B77A1399616D007C848B /* JSONVariantParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1840B7761399616D007C848B /* JSONVariantParser.cpp */; };
+ 1840B77B1399616D007C848B /* JSONVariantWriter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1840B7781399616D007C848B /* JSONVariantWriter.cpp */; };
18ACF8FD13597B5700B67371 /* RecentlyAddedJob.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18ACF8FB13597B5700B67371 /* RecentlyAddedJob.cpp */; };
+ 18B700F313A6A7510009C1AF /* KeymapLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B700F113A6A7510009C1AF /* KeymapLoader.cpp */; };
+ 18B700F613A6A7850009C1AF /* AddonVersion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B700F413A6A7850009C1AF /* AddonVersion.cpp */; };
+ 18ECC99D13CF17D200A9ED6C /* StreamUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18ECC99B13CF17D200A9ED6C /* StreamUtils.cpp */; };
3255316612B2D02400837CD2 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3255316512B2D02400837CD2 /* CoreAudio.framework */; };
4D5D2E1E1301758F006ABC13 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D5D2E1D1301758F006ABC13 /* CFNetwork.framework */; };
+ 7C0A7EDE13A5DC2800AFC2BD /* AppParamParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7EDC13A5DC2800AFC2BD /* AppParamParser.cpp */; };
+ 7C0A7F9D13A9E70800AFC2BD /* GUIWindowDebugInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7F9B13A9E70800AFC2BD /* GUIWindowDebugInfo.cpp */; };
+ 7C0A7FB213A9E72E00AFC2BD /* DirtyRegionSolvers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FAE13A9E72E00AFC2BD /* DirtyRegionSolvers.cpp */; };
+ 7C0A7FB313A9E72E00AFC2BD /* DirtyRegionTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C0A7FB013A9E72E00AFC2BD /* DirtyRegionTracker.cpp */; };
+ 7C89628013B7031E003631FE /* GUIWindowScreensaverDim.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C89627E13B7031E003631FE /* GUIWindowScreensaverDim.cpp */; };
7C99B6E9133D36E200FC2B16 /* CacheCircular.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B6E7133D36E200FC2B16 /* CacheCircular.cpp */; };
7C99B7BE1340730000FC2B16 /* GUIDialogPlayEject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C99B7BC1340730000FC2B16 /* GUIDialogPlayEject.cpp */; };
C80711AD135DB85F002F601B /* InputOperations.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C80711AB135DB85F002F601B /* InputOperations.cpp */; };
@@ -68,7 +81,11 @@
C8AD438E13924A7B00A75578 /* GUIDialogExtendedProgressBar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8AD438C13924A7B00A75578 /* GUIDialogExtendedProgressBar.cpp */; };
C8AD439313924AAB00A75578 /* TextSearch.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8AD439113924AAB00A75578 /* TextSearch.cpp */; };
C8EC5D26136953E100CCC10D /* XBMC_keytable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C8EC5D24136953E100CCC10D /* XBMC_keytable.cpp */; };
+ DF0DF17F13A3AF9F008ED511 /* FileNFS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF17B13A3AF9F008ED511 /* FileNFS.cpp */; };
+ DF0DF18013A3AF9F008ED511 /* NFSDirectory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF0DF17D13A3AF9F008ED511 /* NFSDirectory.cpp */; };
+ DF27E23613C23CAC002514FE /* InertialScrollingHandler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DF27E23413C23CAC002514FE /* InertialScrollingHandler.cpp */; };
F54D9E8112B713F8006870F9 /* libc.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F54D9E8012B713F8006870F9 /* libc.dylib */; };
+ F558F61113AFDC3000631E12 /* ThreadLocal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F558F60F13AFDC3000631E12 /* ThreadLocal.cpp */; };
F56B143412CAF279009B4C96 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B143312CAF279009B4C96 /* CoreVideo.framework */; };
F56B14A512CAF523009B4C96 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B14A412CAF523009B4C96 /* AudioToolbox.framework */; };
F56B15D512CD67A9009B4C96 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F56B15D412CD67A9009B4C96 /* CoreGraphics.framework */; };
@@ -331,7 +348,6 @@
F56C8912131F42ED000AD0F6 /* DVDSubtitleTagSami.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C82E1131F42E7000AD0F6 /* DVDSubtitleTagSami.cpp */; };
F56C8913131F42ED000AD0F6 /* ExternalPlayer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C82E6131F42E7000AD0F6 /* ExternalPlayer.cpp */; };
F56C8914131F42ED000AD0F6 /* BaseRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C82EA131F42E7000AD0F6 /* BaseRenderer.cpp */; };
- F56C8915131F42ED000AD0F6 /* LinuxRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C82EC131F42E7000AD0F6 /* LinuxRenderer.cpp */; };
F56C8916131F42ED000AD0F6 /* LinuxRendererGLES.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C82EE131F42E7000AD0F6 /* LinuxRendererGLES.cpp */; };
F56C8917131F42ED000AD0F6 /* OverlayRendererGL.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C82F0131F42E7000AD0F6 /* OverlayRendererGL.cpp */; };
F56C8918131F42ED000AD0F6 /* OverlayRenderer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C82F2131F42E7000AD0F6 /* OverlayRenderer.cpp */; };
@@ -361,7 +377,6 @@
F56C8931131F42ED000AD0F6 /* SPCCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C832A131F42E7000AD0F6 /* SPCCodec.cpp */; };
F56C8932131F42ED000AD0F6 /* TimidityCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C832C131F42E7000AD0F6 /* TimidityCodec.cpp */; };
F56C8933131F42ED000AD0F6 /* WAVcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C832E131F42E7000AD0F6 /* WAVcodec.cpp */; };
- F56C8934131F42ED000AD0F6 /* WAVPackcodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8330131F42E7000AD0F6 /* WAVPackcodec.cpp */; };
F56C8935131F42ED000AD0F6 /* YMCodec.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8332131F42E7000AD0F6 /* YMCodec.cpp */; };
F56C8936131F42ED000AD0F6 /* PlayerCoreFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8336131F42E7000AD0F6 /* PlayerCoreFactory.cpp */; };
F56C8937131F42ED000AD0F6 /* PlayerSelectionRule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8338131F42E7000AD0F6 /* PlayerSelectionRule.cpp */; };
@@ -654,7 +669,6 @@
F56C8A5B131F42ED000AD0F6 /* XBPyThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8584131F42EA000AD0F6 /* XBPyThread.cpp */; };
F56C8A5C131F42ED000AD0F6 /* AnnouncementManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8586131F42EA000AD0F6 /* AnnouncementManager.cpp */; };
F56C8A5D131F42ED000AD0F6 /* Builtins.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8588131F42EA000AD0F6 /* Builtins.cpp */; };
- F56C8A5E131F42ED000AD0F6 /* XCriticalSection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C858E131F42EA000AD0F6 /* XCriticalSection.cpp */; };
F56C8A5F131F42ED000AD0F6 /* ConvUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8590131F42EA000AD0F6 /* ConvUtils.cpp */; };
F56C8A60131F42ED000AD0F6 /* LinuxResourceCounter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8592131F42EA000AD0F6 /* LinuxResourceCounter.cpp */; };
F56C8A61131F42ED000AD0F6 /* LinuxTimezone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8594131F42EA000AD0F6 /* LinuxTimezone.cpp */; };
@@ -800,17 +814,10 @@
F56C8AF3131F42ED000AD0F6 /* IoSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86D9131F42EB000AD0F6 /* IoSupport.cpp */; };
F56C8AF4131F42ED000AD0F6 /* MediaManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86DB131F42EB000AD0F6 /* MediaManager.cpp */; };
F56C8AF5131F42ED000AD0F6 /* cdioSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86DD131F42EB000AD0F6 /* cdioSupport.cpp */; };
- F56C8AF6131F42ED000AD0F6 /* SemaphoreDarwin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86E1131F42EB000AD0F6 /* SemaphoreDarwin.cpp */; };
F56C8AF7131F42ED000AD0F6 /* Atomics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86E3131F42EB000AD0F6 /* Atomics.cpp */; };
- F56C8AF8131F42ED000AD0F6 /* CriticalSection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86E5131F42EB000AD0F6 /* CriticalSection.cpp */; };
F56C8AF9131F42ED000AD0F6 /* Event.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86E7131F42EB000AD0F6 /* Event.cpp */; };
F56C8AFA131F42ED000AD0F6 /* LockFree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86EA131F42EB000AD0F6 /* LockFree.cpp */; };
- F56C8AFB131F42ED000AD0F6 /* Mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86EC131F42EB000AD0F6 /* Mutex.cpp */; };
- F56C8AFC131F42ED000AD0F6 /* Semaphore.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86EE131F42EB000AD0F6 /* Semaphore.cpp */; };
- F56C8AFD131F42ED000AD0F6 /* SharedSection.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86F0131F42EB000AD0F6 /* SharedSection.cpp */; };
- F56C8AFE131F42ED000AD0F6 /* SingleLock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86F2131F42EB000AD0F6 /* SingleLock.cpp */; };
F56C8AFF131F42ED000AD0F6 /* Thread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86F4131F42EB000AD0F6 /* Thread.cpp */; };
- F56C8B01131F42ED000AD0F6 /* XBMC_mutex.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86F8131F42EB000AD0F6 /* XBMC_mutex.cpp */; };
F56C8B02131F42ED000AD0F6 /* GLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86FC131F42EB000AD0F6 /* GLUtils.cpp */; };
F56C8B03131F42ED000AD0F6 /* XMLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C86FF131F42EB000AD0F6 /* XMLUtils.cpp */; };
F56C8B04131F42ED000AD0F6 /* StringUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F56C8701131F42EB000AD0F6 /* StringUtils.cpp */; };
@@ -934,7 +941,6 @@
F56C8BAB131F4466000AD0F6 /* XBMCEAGLView.mm in Sources */ = {isa = PBXBuildFile; fileRef = F56C8BA5131F4466000AD0F6 /* XBMCEAGLView.mm */; };
F56C8BB9131F44AA000AD0F6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F56C8BB7131F44AA000AD0F6 /* InfoPlist.strings */; };
F56C8C09131F47EA000AD0F6 /* libapetag.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C03131F47EA000AD0F6 /* libapetag.a */; };
- F56C8C0C131F47EA000AD0F6 /* libjsoncpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C06131F47EA000AD0F6 /* libjsoncpp.a */; };
F56C8C11131F4811000AD0F6 /* libsquish.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C0D131F4811000AD0F6 /* libsquish.a */; };
F56C8C12131F4811000AD0F6 /* librtv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C0E131F4811000AD0F6 /* librtv.a */; };
F56C8C14131F4811000AD0F6 /* libxdaap.a in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8C10131F4811000AD0F6 /* libxdaap.a */; };
@@ -970,14 +976,40 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ 1830219D13B8E37300770920 /* controledit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = controledit.cpp; sourceTree = "<group>"; };
+ 18404DD21396C3D200863BBA /* SlingboxLib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = SlingboxLib.a; path = lib/SlingboxLib/SlingboxLib.a; sourceTree = "<group>"; };
+ 18404DD41396C3F300863BBA /* Slingbox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Slingbox.cpp; sourceTree = "<group>"; };
+ 18404DD51396C3F300863BBA /* Slingbox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Slingbox.h; sourceTree = "<group>"; };
+ 1840B7761399616D007C848B /* JSONVariantParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONVariantParser.cpp; sourceTree = "<group>"; };
+ 1840B7771399616D007C848B /* JSONVariantParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONVariantParser.h; sourceTree = "<group>"; };
+ 1840B7781399616D007C848B /* JSONVariantWriter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSONVariantWriter.cpp; sourceTree = "<group>"; };
+ 1840B7791399616D007C848B /* JSONVariantWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSONVariantWriter.h; sourceTree = "<group>"; };
18ACF8FB13597B5700B67371 /* RecentlyAddedJob.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RecentlyAddedJob.cpp; sourceTree = "<group>"; };
18ACF8FC13597B5700B67371 /* RecentlyAddedJob.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RecentlyAddedJob.h; sourceTree = "<group>"; };
+ 18B700F113A6A7510009C1AF /* KeymapLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeymapLoader.cpp; sourceTree = "<group>"; };
+ 18B700F213A6A7510009C1AF /* KeymapLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeymapLoader.h; sourceTree = "<group>"; };
+ 18B700F413A6A7850009C1AF /* AddonVersion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AddonVersion.cpp; sourceTree = "<group>"; };
+ 18B700F513A6A7850009C1AF /* AddonVersion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonVersion.h; sourceTree = "<group>"; };
+ 18ECC99B13CF17D200A9ED6C /* StreamUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StreamUtils.cpp; sourceTree = "<group>"; };
+ 18ECC99C13CF17D200A9ED6C /* StreamUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamUtils.h; sourceTree = "<group>"; };
3255316512B2D02400837CD2 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
4D5D2E1D1301758F006ABC13 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
+ 7C0A7EDC13A5DC2800AFC2BD /* AppParamParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppParamParser.cpp; sourceTree = "<group>"; };
+ 7C0A7EDD13A5DC2800AFC2BD /* AppParamParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppParamParser.h; sourceTree = "<group>"; };
+ 7C0A7F9B13A9E70800AFC2BD /* GUIWindowDebugInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowDebugInfo.cpp; sourceTree = "<group>"; };
+ 7C0A7F9C13A9E70800AFC2BD /* GUIWindowDebugInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowDebugInfo.h; sourceTree = "<group>"; };
+ 7C0A7FAD13A9E72E00AFC2BD /* DirtyRegion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirtyRegion.h; sourceTree = "<group>"; };
+ 7C0A7FAE13A9E72E00AFC2BD /* DirtyRegionSolvers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirtyRegionSolvers.cpp; sourceTree = "<group>"; };
+ 7C0A7FAF13A9E72E00AFC2BD /* DirtyRegionSolvers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirtyRegionSolvers.h; sourceTree = "<group>"; };
+ 7C0A7FB013A9E72E00AFC2BD /* DirtyRegionTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DirtyRegionTracker.cpp; sourceTree = "<group>"; };
+ 7C0A7FB113A9E72E00AFC2BD /* DirtyRegionTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DirtyRegionTracker.h; sourceTree = "<group>"; };
+ 7C89627E13B7031E003631FE /* GUIWindowScreensaverDim.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIWindowScreensaverDim.cpp; sourceTree = "<group>"; };
+ 7C89627F13B7031E003631FE /* GUIWindowScreensaverDim.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIWindowScreensaverDim.h; sourceTree = "<group>"; };
7C99B6E7133D36E200FC2B16 /* CacheCircular.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CacheCircular.cpp; sourceTree = "<group>"; };
7C99B6E8133D36E200FC2B16 /* CacheCircular.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CacheCircular.h; sourceTree = "<group>"; };
7C99B7BC1340730000FC2B16 /* GUIDialogPlayEject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogPlayEject.cpp; sourceTree = "<group>"; };
7C99B7BD1340730000FC2B16 /* GUIDialogPlayEject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogPlayEject.h; sourceTree = "<group>"; };
+ 83D619BB13C0D25300418A0F /* README.ios */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = README.ios; sourceTree = "<group>"; };
8D576316048677EA00EA77CD /* XBMC.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = XBMC.app; sourceTree = BUILT_PRODUCTS_DIR; };
C80711AB135DB85F002F601B /* InputOperations.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InputOperations.cpp; sourceTree = "<group>"; };
C80711AC135DB85F002F601B /* InputOperations.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InputOperations.h; sourceTree = "<group>"; };
@@ -1091,7 +1123,16 @@
C8AD439213924AAB00A75578 /* TextSearch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextSearch.h; sourceTree = "<group>"; };
C8EC5D24136953E100CCC10D /* XBMC_keytable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMC_keytable.cpp; sourceTree = "<group>"; };
C8EC5D25136953E100CCC10D /* XBMC_keytable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_keytable.h; sourceTree = "<group>"; };
+ DF0DF17B13A3AF9F008ED511 /* FileNFS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FileNFS.cpp; sourceTree = "<group>"; };
+ DF0DF17C13A3AF9F008ED511 /* FileNFS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FileNFS.h; sourceTree = "<group>"; };
+ DF0DF17D13A3AF9F008ED511 /* NFSDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NFSDirectory.cpp; sourceTree = "<group>"; };
+ DF0DF17E13A3AF9F008ED511 /* NFSDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NFSDirectory.h; sourceTree = "<group>"; };
+ DF27E23413C23CAC002514FE /* InertialScrollingHandler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InertialScrollingHandler.cpp; sourceTree = "<group>"; };
+ DF27E23513C23CAC002514FE /* InertialScrollingHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InertialScrollingHandler.h; sourceTree = "<group>"; };
F54D9E8012B713F8006870F9 /* libc.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libc.dylib; path = usr/lib/libc.dylib; sourceTree = SDKROOT; };
+ F558F60613AFDC1700631E12 /* Condition.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Condition.h; sourceTree = "<group>"; };
+ F558F60F13AFDC3000631E12 /* ThreadLocal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ThreadLocal.cpp; sourceTree = "<group>"; };
+ F558F61013AFDC3000631E12 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
F56B143312CAF279009B4C96 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = System/Library/Frameworks/CoreVideo.framework; sourceTree = SDKROOT; };
F56B14A412CAF523009B4C96 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
F56B15D412CD67A9009B4C96 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -1104,7 +1145,6 @@
F56C803B131F42E5000AD0F6 /* DllStSound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllStSound.h; sourceTree = "<group>"; };
F56C803C131F42E5000AD0F6 /* DllTimidity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllTimidity.h; sourceTree = "<group>"; };
F56C803D131F42E5000AD0F6 /* DllVorbisfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllVorbisfile.h; sourceTree = "<group>"; };
- F56C803E131F42E5000AD0F6 /* DllWAVPack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DllWAVPack.h; sourceTree = "<group>"; };
F56C8040131F42E5000AD0F6 /* tinystr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinystr.cpp; sourceTree = "<group>"; };
F56C8041131F42E5000AD0F6 /* tinystr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tinystr.h; sourceTree = "<group>"; };
F56C8042131F42E5000AD0F6 /* tinyxml.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tinyxml.cpp; sourceTree = "<group>"; };
@@ -1508,11 +1548,6 @@
F56C81F3131F42E6000AD0F6 /* EncoderWav.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EncoderWav.cpp; sourceTree = "<group>"; };
F56C81F4131F42E6000AD0F6 /* EncoderWav.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EncoderWav.h; sourceTree = "<group>"; };
F56C81F6131F42E6000AD0F6 /* lame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = lame.h; sourceTree = "<group>"; };
- F56C81F8131F42E6000AD0F6 /* codec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = codec.h; sourceTree = "<group>"; };
- F56C81F9131F42E6000AD0F6 /* ogg.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ogg.h; sourceTree = "<group>"; };
- F56C81FA131F42E6000AD0F6 /* os_types.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = os_types.h; sourceTree = "<group>"; };
- F56C81FB131F42E6000AD0F6 /* vorbisenc.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbisenc.h; sourceTree = "<group>"; };
- F56C81FC131F42E6000AD0F6 /* vorbisfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = vorbisfile.h; sourceTree = "<group>"; };
F56C81FF131F42E6000AD0F6 /* IOSAudioRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = IOSAudioRenderer.cpp; path = AudioRenderers/IOSAudioRenderer.cpp; sourceTree = "<group>"; };
F56C8200131F42E6000AD0F6 /* IOSAudioRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IOSAudioRenderer.h; path = AudioRenderers/IOSAudioRenderer.h; sourceTree = "<group>"; };
F56C8201131F42E6000AD0F6 /* IAudioRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IAudioRenderer.h; path = AudioRenderers/IAudioRenderer.h; sourceTree = "<group>"; };
@@ -1731,8 +1766,6 @@
F56C82E8131F42E7000AD0F6 /* IPlayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IPlayer.h; sourceTree = "<group>"; };
F56C82EA131F42E7000AD0F6 /* BaseRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BaseRenderer.cpp; sourceTree = "<group>"; };
F56C82EB131F42E7000AD0F6 /* BaseRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BaseRenderer.h; sourceTree = "<group>"; };
- F56C82EC131F42E7000AD0F6 /* LinuxRenderer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinuxRenderer.cpp; sourceTree = "<group>"; };
- F56C82ED131F42E7000AD0F6 /* LinuxRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinuxRenderer.h; sourceTree = "<group>"; };
F56C82EE131F42E7000AD0F6 /* LinuxRendererGLES.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinuxRendererGLES.cpp; sourceTree = "<group>"; };
F56C82EF131F42E7000AD0F6 /* LinuxRendererGLES.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LinuxRendererGLES.h; sourceTree = "<group>"; };
F56C82F0131F42E7000AD0F6 /* OverlayRendererGL.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OverlayRendererGL.cpp; sourceTree = "<group>"; };
@@ -1752,7 +1785,6 @@
F56C82FF131F42E7000AD0F6 /* YUV2RGBShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YUV2RGBShader.cpp; sourceTree = "<group>"; };
F56C8300131F42E7000AD0F6 /* YUV2RGBShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YUV2RGBShader.h; sourceTree = "<group>"; };
F56C8301131F42E7000AD0F6 /* WinRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WinRenderer.h; sourceTree = "<group>"; };
- F56C8302131F42E7000AD0F6 /* WinRenderManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WinRenderManager.h; sourceTree = "<group>"; };
F56C8303131F42E7000AD0F6 /* yuv2rgb.neon.S */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.asm; path = yuv2rgb.neon.S; sourceTree = "<group>"; };
F56C8304131F42E7000AD0F6 /* yuv2rgb.neon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = yuv2rgb.neon.h; sourceTree = "<group>"; };
F56C8306131F42E7000AD0F6 /* ASAPCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ASAPCodec.cpp; sourceTree = "<group>"; };
@@ -1795,8 +1827,6 @@
F56C832D131F42E7000AD0F6 /* TimidityCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimidityCodec.h; sourceTree = "<group>"; };
F56C832E131F42E7000AD0F6 /* WAVcodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WAVcodec.cpp; sourceTree = "<group>"; };
F56C832F131F42E7000AD0F6 /* WAVcodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAVcodec.h; sourceTree = "<group>"; };
- F56C8330131F42E7000AD0F6 /* WAVPackcodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WAVPackcodec.cpp; sourceTree = "<group>"; };
- F56C8331131F42E7000AD0F6 /* WAVPackcodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WAVPackcodec.h; sourceTree = "<group>"; };
F56C8332131F42E7000AD0F6 /* YMCodec.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = YMCodec.cpp; sourceTree = "<group>"; };
F56C8333131F42E7000AD0F6 /* YMCodec.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = YMCodec.h; sourceTree = "<group>"; };
F56C8335131F42E7000AD0F6 /* PlayerCoreConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PlayerCoreConfig.h; path = playercorefactory/PlayerCoreConfig.h; sourceTree = "<group>"; };
@@ -2116,7 +2146,6 @@
F56C8476131F42E8000AD0F6 /* VirtualDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VirtualDirectory.h; sourceTree = "<group>"; };
F56C847B131F42E9000AD0F6 /* ZeroconfDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZeroconfDirectory.h; sourceTree = "<group>"; };
F56C847C131F42E9000AD0F6 /* ZeroconfDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZeroconfDirectory.cpp; sourceTree = "<group>"; };
- F56C847D131F42E9000AD0F6 /* zconf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zconf.h; sourceTree = "<group>"; };
F56C847E131F42E9000AD0F6 /* ZipDirectory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZipDirectory.cpp; sourceTree = "<group>"; };
F56C847F131F42E9000AD0F6 /* ZipDirectory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZipDirectory.h; sourceTree = "<group>"; };
F56C8480131F42E9000AD0F6 /* ZipManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ZipManager.cpp; sourceTree = "<group>"; };
@@ -2380,8 +2409,6 @@
F56C858A131F42EA000AD0F6 /* IAnnouncer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = IAnnouncer.h; sourceTree = "<group>"; };
F56C858C131F42EA000AD0F6 /* stat_utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stat_utf8.h; sourceTree = "<group>"; };
F56C858D131F42EA000AD0F6 /* stdio_utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stdio_utf8.h; sourceTree = "<group>"; };
- F56C858E131F42EA000AD0F6 /* XCriticalSection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XCriticalSection.cpp; sourceTree = "<group>"; };
- F56C858F131F42EA000AD0F6 /* XCriticalSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XCriticalSection.h; sourceTree = "<group>"; };
F56C8590131F42EA000AD0F6 /* ConvUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConvUtils.cpp; sourceTree = "<group>"; };
F56C8591131F42EA000AD0F6 /* ConvUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConvUtils.h; sourceTree = "<group>"; };
F56C8592131F42EA000AD0F6 /* LinuxResourceCounter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LinuxResourceCounter.cpp; sourceTree = "<group>"; };
@@ -2681,29 +2708,17 @@
F56C86DC131F42EB000AD0F6 /* MediaManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MediaManager.h; sourceTree = "<group>"; };
F56C86DD131F42EB000AD0F6 /* cdioSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cdioSupport.cpp; sourceTree = "<group>"; };
F56C86DE131F42EB000AD0F6 /* cdioSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cdioSupport.h; sourceTree = "<group>"; };
- F56C86E1131F42EB000AD0F6 /* SemaphoreDarwin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SemaphoreDarwin.cpp; sourceTree = "<group>"; };
- F56C86E2131F42EB000AD0F6 /* SemaphoreDarwin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SemaphoreDarwin.h; sourceTree = "<group>"; };
F56C86E3131F42EB000AD0F6 /* Atomics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Atomics.cpp; sourceTree = "<group>"; };
F56C86E4131F42EB000AD0F6 /* Atomics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Atomics.h; sourceTree = "<group>"; };
- F56C86E5131F42EB000AD0F6 /* CriticalSection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CriticalSection.cpp; sourceTree = "<group>"; };
F56C86E6131F42EB000AD0F6 /* CriticalSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CriticalSection.h; sourceTree = "<group>"; };
F56C86E7131F42EB000AD0F6 /* Event.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Event.cpp; sourceTree = "<group>"; };
F56C86E8131F42EB000AD0F6 /* Event.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Event.h; sourceTree = "<group>"; };
- F56C86E9131F42EB000AD0F6 /* ISemaphore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ISemaphore.h; sourceTree = "<group>"; };
F56C86EA131F42EB000AD0F6 /* LockFree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LockFree.cpp; sourceTree = "<group>"; };
F56C86EB131F42EB000AD0F6 /* LockFree.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LockFree.h; sourceTree = "<group>"; };
- F56C86EC131F42EB000AD0F6 /* Mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Mutex.cpp; sourceTree = "<group>"; };
- F56C86ED131F42EB000AD0F6 /* Mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Mutex.h; sourceTree = "<group>"; };
- F56C86EE131F42EB000AD0F6 /* Semaphore.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Semaphore.cpp; sourceTree = "<group>"; };
- F56C86EF131F42EB000AD0F6 /* Semaphore.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Semaphore.hpp; sourceTree = "<group>"; };
- F56C86F0131F42EB000AD0F6 /* SharedSection.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SharedSection.cpp; sourceTree = "<group>"; };
F56C86F1131F42EB000AD0F6 /* SharedSection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SharedSection.h; sourceTree = "<group>"; };
- F56C86F2131F42EB000AD0F6 /* SingleLock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SingleLock.cpp; sourceTree = "<group>"; };
F56C86F3131F42EB000AD0F6 /* SingleLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SingleLock.h; sourceTree = "<group>"; };
F56C86F4131F42EB000AD0F6 /* Thread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Thread.cpp; sourceTree = "<group>"; };
F56C86F5131F42EB000AD0F6 /* Thread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Thread.h; sourceTree = "<group>"; };
- F56C86F8131F42EB000AD0F6 /* XBMC_mutex.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XBMC_mutex.cpp; sourceTree = "<group>"; };
- F56C86F9131F42EB000AD0F6 /* XBMC_mutex.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XBMC_mutex.h; sourceTree = "<group>"; };
F56C86FB131F42EB000AD0F6 /* GlobalsHandling.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GlobalsHandling.h; sourceTree = "<group>"; };
F56C86FC131F42EB000AD0F6 /* GLUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GLUtils.cpp; sourceTree = "<group>"; };
F56C86FD131F42EB000AD0F6 /* GLUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GLUtils.h; sourceTree = "<group>"; };
@@ -2961,7 +2976,6 @@
F56C8BA6131F4466000AD0F6 /* XBMCIOS-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "XBMCIOS-Info.plist"; sourceTree = "<group>"; };
F56C8BB8131F44AA000AD0F6 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = "<group>"; };
F56C8C03131F47EA000AD0F6 /* libapetag.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libapetag.a; path = lib/libapetag/.libs/libapetag.a; sourceTree = "<group>"; };
- F56C8C06131F47EA000AD0F6 /* libjsoncpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libjsoncpp.a; path = lib/jsoncpp/src/lib_json/libjsoncpp.a; sourceTree = "<group>"; };
F56C8C0D131F4811000AD0F6 /* libsquish.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsquish.a; path = lib/libsquish/libsquish.a; sourceTree = "<group>"; };
F56C8C0E131F4811000AD0F6 /* librtv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = librtv.a; path = lib/libRTV/librtv.a; sourceTree = "<group>"; };
F56C8C10131F4811000AD0F6 /* libxdaap.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libxdaap.a; path = lib/libXDAAP/libxdaap.a; sourceTree = "<group>"; };
@@ -3042,11 +3056,11 @@
F56B160812CD6999009B4C96 /* ImageIO.framework in Frameworks */,
4D5D2E1E1301758F006ABC13 /* CFNetwork.framework in Frameworks */,
F56C8C09131F47EA000AD0F6 /* libapetag.a in Frameworks */,
- F56C8C0C131F47EA000AD0F6 /* libjsoncpp.a in Frameworks */,
F56C8C11131F4811000AD0F6 /* libsquish.a in Frameworks */,
F56C8C12131F4811000AD0F6 /* librtv.a in Frameworks */,
F56C8C14131F4811000AD0F6 /* libxdaap.a in Frameworks */,
C8AD42C51392475000A75578 /* libTcpSocket.a in Frameworks */,
+ 18404DD31396C3D200863BBA /* SlingboxLib.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -3056,6 +3070,7 @@
089C166AFE841209C02AAC07 /* XBMC-frapp */ = {
isa = PBXGroup;
children = (
+ 83D619BA13C0D23400418A0F /* Documentation */,
F56C8034131F42E5000AD0F6 /* Source */,
F589AE6D12890B6700D8079E /* Internal Libs */,
F5899DC91287212700D8079E /* System Libs and Frameworks */,
@@ -3224,6 +3239,12 @@
C8AD4367139248FD00A75578 /* GUIEPGGridContainer.h */,
);
path = epg;
+ 83D619BA13C0D23400418A0F /* Documentation */ = {
+ isa = PBXGroup;
+ children = (
+ 83D619BB13C0D25300418A0F /* README.ios */,
+ );
+ name = Documentation;
sourceTree = "<group>";
};
F56C8034131F42E5000AD0F6 /* Source */ = {
@@ -3246,7 +3267,6 @@
F56C803B131F42E5000AD0F6 /* DllStSound.h */,
F56C803C131F42E5000AD0F6 /* DllTimidity.h */,
F56C803D131F42E5000AD0F6 /* DllVorbisfile.h */,
- F56C803E131F42E5000AD0F6 /* DllWAVPack.h */,
F56C803F131F42E5000AD0F6 /* tinyXML */,
F56C8046131F42E5000AD0F6 /* libexif */,
F56C8048131F42E5000AD0F6 /* libhdhomerun */,
@@ -3255,7 +3275,6 @@
F56C8063131F42E5000AD0F6 /* libRTV */,
F56C806E131F42E5000AD0F6 /* libsquish */,
F56C8070131F42E5000AD0F6 /* libUPnP */,
- F56C8145131F42E6000AD0F6 /* libXBMS */,
F56C8146131F42E6000AD0F6 /* libXDAAP */,
F56C814C131F42E6000AD0F6 /* UnrarXLib */,
);
@@ -3712,13 +3731,6 @@
path = TextToHeader;
sourceTree = "<group>";
};
- F56C8145131F42E6000AD0F6 /* libXBMS */ = {
- isa = PBXGroup;
- children = (
- );
- path = libXBMS;
- sourceTree = "<group>";
- };
F56C8146131F42E6000AD0F6 /* libXDAAP */ = {
isa = PBXGroup;
children = (
@@ -3911,6 +3923,8 @@
F56C87D7131F42ED000AD0F6 /* GUIViewControl.h */,
F56C87D8131F42ED000AD0F6 /* GUIViewState.cpp */,
F56C87D9131F42ED000AD0F6 /* GUIViewState.h */,
+ DF27E23413C23CAC002514FE /* InertialScrollingHandler.cpp */,
+ DF27E23513C23CAC002514FE /* InertialScrollingHandler.h */,
F56C87DA131F42ED000AD0F6 /* IProgressCallback.h */,
F56C87DB131F42ED000AD0F6 /* LangInfo.cpp */,
F56C87DC131F42ED000AD0F6 /* LangInfo.h */,
@@ -3986,6 +4000,8 @@
F56C81D1131F42E6000AD0F6 /* AddonManager.h */,
F56C81D2131F42E6000AD0F6 /* AddonStatusHandler.cpp */,
F56C81D3131F42E6000AD0F6 /* AddonStatusHandler.h */,
+ 18B700F413A6A7850009C1AF /* AddonVersion.cpp */,
+ 18B700F513A6A7850009C1AF /* AddonVersion.h */,
F56C81D4131F42E6000AD0F6 /* DllAddon.h */,
F56C81D7131F42E6000AD0F6 /* IAddon.h */,
F56C81D8131F42E6000AD0F6 /* Scraper.cpp */,
@@ -4040,11 +4056,6 @@
F56C81F7131F42E6000AD0F6 /* oggvorbis */ = {
isa = PBXGroup;
children = (
- F56C81F8131F42E6000AD0F6 /* codec.h */,
- F56C81F9131F42E6000AD0F6 /* ogg.h */,
- F56C81FA131F42E6000AD0F6 /* os_types.h */,
- F56C81FB131F42E6000AD0F6 /* vorbisenc.h */,
- F56C81FC131F42E6000AD0F6 /* vorbisfile.h */,
);
path = oggvorbis;
sourceTree = "<group>";
@@ -4429,8 +4440,6 @@
children = (
F56C82EA131F42E7000AD0F6 /* BaseRenderer.cpp */,
F56C82EB131F42E7000AD0F6 /* BaseRenderer.h */,
- F56C82EC131F42E7000AD0F6 /* LinuxRenderer.cpp */,
- F56C82ED131F42E7000AD0F6 /* LinuxRenderer.h */,
F56C82EE131F42E7000AD0F6 /* LinuxRendererGLES.cpp */,
F56C82EF131F42E7000AD0F6 /* LinuxRendererGLES.h */,
F56C82F0131F42E7000AD0F6 /* OverlayRendererGL.cpp */,
@@ -4445,7 +4454,6 @@
F56C82F9131F42E7000AD0F6 /* RenderManager.h */,
F56C82FA131F42E7000AD0F6 /* VideoShaders */,
F56C8301131F42E7000AD0F6 /* WinRenderer.h */,
- F56C8302131F42E7000AD0F6 /* WinRenderManager.h */,
F56C8303131F42E7000AD0F6 /* yuv2rgb.neon.S */,
F56C8304131F42E7000AD0F6 /* yuv2rgb.neon.h */,
);
@@ -4508,8 +4516,6 @@
F56C832D131F42E7000AD0F6 /* TimidityCodec.h */,
F56C832E131F42E7000AD0F6 /* WAVcodec.cpp */,
F56C832F131F42E7000AD0F6 /* WAVcodec.h */,
- F56C8330131F42E7000AD0F6 /* WAVPackcodec.cpp */,
- F56C8331131F42E7000AD0F6 /* WAVPackcodec.h */,
F56C8332131F42E7000AD0F6 /* YMCodec.cpp */,
F56C8333131F42E7000AD0F6 /* YMCodec.h */,
);
@@ -4613,6 +4619,10 @@
C8AD4354139248DA00A75578 /* PVRDirectory.h */,
C8AD4355139248DA00A75578 /* PVRFile.cpp */,
C8AD4356139248DA00A75578 /* PVRFile.h */,
+ DF0DF17B13A3AF9F008ED511 /* FileNFS.cpp */,
+ DF0DF17C13A3AF9F008ED511 /* FileNFS.h */,
+ DF0DF17D13A3AF9F008ED511 /* NFSDirectory.cpp */,
+ DF0DF17E13A3AF9F008ED511 /* NFSDirectory.h */,
F57A1DB61329FAF700498CC7 /* SourcesDirectory.cpp */,
F57A1DB71329FAF700498CC7 /* SourcesDirectory.h */,
F56C8379131F42E8000AD0F6 /* SpecialProtocol.cpp */,
@@ -4757,6 +4767,8 @@
F56C8430131F42E8000AD0F6 /* SFTPDirectory.h */,
F56C8431131F42E8000AD0F6 /* SIDFileDirectory.cpp */,
F56C8432131F42E8000AD0F6 /* SIDFileDirectory.h */,
+ 18404DD41396C3F300863BBA /* Slingbox.cpp */,
+ 18404DD51396C3F300863BBA /* Slingbox.h */,
F56C8433131F42E8000AD0F6 /* SmartPlaylistDirectory.cpp */,
F56C8434131F42E8000AD0F6 /* SmartPlaylistDirectory.h */,
F56C8435131F42E8000AD0F6 /* SMBDirectory.h */,
@@ -4781,7 +4793,6 @@
F56C8476131F42E8000AD0F6 /* VirtualDirectory.h */,
F56C847B131F42E9000AD0F6 /* ZeroconfDirectory.h */,
F56C847C131F42E9000AD0F6 /* ZeroconfDirectory.cpp */,
- F56C847D131F42E9000AD0F6 /* zconf.h */,
F56C847E131F42E9000AD0F6 /* ZipDirectory.cpp */,
F56C847F131F42E9000AD0F6 /* ZipDirectory.h */,
F56C8480131F42E9000AD0F6 /* ZipManager.cpp */,
@@ -4902,6 +4913,11 @@
F56C8485131F42E9000AD0F6 /* D3DResource.h */,
F56C8486131F42E9000AD0F6 /* DDSImage.h */,
F56C8487131F42E9000AD0F6 /* DirectXGraphics.h */,
+ 7C0A7FAD13A9E72E00AFC2BD /* DirtyRegion.h */,
+ 7C0A7FAE13A9E72E00AFC2BD /* DirtyRegionSolvers.cpp */,
+ 7C0A7FAF13A9E72E00AFC2BD /* DirtyRegionSolvers.h */,
+ 7C0A7FB013A9E72E00AFC2BD /* DirtyRegionTracker.cpp */,
+ 7C0A7FB113A9E72E00AFC2BD /* DirtyRegionTracker.h */,
F56C8488131F42E9000AD0F6 /* FrameBufferObject.h */,
F56C8489131F42E9000AD0F6 /* Geometry.h */,
F56C848A131F42E9000AD0F6 /* GraphicContext.h */,
@@ -5089,6 +5105,8 @@
F56C853A131F42E9000AD0F6 /* KeyboardLayoutConfiguration.h */,
F56C853B131F42E9000AD0F6 /* KeyboardStat.cpp */,
F56C853C131F42E9000AD0F6 /* KeyboardStat.h */,
+ 18B700F113A6A7510009C1AF /* KeymapLoader.cpp */,
+ 18B700F213A6A7510009C1AF /* KeymapLoader.h */,
F56C853D131F42E9000AD0F6 /* MouseStat.cpp */,
F56C853E131F42E9000AD0F6 /* MouseStat.h */,
F56C853F131F42E9000AD0F6 /* SDLJoystick.cpp */,
@@ -5147,6 +5165,7 @@
F56C8553131F42E9000AD0F6 /* control.h */,
F56C8554131F42E9000AD0F6 /* controlbutton.cpp */,
F56C8555131F42E9000AD0F6 /* controlcheckmark.cpp */,
+ 1830219D13B8E37300770920 /* controledit.cpp */,
F56C8556131F42E9000AD0F6 /* controlfadelabel.cpp */,
F56C8557131F42E9000AD0F6 /* controlgroup.cpp */,
F56C8558131F42E9000AD0F6 /* controlimage.cpp */,
@@ -5198,8 +5217,6 @@
children = (
F56C858C131F42EA000AD0F6 /* stat_utf8.h */,
F56C858D131F42EA000AD0F6 /* stdio_utf8.h */,
- F56C858E131F42EA000AD0F6 /* XCriticalSection.cpp */,
- F56C858F131F42EA000AD0F6 /* XCriticalSection.h */,
F56C8590131F42EA000AD0F6 /* ConvUtils.cpp */,
F56C8591131F42EA000AD0F6 /* ConvUtils.h */,
F56C8592131F42EA000AD0F6 /* LinuxResourceCounter.cpp */,
@@ -5623,6 +5640,8 @@
F56C86BD131F42EB000AD0F6 /* GUISettings.h */,
F56C86BE131F42EB000AD0F6 /* AdvancedSettings.cpp */,
F56C86BF131F42EB000AD0F6 /* AdvancedSettings.h */,
+ 7C0A7EDC13A5DC2800AFC2BD /* AppParamParser.cpp */,
+ 7C0A7EDD13A5DC2800AFC2BD /* AppParamParser.h */,
F56C86C0131F42EB000AD0F6 /* GUIWindowSettings.cpp */,
F56C86C1131F42EB000AD0F6 /* GUIWindowSettings.h */,
F56C86C2131F42EB000AD0F6 /* GUIWindowSettingsCategory.cpp */,
@@ -5674,41 +5693,24 @@
F56C86DF131F42EB000AD0F6 /* threads */ = {
isa = PBXGroup;
children = (
- F56C86E0131F42EB000AD0F6 /* darwin */,
F56C86E3131F42EB000AD0F6 /* Atomics.cpp */,
F56C86E4131F42EB000AD0F6 /* Atomics.h */,
- F56C86E5131F42EB000AD0F6 /* CriticalSection.cpp */,
+ F558F60613AFDC1700631E12 /* Condition.h */,
F56C86E6131F42EB000AD0F6 /* CriticalSection.h */,
F56C86E7131F42EB000AD0F6 /* Event.cpp */,
F56C86E8131F42EB000AD0F6 /* Event.h */,
- F56C86E9131F42EB000AD0F6 /* ISemaphore.h */,
F56C86EA131F42EB000AD0F6 /* LockFree.cpp */,
F56C86EB131F42EB000AD0F6 /* LockFree.h */,
- F56C86EC131F42EB000AD0F6 /* Mutex.cpp */,
- F56C86ED131F42EB000AD0F6 /* Mutex.h */,
- F56C86EE131F42EB000AD0F6 /* Semaphore.cpp */,
- F56C86EF131F42EB000AD0F6 /* Semaphore.hpp */,
- F56C86F0131F42EB000AD0F6 /* SharedSection.cpp */,
F56C86F1131F42EB000AD0F6 /* SharedSection.h */,
- F56C86F2131F42EB000AD0F6 /* SingleLock.cpp */,
F56C86F3131F42EB000AD0F6 /* SingleLock.h */,
F56C86F4131F42EB000AD0F6 /* Thread.cpp */,
F56C86F5131F42EB000AD0F6 /* Thread.h */,
- F56C86F8131F42EB000AD0F6 /* XBMC_mutex.cpp */,
- F56C86F9131F42EB000AD0F6 /* XBMC_mutex.h */,
+ F558F60F13AFDC3000631E12 /* ThreadLocal.cpp */,
+ F558F61013AFDC3000631E12 /* ThreadLocal.h */,
);
path = threads;
sourceTree = "<group>";
};
- F56C86E0131F42EB000AD0F6 /* darwin */ = {
- isa = PBXGroup;
- children = (
- F56C86E1131F42EB000AD0F6 /* SemaphoreDarwin.cpp */,
- F56C86E2131F42EB000AD0F6 /* SemaphoreDarwin.h */,
- );
- path = darwin;
- sourceTree = "<group>";
- };
F56C86FA131F42EB000AD0F6 /* utils */ = {
isa = PBXGroup;
children = (
@@ -5774,6 +5776,10 @@
F56C8734131F42EC000AD0F6 /* JobManager.cpp */,
F56C8735131F42EC000AD0F6 /* JobManager.h */,
F56C8736131F42EC000AD0F6 /* Job.h */,
+ 1840B7761399616D007C848B /* JSONVariantParser.cpp */,
+ 1840B7771399616D007C848B /* JSONVariantParser.h */,
+ 1840B7781399616D007C848B /* JSONVariantWriter.cpp */,
+ 1840B7791399616D007C848B /* JSONVariantWriter.h */,
F56C8737131F42EC000AD0F6 /* LCD.cpp */,
F56C8738131F42EC000AD0F6 /* LCD.h */,
F56C8739131F42EC000AD0F6 /* log.cpp */,
@@ -5806,6 +5812,8 @@
F56C8754131F42EC000AD0F6 /* Stopwatch.h */,
F56C8755131F42EC000AD0F6 /* StreamDetails.cpp */,
F56C8756131F42EC000AD0F6 /* StreamDetails.h */,
+ 18ECC99B13CF17D200A9ED6C /* StreamUtils.cpp */,
+ 18ECC99C13CF17D200A9ED6C /* StreamUtils.h */,
F56C8757131F42EC000AD0F6 /* SystemInfo.cpp */,
F56C8758131F42EC000AD0F6 /* SystemInfo.h */,
F56C8759131F42EC000AD0F6 /* TimeUtils.cpp */,
@@ -5924,6 +5932,8 @@
children = (
F56C87A6131F42EC000AD0F6 /* GUIMediaWindow.cpp */,
F56C87A7131F42EC000AD0F6 /* GUIMediaWindow.h */,
+ 7C0A7F9B13A9E70800AFC2BD /* GUIWindowDebugInfo.cpp */,
+ 7C0A7F9C13A9E70800AFC2BD /* GUIWindowDebugInfo.h */,
F56C87A8131F42EC000AD0F6 /* GUIWindowFileManager.cpp */,
F56C87A9131F42EC000AD0F6 /* GUIWindowFileManager.h */,
F56C87AA131F42EC000AD0F6 /* GUIWindowHome.cpp */,
@@ -5934,6 +5944,8 @@
F56C87AF131F42EC000AD0F6 /* GUIWindowPointer.h */,
F56C87B0131F42EC000AD0F6 /* GUIWindowScreensaver.cpp */,
F56C87B1131F42EC000AD0F6 /* GUIWindowScreensaver.h */,
+ 7C89627E13B7031E003631FE /* GUIWindowScreensaverDim.cpp */,