Permalink
Browse files

Merge branch 'master' into pvr-ppa

  • Loading branch information...
2 parents 09c02fa + c0fb013 commit 615e173accfc8cef9db4ca9a51d3d4a15a3281e8 @opdenkamp committed May 30, 2011
Showing with 11,644 additions and 31,422 deletions.
  1. +2 −0 .gitignore
  2. +1 −1 Makefile.in
  3. +428 −66 XBMC-ATV2.xcodeproj/project.pbxproj
  4. +428 −66 XBMC-IOS.xcodeproj/project.pbxproj
  5. +5 −1 XBMC.xcodeproj/project.pbxproj
  6. +2 −0 addons/library.xbmc.addon/libXBMC_addon.h
  7. +2 −0 addons/library.xbmc.gui/libXBMC_gui.h
  8. +2 −0 addons/library.xbmc.pvr/libXBMC_pvr.h
  9. +0 −1 addons/pvr.hts/resources/language/Dutch/strings.xml
  10. +0 −1 addons/pvr.hts/resources/language/English/strings.xml
  11. +0 −1 addons/pvr.hts/resources/language/Finnish/strings.xml
  12. +0 −2 addons/pvr.hts/resources/language/German/strings.xml
  13. +0 −1 addons/pvr.hts/resources/settings.xml
  14. +4 −0 addons/pvr.team-mediaportal.tvserver/resources/language/Dutch/strings.xml
  15. +4 −0 addons/pvr.team-mediaportal.tvserver/resources/language/English/strings.xml
  16. +8 −8 addons/skin.confluence/720p/DialogAlbumInfo.xml
  17. +201 −229 addons/skin.confluence/720p/DialogButtonMenu.xml
  18. +1 −1 addons/skin.confluence/720p/DialogSeekBar.xml
  19. +13 −13 addons/skin.confluence/720p/DialogVideoInfo.xml
  20. +131 −74 addons/skin.confluence/720p/FileManager.xml
  21. +3 −3 addons/skin.confluence/720p/Font.xml
  22. +853 −618 addons/skin.confluence/720p/Home.xml
  23. +3 −25 addons/skin.confluence/720p/IncludesBackgroundBuilding.xml
  24. +84 −210 addons/skin.confluence/720p/IncludesHomeMenuItems.xml
  25. +173 −197 addons/skin.confluence/720p/IncludesHomeRecentlyAdded.xml
  26. +2 −0 addons/skin.confluence/720p/LoginScreen.xml
  27. +45 −26 addons/skin.confluence/720p/MusicOSD.xml
  28. +1 −0 addons/skin.confluence/720p/MusicVisualisation.xml
  29. +135 −19 addons/skin.confluence/720p/MyWeather.xml
  30. +3 −3 addons/skin.confluence/720p/Settings.xml
  31. +3 −3 addons/skin.confluence/720p/SettingsProfile.xml
  32. +3 −3 addons/skin.confluence/720p/SettingsSystemInfo.xml
  33. +1 −0 addons/skin.confluence/720p/VideoFullScreen.xml
  34. +61 −42 addons/skin.confluence/720p/VideoOSD.xml
  35. +2 −2 addons/skin.confluence/720p/ViewsAddonBrowser.xml
  36. +0 −79 addons/skin.confluence/720p/custom_DiscDialog_1113.xml
  37. +95 −221 addons/skin.confluence/720p/custom_SkinSetting_1111.xml
  38. +26 −6 addons/skin.confluence/720p/includes.xml
  39. +264 −0 addons/skin.confluence/720p/weather+/10DayForecast.xml
  40. +299 −0 addons/skin.confluence/720p/weather+/36HourForecast.xml
  41. +280 −0 addons/skin.confluence/720p/weather+/HourlyForecast.xml
  42. +424 −0 addons/skin.confluence/720p/weather+/MapsVideo.xml
  43. +206 −0 addons/skin.confluence/720p/weather+/WeekendForecast.xml
  44. BIN addons/skin.confluence/backgrounds/playdisc.jpg
  45. BIN addons/skin.confluence/backgrounds/videos.jpg
  46. BIN addons/skin.confluence/icon.png
  47. +13 −0 addons/skin.confluence/language/English/strings.xml
  48. +8 −5 addons/skin.confluence/language/Hungarian/strings.xml
  49. BIN addons/skin.confluence/media/ButtonMenuExitFO.png
  50. BIN addons/skin.confluence/media/ButtonMenuExitNF.png
  51. BIN addons/skin.confluence/media/ButtonMenuLogOffFO.png
  52. BIN addons/skin.confluence/media/ButtonMenuLogOffNF.png
  53. BIN addons/skin.confluence/media/ButtonMenuMasterFO.png
  54. BIN addons/skin.confluence/media/ButtonMenuMasterNF.png
  55. BIN addons/skin.confluence/media/ButtonMenuNoMasterFO.png
  56. BIN addons/skin.confluence/media/ButtonMenuNoMasterNF.png
  57. BIN addons/skin.confluence/media/ButtonMenuRestartFO.png
  58. BIN addons/skin.confluence/media/ButtonMenuRestartNF.png
  59. BIN addons/skin.confluence/media/ButtonMenuShutdownFO.png
  60. BIN addons/skin.confluence/media/ButtonMenuShutdownNF.png
  61. BIN addons/skin.confluence/media/ButtonMenuSleepFO.png
  62. BIN addons/skin.confluence/media/ButtonMenuSleepNF.png
  63. BIN addons/skin.confluence/media/{HomeBlade_middle.png → HomeBack.png}
  64. BIN addons/skin.confluence/media/HomeBladeSub_Part1.png
  65. BIN addons/skin.confluence/media/HomeBlade_bottom.png
  66. BIN addons/skin.confluence/media/HomeBlade_top.png
  67. BIN addons/skin.confluence/media/HomeButtonsBack.png
  68. BIN addons/skin.confluence/media/{Rss_Back_Overlay.png → HomeOverlay1.png}
  69. BIN addons/skin.confluence/media/{Rss_Back.png → HomeSeperator.png}
  70. BIN addons/skin.confluence/media/HomeSubEnd.png
  71. BIN addons/skin.confluence/media/HomeSubFO.png
  72. BIN addons/skin.confluence/media/HomeSubNF.png
  73. BIN addons/skin.confluence/media/ShutdownButtonFocus.png
  74. BIN addons/skin.confluence/media/{HomeBladeSub_Part2.png → ShutdownButtonNoFocus.png}
  75. BIN addons/skin.confluence/media/XBMC_Logo.png
  76. BIN addons/skin.confluence/media/gradient.png
  77. BIN addons/skin.confluence/media/home-playmedia-FO.png
  78. BIN addons/skin.confluence/media/home-playmedia.png
  79. BIN addons/skin.confluence/media/icon-video.png
  80. BIN addons/skin.confluence/media/icon-weather.png
  81. BIN addons/skin.confluence/media/xbmc-logo.png
  82. +22 −44 configure.in
  83. +9 −2 language/Dutch/strings.xml
  84. +2 −1 language/English/strings.xml
  85. +1 −0 language/Finnish/strings.xml
  86. +1 −0 language/German/strings.xml
  87. +19 −10 language/Hungarian/strings.xml
  88. +2 −178 lib/DllWAVPack.h
  89. +1 −2 lib/addons/library.xbmc.addon/libXBMC_addon.cpp
  90. +1 −1 lib/asap/win32/build_xbmc_win32.sh
  91. +4 −4 lib/cpluff/configure.ac
  92. +9 −7 lib/ffmpeg/build_xbmc_win32.sh
  93. +2 −4 lib/libUPnP/Platinum/Source/Core/PltHttpServerTask.cpp
  94. +0 −1,533 lib/libapetag/config.guess
  95. +0 −102 lib/libapetag/config.h.in
  96. +0 −1,693 lib/libapetag/config.sub
  97. +0 −13,054 lib/libapetag/configure
  98. +0 −630 lib/libapetag/depcomp
  99. 0 lib/libapetag/m4/.gitignore
  100. +0 −7,377 lib/libapetag/m4/libtool.m4
  101. +0 −368 lib/libapetag/m4/ltoptions.m4
  102. +0 −123 lib/libapetag/m4/ltsugar.m4
  103. +0 −23 lib/libapetag/m4/ltversion.m4
  104. +0 −92 lib/libapetag/m4/lt~obsolete.m4
  105. +0 −376 lib/libapetag/missing
  106. +10 −3 lib/libdvd/build-xbmc-win32.sh
  107. +0 −86 lib/libid3tag/libid3tag/config.h.in
  108. +6 −7 lib/libmpeg2/make-xbmc-lib-win32.sh
  109. +1 −8 project/BuildDependencies/scripts/{copy_deps_d.bat → 1_copy_deps_d.bat}
  110. +2 −2 project/VS2010Express/XBMC.vcxproj
  111. +1 −10 project/VS2010Express/XBMC.vcxproj.filters
  112. +4 −0 project/Win32BuildSetup/BuildSetup.bat
  113. +20 −5 project/Win32BuildSetup/buildmingwlibs.sh
  114. +24 −0 system/keymaps/appcommand.xml
  115. +16 −12 system/keymaps/keyboard.xml
  116. +24 −0 tools/darwin/depends/Backrow/Makefile
  117. +11 −4 tools/darwin/depends/Makefile.in
  118. +1 −1 tools/darwin/depends/Makefile.include.in
  119. +5 −5 tools/darwin/depends/README
  120. +5 −5 tools/darwin/depends/autoconf/Makefile
  121. +5 −5 tools/darwin/depends/automake/Makefile
  122. +1 −1 tools/darwin/depends/boost/Makefile
  123. +5 −5 tools/darwin/depends/cmake/Makefile
  124. +86 −0 tools/darwin/depends/config.site_ios.in
  125. +12 −20 tools/darwin/depends/config.site_ios.mk.in
  126. +24 −14 tools/darwin/depends/configure.in
  127. +7 −8 tools/darwin/depends/dpkg/Makefile
  128. +13 −0 tools/darwin/depends/gas-preprocessor/Makefile
  129. +20 −0 tools/darwin/depends/gas-preprocessor/README
  130. +360 −0 tools/darwin/depends/gas-preprocessor/gas-preprocessor.pl
  131. +5 −5 tools/darwin/depends/help2man/Makefile
  132. +3 −0 tools/darwin/depends/libflac/Makefile
  133. +17 −0 tools/darwin/depends/libmad/02-libmad-thumb-fix.patch
  134. +3 −0 tools/darwin/depends/libmad/Makefile
  135. +3 −0 tools/darwin/depends/libmpeg2/Makefile
  136. +5 −5 tools/darwin/depends/libtool/Makefile
  137. +41 −0 tools/darwin/depends/libyajl/Makefile
  138. +170 −0 tools/darwin/depends/mysqlclient/01-mysqlclient-cross-compile.patch
  139. +27 −0 tools/darwin/depends/mysqlclient/02-mysqlclient-ios.patch
  140. +12 −0 tools/darwin/depends/mysqlclient/Makefile
  141. +11 −1 tools/darwin/depends/openssl/Makefile
  142. +5 −5 tools/darwin/depends/pkg-config/Makefile
  143. +56 −0 tools/darwin/depends/python26/Makefile.ios
  144. 0 tools/darwin/depends/python26/{Makefile → Makefile.osx}
  145. +301 −0 tools/darwin/depends/python26/Python-2.6.5-xcompile.patch
  146. +3 −1 tools/darwin/depends/samba/Makefile
  147. +12 −10 tools/darwin/depends/tar/Makefile
  148. +10 −7 tools/darwin/depends/yasm/Makefile
  149. +2 −2 tools/osx/ios-depends/Makefile
  150. +52 −0 tools/osx/ios-depends/cmake/Makefile
  151. +53 −0 tools/osx/ios-depends/libyajl/Makefile
  152. +1 −1 tools/osx/osx-depends/Makefile
  153. +53 −0 tools/osx/osx-depends/libyajl/Makefile
  154. +101 −92 xbmc/Application.cpp
  155. +0 −1 xbmc/Application.h
  156. +3 −3 xbmc/ApplicationMessenger.h
  157. +26 −2 xbmc/AutoSwitch.cpp
  158. +1 −1 xbmc/AutoSwitch.h
  159. +4 −2 xbmc/FileItem.cpp
  160. +14 −21 xbmc/GUIInfoManager.cpp
  161. +107 −103 xbmc/GUIInfoManager.h
  162. +5 −3 xbmc/GUIViewControl.cpp
  163. +1 −1 xbmc/GUIViewState.cpp
  164. +1 −7 xbmc/SortFileItem.cpp
  165. +2 −0 xbmc/ViewState.h
  166. +13 −40 xbmc/addons/AddonDatabase.cpp
  167. +12 −4 xbmc/addons/AddonManager.cpp
  168. +2 −2 xbmc/addons/AddonManager.h
  169. +1 −1 xbmc/addons/GUIViewStateAddonBrowser.cpp
  170. +7 −3 xbmc/addons/Service.cpp
  171. +8 −0 xbmc/addons/Service.h
  172. +1 −1 xbmc/addons/include/xbmc_pvr_types.h
  173. +0 −32 xbmc/cdrip/DllOgg.h
  174. +0 −52 xbmc/cdrip/DllVorbis.h
  175. +0 −24 xbmc/cdrip/DllVorbisEnc.h
  176. +0 −1 xbmc/cores/IPlayer.h
  177. +2 −2 xbmc/cores/VideoRenderers/OverlayRendererGL.cpp
  178. +0 −43 xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h
  179. +27 −11 xbmc/cores/dvdplayer/DVDPlayer.cpp
  180. +6 −5 xbmc/cores/dvdplayer/DVDPlayer.h
  181. +0 −79 xbmc/cores/dvdplayer/DVDSubtitles/DllLibass.h
  182. +0 −5 xbmc/cores/paplayer/PAPlayer.cpp
  183. +0 −1 xbmc/cores/paplayer/PAPlayer.h
  184. +14 −15 xbmc/epg/EpgContainer.cpp
  185. +39 −10 xbmc/filesystem/UPnPDirectory.cpp
  186. +5 −0 xbmc/guilib/GUIBaseContainer.cpp
  187. +1 −0 xbmc/guilib/GUIBaseContainer.h
  188. +4 −0 xbmc/guilib/GUIControlFactory.cpp
  189. +0 −4 xbmc/guilib/GraphicContext.cpp
  190. +2 −0 xbmc/guilib/GraphicContext.h
  191. +3 −0 xbmc/guilib/Key.h
  192. +7 −3 xbmc/guilib/Texture.cpp
  193. +42 −1 xbmc/input/ButtonTranslator.cpp
  194. +2 −0 xbmc/input/ButtonTranslator.h
  195. +2 −169 xbmc/input/KeyboardStat.cpp
  196. +0 −4 xbmc/input/KeyboardStat.h
  197. +2 −0 xbmc/input/XBMC_keysym.h
  198. +19 −31 xbmc/input/XBMC_keytable.cpp
  199. +2 −0 xbmc/interfaces/Builtins.cpp
  200. +2 −7 xbmc/interfaces/json-rpc/AudioLibrary.cpp
  201. +1 −15 xbmc/interfaces/json-rpc/FileItemHandler.cpp
  202. +0 −1 xbmc/interfaces/json-rpc/FileItemHandler.h
  203. +1,687 −1,688 xbmc/interfaces/json-rpc/ServiceDescription.h
  204. +1,998 −0 xbmc/interfaces/json-rpc/ServiceDescription.json
  205. +5 −15 xbmc/interfaces/json-rpc/VideoLibrary.cpp
  206. +29 −30 xbmc/music/dialogs/GUIDialogMusicInfo.cpp
  207. +26 −8 xbmc/network/TCPServer.cpp
  208. +81 −42 xbmc/network/UPnP.cpp
  209. +124 −28 xbmc/pvr/PVRManager.cpp
  210. +16 −16 xbmc/pvr/addons/PVRClient.cpp
  211. +9 −30 xbmc/pvr/addons/PVRClients.cpp
  212. +4 −2 xbmc/pvr/channels/PVRChannel.cpp
  213. +5 −0 xbmc/pvr/channels/PVRChannel.h
  214. +28 −2 xbmc/pvr/channels/PVRChannelGroup.cpp
  215. +12 −0 xbmc/pvr/channels/PVRChannelGroup.h
  216. +25 −15 xbmc/pvr/channels/PVRChannelGroupInternal.cpp
  217. +1 −1 xbmc/pvr/channels/PVRChannelGroupInternal.h
  218. +527 −512 xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp
  219. +33 −7 xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h
  220. +2 −3 xbmc/pvr/dialogs/GUIDialogPVRGroupManager.cpp
  221. +32 −0 xbmc/pvr/timers/PVRTimerInfoTag.cpp
  222. +5 −0 xbmc/pvr/timers/PVRTimerInfoTag.h
  223. +16 −0 xbmc/pvr/timers/PVRTimers.cpp
  224. +2 −1 xbmc/pvr/windows/GUIWindowPVRChannels.cpp
  225. +13 −0 xbmc/pvr/windows/GUIWindowPVRCommon.cpp
  226. +1 −0 xbmc/pvr/windows/GUIWindowPVRCommon.h
  227. +10 −2 xbmc/pvr/windows/GUIWindowPVRGuide.cpp
  228. +1 −0 xbmc/pvr/windows/GUIWindowPVRGuide.h
  229. +2 −1 xbmc/pvr/windows/GUIWindowPVRRecordings.cpp
  230. +0 −1 xbmc/pvrclients/Makefile.include.in
  231. +5 −9 xbmc/pvrclients/MediaPortal/Makefile.in
  232. +4 −4 xbmc/pvrclients/MediaPortal/Socket.cpp
  233. +1 −1 xbmc/pvrclients/MediaPortal/Socket.h
  234. +4 −2 xbmc/pvrclients/MediaPortal/channels.cpp
  235. +1 −1 xbmc/pvrclients/MediaPortal/channels.h
  236. +2 −1 xbmc/pvrclients/MediaPortal/client.cpp
  237. +1 −2 xbmc/pvrclients/MediaPortal/client.h
  238. +52 −12 xbmc/pvrclients/MediaPortal/epg.cpp
  239. +16 −14 xbmc/pvrclients/MediaPortal/epg.h
  240. +161 −87 xbmc/pvrclients/MediaPortal/pvrclient-mediaportal.cpp
  241. +2 −11 xbmc/pvrclients/MediaPortal/pvrclient-mediaportal.h
  242. +6 −5 xbmc/pvrclients/MediaPortal/recordings.cpp
  243. +1 −2 xbmc/pvrclients/MediaPortal/recordings.h
  244. +19 −22 xbmc/pvrclients/MediaPortal/timers.cpp
  245. +7 −3 xbmc/pvrclients/MediaPortal/timers.h
  246. +0 −17 xbmc/pvrclients/MediaPortal/utils.cpp
  247. +0 −6 xbmc/pvrclients/MediaPortal/utils.h
  248. +2 −2 xbmc/pvrclients/mythtv/Makefile.in
  249. +2 −2 xbmc/pvrclients/mythtv/MythXml.cpp
  250. +2 −17 xbmc/pvrclients/tvheadend/HTSPConnection.cpp
  251. +2 −2 xbmc/pvrclients/tvheadend/HTSPConnection.h
  252. +4 −9 xbmc/pvrclients/tvheadend/HTSPData.cpp
  253. +0 −3 xbmc/pvrclients/tvheadend/HTSPData.h
  254. +8 −12 xbmc/pvrclients/tvheadend/Makefile.in
  255. +0 −16 xbmc/pvrclients/tvheadend/client.cpp
  256. +1 −1 xbmc/pvrclients/tvheadend/client.h
  257. +5 −8 xbmc/pvrclients/vdr-vnsi/Makefile.in
  258. +44 −43 xbmc/pvrclients/vdr-vnsi/VNSIData.cpp
  259. +4 −1 xbmc/pvrclients/vdr-vnsi/VNSISession.cpp
  260. +8 −0 xbmc/pvrclients/vdr-vnsi/responsepacket.cpp
  261. +2 −0 xbmc/pvrclients/vdr-vnsi/responsepacket.h
  262. +14 −2 xbmc/settings/AdvancedSettings.cpp
  263. +5 −1 xbmc/settings/AdvancedSettings.h
  264. +17 −10 xbmc/settings/GUISettings.cpp
  265. +10 −12 xbmc/settings/GUIWindowSettingsCategory.cpp
  266. +3 −0 xbmc/settings/Settings.cpp
  267. +1 −1 xbmc/utils/ISerializable.h
  268. +17 −14 xbmc/video/dialogs/GUIDialogVideoInfo.cpp
  269. +180 −0 xbmc/windowing/WinEventsSDL.cpp
  270. +1 −1 xbmc/windowing/osx/WinEventsIOS.mm
  271. +2 −2 xbmc/windowing/osx/WinSystemOSX.mm
  272. +43 −69 xbmc/windowing/windows/WinEventsWin32.cpp
