Permalink
Browse files

Merge remote-tracking branch 'upstream-ro/master'

Conflicts:
	xbmc/ApplicationMessenger.cpp
  • Loading branch information...
2 parents d2afbd6 + 8e39916 commit b1acda40fff7d1d7abbe9548eacaedac6b67058d Lars Op den Kamp committed Sep 3, 2012
Showing with 1,855 additions and 1,329 deletions.
  1. +1 −1 addons/xbmc.addon/addon.xml
  2. +1 −1 configure.in
  3. +3 −12 docs/README.osx
  4. +0 −222 lib/libhts/Win32/include/stdint.h
  5. +0 −21 lib/libhts/Win32/libhts_2003.sln
  6. +0 −161 lib/libhts/Win32/libhts_2003.vcproj
  7. +0 −20 lib/libhts/Win32/libhts_2008.sln
  8. +0 −237 lib/libhts/Win32/libhts_2008.vcproj
  9. +2 −2 tools/android/packaging/Makefile
  10. +1 −1 tools/darwin/depends/configure.in
  11. +1 −1 tools/darwin/packaging/xbmc-atv2/mkdeb-xbmc-atv2.sh
  12. +1 −1 tools/darwin/packaging/xbmc-ios/mkdeb-xbmc-ios.sh
  13. +1 −1 xbmc/GUIInfoManager.h
  14. +12 −4 xbmc/NfoFile.h
  15. +46 −7 xbmc/XBApplicationEx.cpp
  16. +20 −1 xbmc/android/activity/AndroidTouch.cpp
  17. +4 −0 xbmc/android/activity/AndroidTouch.h
  18. +44 −0 xbmc/dialogs/GUIDialogFavourites.cpp
  19. +1 −0 xbmc/dialogs/GUIDialogFavourites.h
  20. +19 −19 xbmc/dialogs/GUIDialogSmartPlaylistEditor.cpp
  21. +12 −0 xbmc/guilib/GUIFont.cpp
  22. +3 −9 xbmc/guilib/GUIFont.h
  23. +2 −1 xbmc/guilib/Key.h
  24. +2 −1 xbmc/input/ButtonTranslator.cpp
  25. +50 −0 xbmc/input/TouchInput.cpp
  26. +14 −0 xbmc/input/TouchInput.h
  27. +1 −1 xbmc/interfaces/Builtins.cpp
  28. +1 −1 xbmc/interfaces/http-api/XBMChttp.cpp
  29. +40 −13 xbmc/interfaces/json-rpc/AudioLibrary.cpp
  30. +42 −1 xbmc/interfaces/json-rpc/FileOperations.cpp
  31. +1 −0 xbmc/interfaces/json-rpc/FileOperations.h
  32. +34 −0 xbmc/interfaces/json-rpc/JSONRPC.cpp
  33. +195 −150 xbmc/interfaces/json-rpc/JSONServiceDescription.cpp
  34. +35 −18 xbmc/interfaces/json-rpc/JSONServiceDescription.h
  35. +21 −0 xbmc/interfaces/json-rpc/JSONUtils.h
  36. +4 −1 xbmc/interfaces/json-rpc/PlayerOperations.cpp
  37. +236 −10 xbmc/interfaces/json-rpc/ServiceDescription.h
  38. +70 −38 xbmc/interfaces/json-rpc/VideoLibrary.cpp
  39. +3 −3 xbmc/interfaces/json-rpc/VideoLibrary.h
  40. +32 −7 xbmc/interfaces/json-rpc/methods.json
  41. +203 −2 xbmc/interfaces/json-rpc/types.json
  42. +2 −2 xbmc/osx/Info.plist
  43. +1 −5 xbmc/osx/ios/XBMCController.h
  44. +61 −11 xbmc/osx/ios/XBMCController.mm
  45. +143 −92 xbmc/pictures/GUIWindowSlideShow.cpp
  46. +6 −2 xbmc/pictures/GUIWindowSlideShow.h
  47. +35 −27 xbmc/pictures/SlideShowPicture.cpp
  48. +2 −2 xbmc/pictures/SlideShowPicture.h
  49. +189 −79 xbmc/playlists/SmartPlayList.cpp
  50. +62 −13 xbmc/playlists/SmartPlayList.h
  51. +1 −2 xbmc/threads/Thread.cpp
  52. +2 −0 xbmc/threads/platform/win/ThreadImpl.cpp
  53. +126 −44 xbmc/threads/platform/win/Win32Exception.cpp
  54. +9 −3 xbmc/threads/platform/win/Win32Exception.h
  55. +38 −0 xbmc/video/VideoDatabase.cpp
  56. +1 −0 xbmc/video/VideoDatabase.h
  57. +10 −10 xbmc/visualizations/XBMCProjectM/libprojectM/Parser.cpp
  58. +3 −3 xbmc/visualizations/XBMCProjectM/libprojectM/Parser.hpp
  59. +4 −64 xbmc/win32/XBMC_PC.cpp
  60. +2 −2 xbmc/win32/XBMC_PC.rc
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<addon id="xbmc.addon" version="11.9.5" provider-name="Team XBMC">
+<addon id="xbmc.addon" version="11.9.6" provider-name="Team XBMC">
<requires>
<import addon="xbmc.core" version="0.1"/>
</requires>
View
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([xbmc], [11.9.5], [http://trac.xbmc.org])
+AC_INIT([xbmc], [11.9.6], [http://trac.xbmc.org])
AC_CONFIG_HEADERS([xbmc/config.h])
AH_TOP([#pragma once])
m4_include([m4/ax_python_devel.m4])
View
@@ -13,8 +13,8 @@ TOC
1. Introduction
-----------------------------------------------------------------------------
-This is a platform port of XBMC for the Apple OSX operating system. Both 10.6
-and 10.7 Intel development platforms are supported. Xcode 3.2.6 and 4.3 and newer
+This is a platform port of XBMC for the Apple OSX operating system. 10.6, 10.7
+and 10.8 Intel development platforms are supported. Xcode 3.2.6 and 4.3 and newer
are the recommended versions.
There are 3 ways to build XBMC for Mac, from command-line with make, from command-line
using xcodebuild or from Xcode.
@@ -27,6 +27,7 @@ codecs that support a multitude of music and video formats.
On Snow Leopard (OSX 10.6.x) we recommend using Xcode 3.2.6.
On Lion (OSX 10.7.x) we recommend using Xcode 4.3.x.
+On Mountain Lion (OSX 10.8.1) we recommend using Xcode 4.4.
NOTE TO NEW OS X USERS: All lines that are prefixed with the '$' character are
commands that need to be typed into a Terminal window. Note that the '$'
@@ -74,13 +75,6 @@ Xcode 4.4 only runs on 10.8.x (Mountain Lion).
$ ./configure --with-darwin=osx --with-arch=x86_64
$ make
-IMPORTANT!! for Mountain Lion users. In Xcode 4.4 there is only SDK 10.7 and 10.8
-available. The XBMC buildsystem defaults to 10.6. So for compiling with ML
-you have to specify the 10.7 SDK explicitly on configure:
-
- $ ./configure --with-darwin=osx --with-sdk=10.7
-
-
-----------------------------------------------------------------------------
4. How to compile
-----------------------------------------------------------------------------
@@ -134,9 +128,6 @@ Set the build target to "XBMC" or "XBMC.app" and be sure to select the same
architecture as selected in step 3.1 (either i386 for 32Bit or x86_64 for 64Bit),
then build.
-Mountain Lion users have to ensure to build against 10.7 SDK not 10.8 (which is
-selected in Xcode 4.4 by default).
-
The build process will take a long time when building the first time.
You can see the progress in "Build Results". There are a large number of static
and dynamic libaries that will need to be built. Once these are built,
@@ -1,222 +0,0 @@
-// ISO C9x compliant stdint.h for Microsoft Visual Studio
-// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124
-//
-// Copyright (c) 2006 Alexander Chemeris
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-//
-// 3. The name of the author may be used to endorse or promote products
-// derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#ifndef _MSC_VER // [
-#error "Use this header only with Microsoft Visual C++ compilers!"
-#endif // _MSC_VER ]
-
-#ifndef _MSC_STDINT_H_ // [
-#define _MSC_STDINT_H_
-
-#if _MSC_VER > 1000
-#pragma once
-#endif
-
-#include <limits.h>
-
-// For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
-// or compiler give many errors like this:
-// error C2733: second C linkage of overloaded function 'wmemchr' not allowed
-#if (_MSC_VER < 1300) && defined(__cplusplus)
- extern "C++" {
-#endif
-# include <wchar.h>
-#if (_MSC_VER < 1300) && defined(__cplusplus)
- }
-#endif
-
-// 7.18.1 Integer types
-
-// 7.18.1.1 Exact-width integer types
-typedef __int8 int8_t;
-typedef __int16 int16_t;
-typedef __int32 int32_t;
-typedef __int64 int64_t;
-typedef unsigned __int8 uint8_t;
-typedef unsigned __int16 uint16_t;
-typedef unsigned __int32 uint32_t;
-typedef unsigned __int64 uint64_t;
-
-// 7.18.1.2 Minimum-width integer types
-typedef int8_t int_least8_t;
-typedef int16_t int_least16_t;
-typedef int32_t int_least32_t;
-typedef int64_t int_least64_t;
-typedef uint8_t uint_least8_t;
-typedef uint16_t uint_least16_t;
-typedef uint32_t uint_least32_t;
-typedef uint64_t uint_least64_t;
-
-// 7.18.1.3 Fastest minimum-width integer types
-typedef int8_t int_fast8_t;
-typedef int16_t int_fast16_t;
-typedef int32_t int_fast32_t;
-typedef int64_t int_fast64_t;
-typedef uint8_t uint_fast8_t;
-typedef uint16_t uint_fast16_t;
-typedef uint32_t uint_fast32_t;
-typedef uint64_t uint_fast64_t;
-
-// 7.18.1.4 Integer types capable of holding object pointers
-#ifdef _WIN64 // [
- typedef __int64 intptr_t;
- typedef unsigned __int64 uintptr_t;
-#else // _WIN64 ][
- typedef int intptr_t;
- typedef unsigned int uintptr_t;
-#endif // _WIN64 ]
-
-// 7.18.1.5 Greatest-width integer types
-typedef int64_t intmax_t;
-typedef uint64_t uintmax_t;
-
-
-// 7.18.2 Limits of specified-width integer types
-
-#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [ See footnote 220 at page 257 and footnote 221 at page 259
-
-// 7.18.2.1 Limits of exact-width integer types
-#define INT8_MIN ((int8_t)_I8_MIN)
-#define INT8_MAX _I8_MAX
-#define INT16_MIN ((int16_t)_I16_MIN)
-#define INT16_MAX _I16_MAX
-#define INT32_MIN ((int32_t)_I32_MIN)
-#define INT32_MAX _I32_MAX
-#define INT64_MIN ((int64_t)_I64_MIN)
-#define INT64_MAX _I64_MAX
-#define UINT8_MAX _UI8_MAX
-#define UINT16_MAX _UI16_MAX
-#define UINT32_MAX _UI32_MAX
-#define UINT64_MAX _UI64_MAX
-
-// 7.18.2.2 Limits of minimum-width integer types
-#define INT_LEAST8_MIN INT8_MIN
-#define INT_LEAST8_MAX INT8_MAX
-#define INT_LEAST16_MIN INT16_MIN
-#define INT_LEAST16_MAX INT16_MAX
-#define INT_LEAST32_MIN INT32_MIN
-#define INT_LEAST32_MAX INT32_MAX
-#define INT_LEAST64_MIN INT64_MIN
-#define INT_LEAST64_MAX INT64_MAX
-#define UINT_LEAST8_MAX UINT8_MAX
-#define UINT_LEAST16_MAX UINT16_MAX
-#define UINT_LEAST32_MAX UINT32_MAX
-#define UINT_LEAST64_MAX UINT64_MAX
-
-// 7.18.2.3 Limits of fastest minimum-width integer types
-#define INT_FAST8_MIN INT8_MIN
-#define INT_FAST8_MAX INT8_MAX
-#define INT_FAST16_MIN INT16_MIN
-#define INT_FAST16_MAX INT16_MAX
-#define INT_FAST32_MIN INT32_MIN
-#define INT_FAST32_MAX INT32_MAX
-#define INT_FAST64_MIN INT64_MIN
-#define INT_FAST64_MAX INT64_MAX
-#define UINT_FAST8_MAX UINT8_MAX
-#define UINT_FAST16_MAX UINT16_MAX
-#define UINT_FAST32_MAX UINT32_MAX
-#define UINT_FAST64_MAX UINT64_MAX
-
-// 7.18.2.4 Limits of integer types capable of holding object pointers
-#ifdef _WIN64 // [
-# define INTPTR_MIN INT64_MIN
-# define INTPTR_MAX INT64_MAX
-# define UINTPTR_MAX UINT64_MAX
-#else // _WIN64 ][
-# define INTPTR_MIN INT32_MIN
-# define INTPTR_MAX INT32_MAX
-# define UINTPTR_MAX UINT32_MAX
-#endif // _WIN64 ]
-
-// 7.18.2.5 Limits of greatest-width integer types
-#define INTMAX_MIN INT64_MIN
-#define INTMAX_MAX INT64_MAX
-#define UINTMAX_MAX UINT64_MAX
-
-// 7.18.3 Limits of other integer types
-
-#ifdef _WIN64 // [
-# define PTRDIFF_MIN _I64_MIN
-# define PTRDIFF_MAX _I64_MAX
-#else // _WIN64 ][
-# define PTRDIFF_MIN _I32_MIN
-# define PTRDIFF_MAX _I32_MAX
-#endif // _WIN64 ]
-
-#define SIG_ATOMIC_MIN INT_MIN
-#define SIG_ATOMIC_MAX INT_MAX
-
-#ifndef SIZE_MAX // [
-# ifdef _WIN64 // [
-# define SIZE_MAX _UI64_MAX
-# else // _WIN64 ][
-# define SIZE_MAX _UI32_MAX
-# endif // _WIN64 ]
-#endif // SIZE_MAX ]
-
-// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
-#ifndef WCHAR_MIN // [
-# define WCHAR_MIN 0
-#endif // WCHAR_MIN ]
-#ifndef WCHAR_MAX // [
-# define WCHAR_MAX _UI16_MAX
-#endif // WCHAR_MAX ]
-
-#define WINT_MIN 0
-#define WINT_MAX _UI16_MAX
-
-#endif // __STDC_LIMIT_MACROS ]
-
-
-// 7.18.4 Limits of other integer types
-
-#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [ See footnote 224 at page 260
-
-// 7.18.4.1 Macros for minimum-width integer constants
-
-#define INT8_C(val) val##i8
-#define INT16_C(val) val##i16
-#define INT32_C(val) val##i32
-//#define INT64_C(val) val##i64
-
-#define UINT8_C(val) val##ui8
-#define UINT16_C(val) val##ui16
-#define UINT32_C(val) val##ui32
-//#define UINT64_C(val) val##ui64
-
-// 7.18.4.2 Macros for greatest-width integer constants
-#define INTMAX_C INT64_C
-#define UINTMAX_C UINT64_C
-
-#endif // __STDC_CONSTANT_MACROS ]
-
-
-#endif // _MSC_STDINT_H_ ]
@@ -1,21 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libhts_2003", "libhts_2003.vcproj", "{870DE8D3-B710-4CEF-9C73-36B37A9AF8A3}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {870DE8D3-B710-4CEF-9C73-36B37A9AF8A3}.Debug.ActiveCfg = Debug|Win32
- {870DE8D3-B710-4CEF-9C73-36B37A9AF8A3}.Debug.Build.0 = Debug|Win32
- {870DE8D3-B710-4CEF-9C73-36B37A9AF8A3}.Release.ActiveCfg = Release|Win32
- {870DE8D3-B710-4CEF-9C73-36B37A9AF8A3}.Release.Build.0 = Release|Win32
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
Oops, something went wrong.

0 comments on commit b1acda4

Please sign in to comment.