Jim Carroll [Wed, 6 Apr 2011 19:10:39 +0000 (15:10 -0400)]
Merge remote branch 'mine/ext-python'
WiSo [Sat, 12 Mar 2011 18:05:18 +0000 (19:05 +0100)]
Code changes to make external python work in windows. Changes credit to WiSo
External pythong changes. Credit WiSo
[WIN32] don't load python with our dll loader if USE_EXTERNAL_PYTHON is defined
[WIN32] added osdefs.h for DELIM
[WIN32] removed check for zlib.pyd. its in the core now
[WIN32] unified log message
[WIN32] set the PYTHONPATH within MSVCR90.DLL in order for python to pick it up
[WIN32] external python doesn't need special wrapping and the path to the dll
[WIN32] set some more python related env vars (might be removed from emu_msvcrt.cpp in future?)
Fixed the error message for missing msvcrt dll so that it happens when the error condition occurrs.
[WIN32] fixed: ext python should work now. Needs tests on win32 as I'm on win64
[WIN32] fixed: the putenv source got missing
[WIN32] removed DetectDVDtype.*
[WIN32] cosmetics
There's no reason to make a special case for osx when looking to acquire the python thread lock prior to the Py_Initialize.
[WIN32] added delayed loaded dlls to the opengl project target
jimfcarroll [Mon, 21 Mar 2011 00:55:49 +0000 (20:55 -0400)]
Adding external python to the win32 build system. credit to WiSo and blinkseb.
Fixed the external python to work without the Dll proxies. Fixed XBPython.cpp so that even though it's directly linked, it works correctly allowing scripts to run multiple times. This included removing the Py_NO_SHARED_ENABLED and adding the USE_EXTERNAL_PYTHON. We now need to: set PYTHONPATH in the code, fix the debug linking, move the preprocessor changes to other builds besides Debug OpenGL.
[WIN32] renamed python download deps.
[WIN32] renamed python download deps.
[WIN32] changed: we don't have debug libs for vanilla python. credit WiSo
[WIN32] copy python dll to the debug directory - credit WiSo
[WIN32] copy sdl.dll to the debug directory
[WIN32] copy python dll to dependencies. Credit WiSo
[WIN32] fixed dep script file
[WIN32] download stripped down version of python 2.6.6
[WIN32] enable external python (missing commit)
fixed some settings on the two windows release configurations
WiSo [Sat, 12 Mar 2011 18:50:26 +0000 (19:50 +0100)]
This commit represents the including of the new external python for win32. credit goes to mostly WiSo and blinkseb.
[WIN32] added include/python to the include path and removed lib/python/PC
[WIN32] added python27.lib to the linker
[WIN32] removed Py_NO_ENABLE_SHARED
Still need the python directory that was under system because linux internal python build still put things there.
There is a bug in the Windows external python because on Windows, the DLL that python is linked against may not be the DLL that xbmc is linked against. So passing a FILE* to python from an fopen has the potential to crash. This resolves that problem. Credit to blinkseb.
added: download python dependencies with our script.
changed: use Python 2.6.6 on Windows. Debug build is included in the archive, but not copied by default. Set DEBUG to true to copy these.
[WIN32] changed: in case of debug python is used, be sure to exclude it from our installer
[WIN32] fixed: get debug python working. The following has to be defined:
- Py_NO_ENABLE_SHARED
- Py_TRACE_REFS
[WIN32] fixed: oups...
[WIN32] changed: got external python work. It needs more testing to be sure. We don't link against a .lib to be able to load python from where we want (that's why Py_NO_ENABLE_SHARED is defined). We don't define USE_EXTERNAL_PYTHON because we need to use our dll loader.
Fixed a couple of problems: 1) The Makefile.in file was merged incorrectly. 2) We cannot call PyEval_AcquireLock prior to the threads being initialized in linux.
OSX shouldn't build the internal python ... ever ... but especially when USE_EXTERNAL_PYTHON is set.
S. Davilla [Wed, 6 Apr 2011 17:05:27 +0000 (13:05 -0400)]
[osx/ios] remove unused function
montellese [Wed, 6 Apr 2011 12:28:21 +0000 (14:28 +0200)]
JSONRPC: make default fields "file" and "thumbnail" optional
S. Davilla [Wed, 6 Apr 2011 16:35:34 +0000 (12:35 -0400)]
[ios] make ios and atv2 use same eglLayer setup
vdrfan [Wed, 6 Apr 2011 16:31:24 +0000 (18:31 +0200)]
fixed: push back the extracted video duration to the VideoInfoTag var m_strRuntime so we do not end up with an empty value in case no runtime was scraped (fixes #11405)
vdrfan [Wed, 6 Apr 2011 16:28:42 +0000 (18:28 +0200)]
refactor: renamed GetStreamDetailsForFileId to GetStreamDetails
Instead of passing the streamdetails and the file id to GetStreamDetails() it now takes the entire VideoInfoTag.
As it's not used anywhere else it was made protected.
viking [Tue, 5 Apr 2011 16:38:54 +0000 (19:38 +0300)]
updated: Finnish translation. closes ticket #11402
spiff [Wed, 6 Apr 2011 15:00:19 +0000 (17:00 +0200)]
updated: catalan translation. thanks to divendres. closes ticket #11403
Jonathan Marshall [Wed, 6 Apr 2011 08:42:31 +0000 (20:42 +1200)]
fixed - watched/unwatched context menu items didn't do anything useful for folders inside folders
Jonathan Marshall [Wed, 6 Apr 2011 08:41:37 +0000 (20:41 +1200)]
ensure watched status is set on items if they're not yet available in the library
amet [Wed, 6 Apr 2011 08:09:40 +0000 (12:09 +0400)]
fixed: parse "" as parameter, SetParameter(foo,"") was being ignored. thx jmarshall
amet [Wed, 6 Apr 2011 07:16:45 +0000 (11:16 +0400)]
fixed: ClearProperty should accept only one parameter, ClearProperty(foo)
WiSo [Wed, 6 Apr 2011 07:49:23 +0000 (09:49 +0200)]
[WIN32] fixed build
Jonathan Marshall [Wed, 6 Apr 2011 07:20:32 +0000 (19:20 +1200)]
fixes osx build
Jonathan Marshall [Wed, 6 Apr 2011 07:18:22 +0000 (19:18 +1200)]
no need for the image to be actually rotated - XBMC handles this at display time
Andres Mejia [Wed, 6 Apr 2011 00:45:10 +0000 (20:45 -0400)]
Remove xbms support due to licensing issue with libXBMS.
Reference trac ticket #11396.
S. Davilla [Wed, 6 Apr 2011 00:00:29 +0000 (20:00 -0400)]
[osx] fixed build via make, missing some files
Jezz_X [Tue, 5 Apr 2011 22:56:18 +0000 (08:56 +1000)]
Fixed: [Confluence] Alignment issues caused by the removal of "Library Mode" button fixes #11404
WiSo [Sat, 12 Mar 2011 17:02:44 +0000 (18:02 +0100)]
This commits represent the removal of internal python from the win32 build system
[WIN32] removed internal python from the visual studio solution file.
[WIN32] deleted old python leftovers
spiff [Thu, 24 Feb 2011 19:47:53 +0000 (20:47 +0100)]
Code changes for external python. Changes include submissions by cptspiff,WiSo,blinkseb, and jcarroll
changed: limit the scope of the python includes. this will be useful in an upcomming patch. credit jcarroll
changed: use a m4 check to set the python path directly, and ditch the old hardcoded version nonsense. credit jcarroll
Fixed the build for when --enable-external-python is not used.
Fixed the warnings due to Python.h not being the first header as required by Python.
Final fix to the osx make build so that external python works. Needed to change the m4 macro to account for .dylib on osx and the dependant ./configure call to pass the installed location of the python xbmc is to be built against. Also updated .gitignore for the osx dependency builds.
There was a name collision between the python datetime.h and the xbmc/DateTime.h on file systems that are not case sensitive. This is now fixed by renaming DateTime.h to XBDateTime.h
By request, the .cpp files now sorted alphabetically in the Makefile.in.
the m4 macros is a mess of mixed spaces and tabs. In order to make my couple line change more readable I changed the spaces to tabs so it would be consistent with the surrounding area. This was per the request of jmarshall.
Fixed an error where under internal python the correct header wasn't being used.
if --enable-external-python is selected then don't build the internal python at all and not using any of the wrappers.
Modified the xcode project to work with the external python changes.
There was a bug in the Makefile.in where the internal python build target wasn't being set correctly. This is now fixed.
[WIN32] removed some uneeded files, renamed DateTime* to XBDateTime* and defined USE_EXTERNAL_PYTHON
Added xbmc/cores/DllLoader/Makefile to .gitignore since it's being autogened.
Made it so that the distinction between internal and external python is limited to mostly just Makefile's now. Most of the code no longer needs to make the distinction. This should make it much easier to move forward in windows and eventually with removing the internal python.
updated: .gitignore
montellese [Tue, 5 Apr 2011 19:43:51 +0000 (21:43 +0200)]
JSONRPC: Rename "id" to "ID" for compatibility reasons (Objective-C)
montellese [Tue, 5 Apr 2011 19:05:15 +0000 (21:05 +0200)]
JSONRPC: Fix "genreid" string comparison (thanks to diederich)
Grigori Goronzy [Mon, 4 Apr 2011 19:10:27 +0000 (21:10 +0200)]
libass: Fix blending, use ASS_Image's stride instead of width
Signed-off-by: elupus <elupus@xbmc.org>
montellese [Mon, 4 Apr 2011 22:19:59 +0000 (00:19 +0200)]
Make JSON RPC compliant with the JSON RPC 2.0 specification
These changes make our JSON RPC API compliant with the JSON RPC 2.0 specification by adding support for both by-name and by-position parameters.
Additionally every exposed method is described with a JSON Schema definition which allows parameter checking and detailed description of method parameters and return values.
* Montellese/jsonrpc_clean:
JSONRPC: sync xcode
JSONRPC: cleanup warnings
JSONRPC: Fix compiler error on linux x64
JSONRPC: Fix Compare() for arrays and objects
JSONRPC: Fix usage of "uniqueItems" for arrays
JSONRPC: Rename "Announcement" to "Notification" (as defined in the specification) for external usage
JSONRPC: replace usage of const char* with std::string
JSONRPC: Migration of AudioPlaylist
JSONRPC: Migration of VideoPlaylist
JSONRPC: Migration of Playlist
JSONRPC: Migration of VideoLibrary
JSONRPC: Several minor fixes and renames
JSONRPC: Migration of AudioLibrary
JSONRPC: Migration of Files
JSONRPC: Migration of XBMC
JSONRPC: Migration of System
JSONRPC: Migration of PicturePlayer
JSONRPC: Migration of Player, AudioPlayer and VideoPlayer
JSONRPC: Initial commit for JSON schema service description based JSON RPC handling
JSONRPC: update of jsoncpp library to latest revision
Conflicts:
project/VS2010Express/XBMC.vcxproj.filters
WiSo [Mon, 4 Apr 2011 18:26:26 +0000 (20:26 +0200)]
[WIN32] fixed: delay load the libraries on release builds too
WiSo [Mon, 4 Apr 2011 18:24:02 +0000 (20:24 +0200)]
[WIN32] fixed: forgot that winkde.org provides only dynamic libraries.
WiSo [Mon, 4 Apr 2011 18:06:59 +0000 (20:06 +0200)]
[WIN32] sync project file
WiSo [Mon, 4 Apr 2011 18:02:20 +0000 (20:02 +0200)]
[WIN32] removed sqlite sources in favor of external lib
WiSo [Mon, 4 Apr 2011 18:01:35 +0000 (20:01 +0200)]
[WIN32] use the external sqlite library. Still dunno if its better to link the static library where its used (.cpp) or in the XBMC project settings. Opinions?
WiSo [Mon, 4 Apr 2011 17:59:04 +0000 (19:59 +0200)]
[WIN32] download sqlite from our mirror
WiSo [Mon, 4 Apr 2011 17:36:47 +0000 (19:36 +0200)]
[WIN32] removed libsamplerate from the repo
WiSo [Mon, 4 Apr 2011 17:36:12 +0000 (19:36 +0200)]
[WIN32] use the external libsamplerate
WiSo [Mon, 4 Apr 2011 17:31:22 +0000 (19:31 +0200)]
[WIN32] download libsamplerate from our mirror
WiSo [Mon, 4 Apr 2011 17:01:47 +0000 (19:01 +0200)]
[WIN32] removed libssh.dll. we download it from our mirror
WiSo [Mon, 4 Apr 2011 16:54:15 +0000 (18:54 +0200)]
[WIN32] missed some vs project related changes for libssh
WiSo [Mon, 4 Apr 2011 16:48:29 +0000 (18:48 +0200)]
[WIN32] removed "internal" libssh
WiSo [Mon, 4 Apr 2011 16:47:50 +0000 (18:47 +0200)]
updated .gitignore to include libssh.dll
WiSo [Mon, 4 Apr 2011 16:47:16 +0000 (18:47 +0200)]
[WIN32] changed: use external libssh
WiSo [Mon, 4 Apr 2011 16:45:16 +0000 (18:45 +0200)]
[WIN32] download libssh from our mirror
amet [Mon, 4 Apr 2011 08:43:08 +0000 (12:43 +0400)]
JSONRPC: sync xcode
amet [Mon, 4 Apr 2011 08:43:32 +0000 (12:43 +0400)]
JSONRPC: cleanup warnings
S. Davilla [Sun, 3 Apr 2011 23:38:33 +0000 (19:38 -0400)]
[ios] fixed, image rotation, thxs Memphiz
bobo1on1 [Sun, 3 Apr 2011 20:55:52 +0000 (22:55 +0200)]
fixed: LIRC.h already includes system.h which includes config.h, there's no need to include config.h in LIRC.cpp, this also works around a weird-ass issue with gcc 4.4.5 where it takes the config.h from system.h so that sys/inotify.h is never included
WiSo [Sun, 3 Apr 2011 11:48:52 +0000 (13:48 +0200)]
[WIN32] XBMPS on Windows Fix. solves #11395 (thanks donno)
montellese [Sun, 3 Apr 2011 09:36:46 +0000 (11:36 +0200)]
JSONRPC: Fix compiler error on linux x64
Jonathan Marshall [Sat, 2 Apr 2011 21:16:35 +0000 (09:16 +1200)]
visualisation.enabled always returned true. Thanks to ronie
firnsy [Sun, 27 Mar 2011 09:58:18 +0000 (20:58 +1100)]
changed: when creating tables in mysql force the charset and collation to UTF-8 (the only supported charset and collation).
firnsy [Sun, 27 Mar 2011 03:59:38 +0000 (14:59 +1100)]
fixed: a number of queries ignore case and mysql is case sensitive. fixes #11345 (thanks jingai).
firnsy [Sun, 27 Mar 2011 00:20:55 +0000 (11:20 +1100)]
added: for tvshow playlists allow filtering by studio, for episode playlists allow filtering by studio or mpaa. partially addresses #11207.
spiff [Sat, 2 Apr 2011 09:11:30 +0000 (11:11 +0200)]
Merge branch 'optinalinotify' of github:Fneufneu/xbmc
montellese [Sat, 2 Apr 2011 09:06:40 +0000 (11:06 +0200)]
JSONRPC: Fix Compare() for arrays and objects
spiff [Sat, 2 Apr 2011 06:59:30 +0000 (08:59 +0200)]
fixed: don't ask if a user want to switch to a skin after an update
this was only meant to run for new installs
Jezz_X [Sat, 2 Apr 2011 04:07:53 +0000 (15:07 +1100)]
Changed: [Confluence] Added a workaround that actually mirrors the image in the file browser dialog when you select the "Mirror Image" button. Its not pretty but it works for now (thanks hitcher)
montellese [Fri, 1 Apr 2011 19:42:05 +0000 (21:42 +0200)]
JSONRPC: Fix usage of "uniqueItems" for arrays
montellese [Thu, 31 Mar 2011 16:16:50 +0000 (18:16 +0200)]
JSONRPC: Rename "Announcement" to "Notification" (as defined in the specification) for external usage
montellese [Wed, 23 Mar 2011 09:12:57 +0000 (10:12 +0100)]
JSONRPC: replace usage of const char* with std::string
montellese [Sun, 13 Mar 2011 19:59:15 +0000 (20:59 +0100)]
JSONRPC: Migration of AudioPlaylist
montellese [Sun, 13 Mar 2011 18:16:11 +0000 (19:16 +0100)]
JSONRPC: Migration of VideoPlaylist
montellese [Sat, 12 Mar 2011 17:31:06 +0000 (18:31 +0100)]
JSONRPC: Migration of Playlist
montellese [Mon, 28 Feb 2011 21:01:34 +0000 (22:01 +0100)]
JSONRPC: Migration of VideoLibrary
montellese [Mon, 21 Feb 2011 10:35:25 +0000 (11:35 +0100)]
JSONRPC: Several minor fixes and renames
Rename "ignorethe" to "ignorearticle"
put "start", "end" and "total" into seperate type "limits" (for methods returning a list of items)
Remove "album_" from fields in AudioLibrary.GetAlbums
fixed returned value of "genreid" on AudioLibrary.GetGenres
added additional "fields" values for AudioLibrary methods
fix "total" value for Files.GetDirectory
fix OSX build (thanks amet)
montellese [Mon, 21 Feb 2011 09:27:18 +0000 (10:27 +0100)]
JSONRPC: Migration of AudioLibrary
Remove "file" return value from AudioLibrary.GetGenres
montellese [Sun, 13 Mar 2011 22:30:53 +0000 (23:30 +0100)]
JSONRPC: Migration of Files
montellese [Wed, 9 Feb 2011 10:03:23 +0000 (11:03 +0100)]
JSONRPC: Migration of XBMC
montellese [Mon, 7 Feb 2011 15:55:45 +0000 (16:55 +0100)]
JSONRPC: Migration of System
montellese [Mon, 7 Feb 2011 13:43:23 +0000 (14:43 +0100)]
JSONRPC: Migration of PicturePlayer
montellese [Sun, 13 Mar 2011 22:27:32 +0000 (23:27 +0100)]
JSONRPC: Migration of Player, AudioPlayer and VideoPlayer
Merge XPlayer.GetTime and XPlayer.GetTimeMS to XPlayer.GetTime and turn time values into structure
montellese [Sun, 30 Jan 2011 12:29:45 +0000 (13:29 +0100)]
JSONRPC: Initial commit for JSON schema service description based JSON RPC handling
montellese [Fri, 28 Jan 2011 13:08:12 +0000 (14:08 +0100)]
JSONRPC: update of jsoncpp library to latest revision
Jezz_X [Fri, 1 Apr 2011 08:05:42 +0000 (19:05 +1100)]
Fixed: [Confluence] removed some old xbox system info stuff that became visible after
1392683508346d1372f3a46e524fd0fc22ef2f41 fixes #11390
S. Davilla [Thu, 31 Mar 2011 19:24:50 +0000 (15:24 -0400)]
[ios] refactor makefile to remove undefined dynamic lookups, this confuses configure
bobo1on1 [Wed, 30 Mar 2011 19:58:10 +0000 (21:58 +0200)]
fixed: if CLinuxRendererGL::RenderUpdate() is called with clear set to true, it should always overwrite all backbuffer pixels, even if it has nothing to render, this fixes old backbuffer data being rendered when dvdplayer is starting and app thread is already switched to fullscreen (looks like 2 frames alternating)
bobo1on1 [Wed, 30 Mar 2011 19:54:12 +0000 (21:54 +0200)]
refactor
bobo1on1 [Wed, 30 Mar 2011 19:02:59 +0000 (21:02 +0200)]
fixed: when the renderer needs to clear the backbuffer and needs to blend the video, clear the entire backbuffer to black, when no video blending is needed, just draw black bars
Stephan Raue [Wed, 30 Mar 2011 13:13:32 +0000 (15:13 +0200)]
dvdplayer: fix build with gcc-4.6. Flags to the Linker must be passed via -Wl,. This fixes ticket #11383
CrystalP [Wed, 30 Mar 2011 00:31:29 +0000 (20:31 -0400)]
[WIN32] cosmetic: use pairs of spaces instead of tabs. Same as the rest of the code.
CrystalP [Fri, 4 Mar 2011 05:12:37 +0000 (00:12 -0500)]
[WIN32] host binaries in the mirror system
Jonathan Marshall [Tue, 29 Mar 2011 22:00:29 +0000 (11:00 +1300)]
cleanup win32 includes so as to reduce issues with guilib/ utils/ include paths across platforms
Jonathan Marshall [Tue, 29 Mar 2011 21:59:02 +0000 (10:59 +1300)]
ensure the buffer is cleared prior to loading it with cached data from previous scrapes - fixes #11377
Montellese [Tue, 29 Mar 2011 17:43:41 +0000 (19:43 +0200)]
add iOrder to actorlink* tables to be able to list actors by appearance on scraper sites
spiff [Tue, 29 Mar 2011 14:05:21 +0000 (16:05 +0200)]
fixed: ripping cd's to vorbis crashes
round and round the infinite loop goes, where it ends up you don't want
to know
vdrfan [Tue, 29 Mar 2011 08:47:15 +0000 (10:47 +0200)]
fixed: tvshows are not listed in actor search results (another tvshowview fallout - fixes #11376)
taxigps [Tue, 29 Mar 2011 13:23:08 +0000 (21:23 +0800)]
fixed: Ticket #6739 - subtitles lost when set long delay time
S. Davilla [Tue, 29 Mar 2011 02:55:51 +0000 (22:55 -0400)]
[osx/ios] fix build after
15dbc7b0: need to give Stop() an exit code. This is a normal exit
S. Davilla [Tue, 29 Mar 2011 02:53:29 +0000 (22:53 -0400)]
fixes #11373, use results from mysql_config in configure to determine mysql link flags
CrystalP [Tue, 29 Mar 2011 02:41:28 +0000 (22:41 -0400)]
[WIN32] fix build after
15dbc7b0: need to give Stop() an exit code. Actual value not important.
Jim Carroll [Tue, 29 Mar 2011 02:10:13 +0000 (22:10 -0400)]
Merge branch 'master' of github.com:xbmc/xbmc into trac-11353
S. Davilla [Tue, 29 Mar 2011 02:07:38 +0000 (22:07 -0400)]
[osx/ios] move interfaces, interfaces/http-api and interfaces/json-rpc/json out of xcode_depends and into xcode project.
Jim Carroll [Mon, 28 Mar 2011 23:38:48 +0000 (19:38 -0400)]
Revert "changed: deprecate the RunPlugin() built-in"
This reverts commit
a6413398d271a88068ee15747c9ad8c5eb2658ab.
and fixes trac #11353
S. Davilla [Wed, 16 Mar 2011 20:54:50 +0000 (16:54 -0400)]
[all] refactor exit() handling into power manager
elupus [Mon, 28 Mar 2011 23:09:00 +0000 (01:09 +0200)]
changed: avoid pointless seek backs in libapetag
These cause our file cache to drop cache and restart all the time, making it very slow over http
elupus [Mon, 28 Mar 2011 19:17:37 +0000 (21:17 +0200)]
changed: bump filecache to 20 megs, with 5 megs backbuffer
Also changed so you can explicitly always use file based cache by setting advanced setting cachemembuffersize to 0. The file based cache have no limit on how much it will buffer, but is quite untested at this stage.
elupus [Mon, 28 Mar 2011 21:52:55 +0000 (23:52 +0200)]
fixed: file based file cache never reused buffer on seeks if starting position was wrong
elupus [Mon, 28 Mar 2011 18:58:55 +0000 (20:58 +0200)]
fixed: must translate special paths for the file cache
Montellese [Mon, 28 Mar 2011 18:32:07 +0000 (20:32 +0200)]
add iOrder to actorlink* tables to be able to list actors by appearance on scraper sites
vdrfan [Mon, 28 Mar 2011 09:47:59 +0000 (11:47 +0200)]
Harry Muscle [Tue, 22 Mar 2011 20:01:05 +0000 (16:01 -0400)]
Add disc stub support for cataloging DVDs, Blurays etc. Addresses #10384.