View
@@ -51,6 +51,7 @@ config.log
/tools/darwin/depends/Makefile
/tools/darwin/depends/Makefile.include
/tools/darwin/depends/configure
+/tools/darwin/depends/python26/Makefile
/tools/darwin/depends/**/.gitignore
/tools/darwin/depends/**/.installed
/tools/osx/osx-depends/**/.gitignore
@@ -308,6 +309,7 @@ lib/cmyth/Makefile
/lib/libapetag/Makefile
/lib/libapetag/config.h
/lib/libapetag/libtool
+/lib/libapetag/m4/lt~obsolete.m4
/lib/libapetag/stamp-h1
# /project
View
@@ -484,7 +484,7 @@ libs: cmyth libhdhomerun libid3tag imagelib libexif system/libcpluff-@ARCH@.so
externals: libaddon codecs libs pvrclients visualizations screensavers
xcode_depends: \
- codecs libs pvrclients visualizations screensavers eventclients skins \
+ codecs libs pvrclients visualizations screensavers eventclients libaddon skins \
lib/libsquish/libsquish.a \
lib/libapetag/.libs/libapetag.a \
lib/libRTV/librtv.a \
Oops, something went wrong.
Oops, something went wrong.
@@ -1938,7 +1938,7 @@
180184E9137440D90048F7F2 /* AddonCallbacksPVR.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AddonCallbacksPVR.h; sourceTree = "<group>"; };
18018535137467810048F7F2 /* HTSPSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTSPSession.cpp; sourceTree = "<group>"; };
18018536137467810048F7F2 /* HTSPSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTSPSession.h; sourceTree = "<group>"; };
- 1801857513746BBC0048F7F2 /* libTcpSocket.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libTcpSocket.a; sourceTree = "<group>"; };
+ 1801857513746BBC0048F7F2 /* libTcpSocket.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libTcpSocket.a; path = lib/libTcpSocket/libTcpSocket.a; sourceTree = "<group>"; };
18308CB41303370800AA309E /* stat_utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stat_utf8.h; sourceTree = "<group>"; };
18308CB51303370800AA309E /* stdio_utf8.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = stdio_utf8.h; sourceTree = "<group>"; };
183FDF8811AF0B0500B81E9C /* PluginSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginSource.cpp; sourceTree = "<group>"; };
@@ -9339,6 +9339,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GENERATE_PROFILING_CODE = NO;
HEADER_SEARCH_PATHS = (
+ lib/libTcpSocket,
$SRCROOT,
xbmc,
xbmc/osx,
@@ -9354,6 +9355,7 @@
INFOPLIST_FILE = $SRCROOT/xbmc/osx/Info.plist;
INSTALL_PATH = /usr/local/bin;
LIBRARY_SEARCH_PATHS = (
+ "$(SRCROOT)/lib/libTcpSocket",
"$(SRCROOT)",
"$(SRCROOT)/lib/libRTV",
"$(SRCROOT)/lib/libXDAAP",
@@ -9428,6 +9430,7 @@
GCC_UNROLL_LOOPS = YES;
GCC_VERSION = 4.0;
HEADER_SEARCH_PATHS = (
+ lib/libTcpSocket,
$SRCROOT,
xbmc,
xbmc/osx,
@@ -9443,6 +9446,7 @@
INFOPLIST_FILE = $SRCROOT/xbmc/osx/Info.plist;
INSTALL_PATH = /usr/local/bin;
LIBRARY_SEARCH_PATHS = (
+ "$(SRCROOT)/lib/libTcpSocket",
"$(SRCROOT)",
"$(SRCROOT)/lib/libRTV",
"$(SRCROOT)/lib/libXDAAP",
@@ -34,6 +34,8 @@
#if defined(__APPLE__)
#if defined(__POWERPC__)
#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-powerpc-osx.so"
+#elif defined(__arm__)
+#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-arm-osx.so"
#else
#define ADDON_DLL "/library.xbmc.addon/libXBMC_addon-x86-osx.so"
#endif
@@ -36,6 +36,8 @@ typedef void* GUIHANDLE;
#if defined(__APPLE__)
#if defined(__POWERPC__)
#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-powerpc-osx.so"
+#elif defined(__arm__)
+#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-arm-osx.so"
#else
#define GUI_HELPER_DLL "/library.xbmc.gui/libXBMC_gui-x86-osx.so"
#endif
@@ -35,6 +35,8 @@
#if defined(__APPLE__)
#if defined(__POWERPC__)
#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-powerpc-osx.so"
+#elif defined(__arm__)
+#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-arm-osx.so"
#else
#define PVR_HELPER_DLL "/library.xbmc.pvr/libXBMC_pvr-x86-osx.so"
#endif
@@ -8,7 +8,6 @@
<string id="30004">Wachtwoord</string>
<string id="30006">Verbinding timeout in seconden</string>
<string id="30007">Antwoord timeout in seconden</string>
- <string id="30008">Toon een melding bij timer updates</string>
<!-- notifications -->
<string id="30500">Verbinding met '%s' verbroken</string>
@@ -8,7 +8,6 @@
<string id="30004">Password</string>
<string id="30006">Connect timeout in seconds</string>
<string id="30007">Response timeout in seconds</string>
- <string id="30008">Display a notification on timer updates</string>
<!-- notifications -->
<string id="30500">Disconnected from '%s'</string>
@@ -8,5 +8,4 @@
<string id="30004">Salasana</string>
<string id="30006">Yhteyden aikakatkaisu sekunneissa</string>
<string id="30007">Vastauksen aikakatkaisu sekunneissa</string>
- <string id="30008">Näytä ilmoitus ajastustietojen päivityksen yhteydessä</string>
</strings>
@@ -9,8 +9,6 @@
<string id="30006">Verbindungszeit Überschreitung in Sekunden</string>
<string id="30007">Antwortzeit Überschreitung in Sekunden</string>
- <string id="30008">Zeige eine Benachrichtigung bei Timer Aktualisierungen</string>
-
<!-- notifications -->
<string id="30500">Getrennt von '%s'</string>
@@ -7,5 +7,4 @@
<setting id="pass" type="text" label="30004" option="hidden" default="" />
<setting id="connect_timeout" type="enum" label="30006" values="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60" default="29" />
<setting id="response_timeout" type="enum" label="30007" values="1|2|3|4|5|6|7|8|9|10|11|12|13|14|15|16|17|18|19|20|21|22|23|24|25|26|27|28|29|30|31|32|33|34|35|36|37|38|39|40|41|42|43|44|45|46|47|48|49|50|51|52|53|54|55|56|57|58|59|60" default="1" />
- <setting id="notifications_timers" type="bool" label="30008" default="true" />
</settings>
@@ -14,4 +14,8 @@
<string id="30010">Wachttijd na kanaal tunen(ms)</string>
<string id="30011">Opnames direct afspelen (niet streamen)</string>
<string id="30012">Mediaportal directory met opnames</string>
+
+ <!-- on-screen error messages -->
+ <string id="30050">Uw TVServerXBMC plugin v%s is te oud. U heeft minimaal versie v%s of nieuwer nodig!</string>
+ <string id="30050">Uw TVServerXBMC plugin is te oud. U heeft minimaal versie v%s of nieuwer nodig!</string>
</strings>
@@ -14,4 +14,8 @@
<string id="30010">Wait time after tuning a channel (ms)</string>
<string id="30011">Play recordings directly (no streaming)</string>
<string id="30012">Mediaportal recordings directory</string>
+
+ <!-- on-screen error messages -->
+ <string id="30050">Your TVServerXBMC version v%s is too old. Please upgrade to v%s or higher!</string>
+ <string id="30051">Your TVServerXBMC version is too old. Please upgrade to v%s or higher!</string>
</strings>
@@ -39,7 +39,7 @@
<posy>50</posy>
<width>1030</width>
<height>30</height>
- <font>font35_title</font>
+ <font>font24_title</font>
<label>$INFO[Listitem.Album]</label>
<align>center</align>
<aligny>center</aligny>
@@ -53,7 +53,7 @@
<posy>50</posy>
<width>1030</width>
<height>30</height>
- <font>font35_title</font>
+ <font>font24_title</font>
<label>$INFO[Listitem.Artist]</label>
<align>center</align>
<aligny>center</aligny>
@@ -138,7 +138,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -173,7 +173,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -291,7 +291,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -326,7 +326,7 @@
<posy>0</posy>
<width>160</width>
<height>30</height>
- <font>font13_title</font>
+ <font>font13</font>
<align>right</align>
<aligny>center</aligny>
<textcolor>blue</textcolor>
@@ -549,7 +549,7 @@
<width>430</width>
<height>40</height>
<visible>Control.HasFocus(50)</visible>
- <texture border="5">button-focus.png</texture>
+ <texture border="5">button-focus2.png</texture>
</control>
<control type="label">
<posx>10</posx>
@@ -609,7 +609,7 @@
<width>430</width>
<height>40</height>
<visible>Control.HasFocus(50)</visible>
- <texture border="5">button-focus.png</texture>
+ <texture border="5">button-focus2.png</texture>
</control>
<control type="label">
<posx>10</posx>
Oops, something went wrong.

0 comments on commit 615e173

Please sign in to comment.