Chris Browet [Tue, 18 Feb 2014 11:44:20 +0000 (12:44 +0100)]
Merge pull request #3112 from koying/fixcurlopenssl
FIX: implement libcurl openssl thread-safe locking
jmarshallnz [Mon, 17 Feb 2014 22:45:42 +0000 (11:45 +1300)]
Merge pull request #4225 from cg110/Ticket-14940-
Fix for ticket 14940
Chris Gilbert [Mon, 17 Feb 2014 21:11:02 +0000 (21:11 +0000)]
Update DeleteMovie to remove links to writers (Fixes 14940)
DeleteMovie needs updating to remove entries in writerlinkmovie, otherwise any updates to the list of writers for a movie may not be correctly reflected, as new entries will be append and old entries are not removed.
alanwww1 [Mon, 17 Feb 2014 22:04:34 +0000 (23:04 +0100)]
[lang] update of skin.confluence language files
alanwww1 [Mon, 17 Feb 2014 22:04:05 +0000 (23:04 +0100)]
[lang] update of core language files
alanwww1 [Mon, 17 Feb 2014 22:02:20 +0000 (23:02 +0100)]
[lang] update of internal addon language files
Rainer Hochecker [Mon, 17 Feb 2014 22:01:18 +0000 (23:01 +0100)]
Merge pull request #4224 from FernetMenta/active
ActiveAE: fix incorrect trigger for transition after:
0f8e85679c55cf2300...
Joakim Plate [Mon, 17 Feb 2014 20:51:44 +0000 (21:51 +0100)]
Merge pull request #4214 from Shine-/ffmpegbackportvc1
ffmpeg backport: VC-1 DXVA2 improvements / Intel compat
Joakim Plate [Mon, 17 Feb 2014 19:29:56 +0000 (20:29 +0100)]
Merge pull request #4209 from elupus/stereoscopic
Stereoscopic subtitle offsets
jmarshallnz [Mon, 17 Feb 2014 19:04:48 +0000 (08:04 +1300)]
Merge pull request #4217 from Montellese/jsonrpc_music_type_unknown
jsonrpc: fix Files.GetDirectory returning wrong type "song" instead of "unknown"
jmarshallnz [Mon, 17 Feb 2014 19:00:25 +0000 (08:00 +1300)]
Merge pull request #4213 from jmarshallnz/mbid_to_artist
[musicdb] If MBIDs exist, try to match the best corresponding artist name
Trent Nelson [Mon, 17 Feb 2014 18:39:50 +0000 (11:39 -0700)]
Merge pull request #4222 from Montellese/jsonrpc_audiolibrary_fixes
jsonrpc: fix AudioLibrary.GetRecentlyAddedSongs/GetRecentlyPlayedSongs (fixes #14938)
Rainer Hochecker [Mon, 17 Feb 2014 17:32:35 +0000 (18:32 +0100)]
ActiveAE: fix incorrect trigger for transition after:
0f8e85679c55cf23004a87e738e799d3caad7192
montellese [Mon, 17 Feb 2014 17:27:22 +0000 (18:27 +0100)]
jsonrpc: fix AudioLibrary.GetRecentlyAddedSongs/GetRecentlyPlayedSongs (fixes #14938)
montellese [Sun, 16 Feb 2014 21:29:31 +0000 (22:29 +0100)]
jsonrpc: fix Files.GetDirectory returning wrong type "song" instead of "unknown"
Chris "koying" Browet [Wed, 14 Aug 2013 17:38:57 +0000 (19:38 +0200)]
FIX: implement libcurl openssl thread-safe locking
jmarshallnz [Mon, 17 Feb 2014 01:24:21 +0000 (14:24 +1300)]
Merge pull request #4216 from Montellese/musicdb_fixes
Two fixes to the music database
Jonathan Marshall [Sun, 16 Feb 2014 22:54:50 +0000 (11:54 +1300)]
[videodb] fix incorrect query for musicvideos matching on title+artist. fixes #14934
Peter Frühberger [Sun, 16 Feb 2014 21:24:20 +0000 (22:24 +0100)]
Merge pull request #4215 from fritsch/pulse-ignore-volume-passthrough
AESinkPULSE: Don't set stored volume when opening in passthrough mode
montellese [Sun, 16 Feb 2014 21:16:41 +0000 (22:16 +0100)]
musicdb: fix iTimesPlayed in albumview (fixes #14901)
montellese [Sun, 16 Feb 2014 18:05:50 +0000 (19:05 +0100)]
musicdb: fix GetYearsNav() using invalid iYear result index
fritsch [Sun, 16 Feb 2014 13:39:32 +0000 (14:39 +0100)]
AESinkPULSE: Don't set stored volume when opening in passthrough mode
Shine [Sun, 16 Feb 2014 10:45:41 +0000 (11:45 +0100)]
ffmpeg backport: VC-1 DXVA2 improvements / Intel compat
Jonathan Marshall [Sun, 16 Feb 2014 05:42:18 +0000 (18:42 +1300)]
[musicdb] If MBIDs exist, try to match the best corresponding artist name on scan. Fixes #14707
Trent Nelson [Sun, 16 Feb 2014 00:32:18 +0000 (17:32 -0700)]
Merge pull request #4096 from DBendit/libbluray-fix
Ensuring libbluray doesn't overwrite distro files on non-Darwin systems
Trent Nelson [Sat, 15 Feb 2014 00:46:56 +0000 (17:46 -0700)]
[DROID] Fix TZ after bfc296b
Jonathan Marshall [Sat, 15 Feb 2014 23:41:53 +0000 (12:41 +1300)]
[music] album info lookup would result in invalid song paths in the database. fixes 14933
Jonathan Marshall [Sat, 15 Feb 2014 21:50:35 +0000 (10:50 +1300)]
[database] fix missing CommitTransaction(), causing queued ExecuteQueries() to be ignored (e.g. repo updates)
ronie [Sat, 15 Feb 2014 21:23:21 +0000 (22:23 +0100)]
Merge pull request #4210 from BigNoid/settingslevel_nav
[Confluence] Change the onup of the settings category list to itself ins...
jmarshallnz [Sat, 15 Feb 2014 21:11:14 +0000 (10:11 +1300)]
Merge pull request #4207 from davilla/memoink
fixed, memory oink. we kept adding to formats to m_formats for each video played and never cleared it
BigNoid [Sat, 15 Feb 2014 17:57:33 +0000 (18:57 +0100)]
[Confluence] Change the onup of the settings category list to itself instead of the settingslevel button.
Joakim Plate [Sat, 15 Feb 2014 17:23:58 +0000 (18:23 +0100)]
overlays: apply stereo offset to all overlay types
This fixes issue #14926
Note: dvd/bluray menu's will not align properly if played back in
a stereoscopic mode after this change, but it's an okey trade off
for now.
Joakim Plate [Sat, 15 Feb 2014 17:20:04 +0000 (18:20 +0100)]
overlays: fixed stereo offset of subtitle was applied when not in 3d
S. Davilla [Sat, 15 Feb 2014 06:46:37 +0000 (01:46 -0500)]
fixed, memory oink. we kept adding to formats to m_formats for each video played and never cleared it
wsoltys [Fri, 14 Feb 2014 18:01:53 +0000 (19:01 +0100)]
Merge pull request #4206 from wsoltys/fixmingw
[WIN32] fixed: missing dlls for the mingw environment
wsoltys [Fri, 14 Feb 2014 17:01:25 +0000 (18:01 +0100)]
[WIN32] fixed: missing some dlls for the mingw environment
jmarshallnz [Fri, 14 Feb 2014 09:06:56 +0000 (22:06 +1300)]
Merge pull request #4205 from groth-its/smb-domain-fix
FIX: Parsing of SMB URLs when a domain is supplied
groth-its [Fri, 14 Feb 2014 03:52:44 +0000 (04:52 +0100)]
Fix CURL::GetWithoutFilename to not break the URL string when the domain
is supplied.
Trent Nelson [Thu, 13 Feb 2014 19:17:20 +0000 (12:17 -0700)]
Merge pull request #4194 from davilla/fix-patch-spew
fixed, missing last line causes patch to spew warnings
Trent Nelson [Thu, 13 Feb 2014 19:16:23 +0000 (12:16 -0700)]
Merge pull request #4195 from Memphiz/fixiosenableinputoutput
[AE/CA/iOS] - fix CAUOutputDevice::EnableInputOuput() by checking the re...
Trent Nelson [Thu, 13 Feb 2014 19:14:39 +0000 (12:14 -0700)]
Merge pull request #4199 from opdenkamp/pvraddonsfeb14
[PVR] bump add-ons
Trent Nelson [Thu, 13 Feb 2014 18:52:24 +0000 (11:52 -0700)]
Merge pull request #4203 from wsnipex/gitrev-fix
[configure] make sure abs_top_srcdir is always defined
Trent Nelson [Thu, 13 Feb 2014 16:56:20 +0000 (09:56 -0700)]
Merge pull request #4190 from fritsch/vdpau-disablempeg4
VDPAU: Mpeg-4/H263 is now a user setting - it must be evaluated
wsnipex [Thu, 13 Feb 2014 15:52:41 +0000 (16:52 +0100)]
[configure] make sure abs_top_srcdir is always defined
Trent Nelson [Thu, 13 Feb 2014 16:20:23 +0000 (09:20 -0700)]
Merge pull request #4193 from t-nelson/parallel_build_fixes_the_last_maybe
Parallel build fixes the last maybe
Peter Frühberger [Thu, 13 Feb 2014 16:04:11 +0000 (17:04 +0100)]
Merge pull request #4200 from fritsch/fix-wasapi-bitstream
ActiveAE: Compare correct list that matches the sinkName
fritsch [Thu, 13 Feb 2014 06:55:17 +0000 (07:55 +0100)]
ActiveAE: Compare correct list that matches the sinkName
Lars Op den Kamp [Thu, 13 Feb 2014 00:21:45 +0000 (01:21 +0100)]
[PVR] bump add-ons
Trent Nelson [Wed, 12 Feb 2014 20:01:58 +0000 (13:01 -0700)]
Fix compile of CharsetConverter tests.
Trent Nelson [Wed, 12 Feb 2014 19:46:22 +0000 (12:46 -0700)]
Fix CNFSFile test compile
Let's deep grep next time we rename headers!
Trent Nelson [Tue, 11 Feb 2014 23:41:31 +0000 (16:41 -0700)]
Fix parallel make race conditions.
wsnipex [Mon, 10 Feb 2014 06:27:52 +0000 (07:27 +0100)]
[make] fix ffmpeg libs target dependencies
Trent Nelson [Wed, 12 Feb 2014 19:37:36 +0000 (12:37 -0700)]
Merge pull request #4121 from Black09/fixes
Keep viewtype consistent for addons and remove view flickering on add-on launch
Memphiz [Wed, 12 Feb 2014 19:10:01 +0000 (20:10 +0100)]
Merge pull request #4197 from Memphiz/gtest
[jenkins] - add gtest buildstep for jenkins (osx32, osx64m linux32, linu...
Bl4ck09 [Wed, 12 Feb 2014 19:06:04 +0000 (20:06 +0100)]
Keep viewtype consistent for addons
Memphiz [Tue, 12 Nov 2013 15:08:23 +0000 (16:08 +0100)]
[jenkins] - add gtest buildstep for jenkins (osx32, osx64m linux32, linux64)
Linus Yang [Wed, 12 Feb 2014 14:55:24 +0000 (15:55 +0100)]
[AE/CA/iOS] - fix CAUOutputDevice::EnableInputOuput() by checking the return value of AudioUnitGetProperty
fritsch [Wed, 12 Feb 2014 07:57:53 +0000 (08:57 +0100)]
VDPAU: Distinguish between nvidia and others when checking settings
fritsch [Wed, 12 Feb 2014 07:45:18 +0000 (08:45 +0100)]
DVDVideoCodec: Move special case handling into VDPAU.cpp
S. Davilla [Tue, 11 Feb 2014 04:33:14 +0000 (23:33 -0500)]
fixed, missing last line causes patch to spew warnings
Trent Nelson [Wed, 12 Feb 2014 03:28:10 +0000 (20:28 -0700)]
Merge pull request #4180 from davilla/die-warnings
fixed, compiler warnings.. die warnings die in a large fire
Trent Nelson [Wed, 12 Feb 2014 03:27:20 +0000 (20:27 -0700)]
Merge pull request #4188 from Memphiz/ios7mpeg2crash2
[ios7/atv2] - the real fix for the crash&burn
S. Davilla [Sun, 9 Feb 2014 19:09:29 +0000 (14:09 -0500)]
fixed, compiler warnings.. die warnings die in a large fire
Trent Nelson [Wed, 12 Feb 2014 00:06:29 +0000 (17:06 -0700)]
Merge pull request #4151 from xhaggi/pvr-keymaps
[RFC] change keymaps for FullscreenLiveTV section
Trent Nelson [Tue, 11 Feb 2014 23:17:21 +0000 (16:17 -0700)]
Merge pull request #4095 from vkosh/load-timezone
[settings] fixed: set timezone during initialization
Trent Nelson [Tue, 11 Feb 2014 22:09:04 +0000 (15:09 -0700)]
Merge pull request #4067 from ulion/fix_curl_302_content_length
Fix redirected stream content-length. Fix #14647
jmarshallnz [Tue, 11 Feb 2014 20:13:40 +0000 (09:13 +1300)]
Merge pull request #4127 from BigNoid/fix_empty_playerart
Fix empty player art when playing songs from favourites...
BigNoid [Sat, 1 Feb 2014 22:34:26 +0000 (23:34 +0100)]
Add full path to favourites for songs instead of musicdb path. Fixes empty player art when playing songs from favourites or when playing songs from lists with directory content.
Trent Nelson [Tue, 11 Feb 2014 18:28:02 +0000 (11:28 -0700)]
Merge pull request #4173 from Montellese/settings_fixes
Two settings related fixes
Trent Nelson [Tue, 11 Feb 2014 18:16:21 +0000 (11:16 -0700)]
Merge pull request #4185 from Montellese/fix_empty_tvshow_crash
videolibrary: fix crash when entering an empty tvshow
Trent Nelson [Tue, 11 Feb 2014 18:15:02 +0000 (11:15 -0700)]
Merge pull request #4184 from popcornmix/pisink_supported
[pisink] Report supported passthrough formats
S. Davilla [Tue, 11 Feb 2014 04:34:28 +0000 (23:34 -0500)]
[ios] - fix libmpeg2 PIC asm by including upstream patch - this is the real fix for the ios7 crash when loading libmpeg2 (and by reverting the former uncorrect fix this also fixes the kernel panic which occured on atv2 running ios5 and older ...)
Trent Nelson [Tue, 11 Feb 2014 17:51:19 +0000 (10:51 -0700)]
Merge pull request #4186 from FernetMenta/aeformat
AE - ALSA - enable AC3 and DTS for spdif, fix after
3cd8aad53ce8b355e910...
Memphiz [Tue, 11 Feb 2014 17:34:50 +0000 (18:34 +0100)]
Revert "[ios7/ios/atv2] - link statically against libmpeg2 - since ios7 we crash and burn when we load libmpeg2 as dylib - closes #14813"
This reverts commit
0e53fea3bbf092cccad9f5ade492754ee2a22ead.
Conflicts:
XBMC.xcodeproj/project.pbxproj
xhaggi [Tue, 4 Feb 2014 19:18:36 +0000 (20:18 +0100)]
[keymaps] change keymaps for FullscreenLiveTV section
* left/right for timeshift StepBack/StepForward
Rainer Hochecker [Tue, 11 Feb 2014 14:21:56 +0000 (15:21 +0100)]
AE - ALSA - enable AC3 and DTS for spdif, fix after
3cd8aad53ce8b355e910254e891ca17134a61fae
Rainer Hochecker [Tue, 11 Feb 2014 08:52:52 +0000 (09:52 +0100)]
Merge pull request #4177 from FernetMenta/aeformat
AE: let sink decide what passthrough formats it wants to support
montellese [Mon, 10 Feb 2014 22:19:13 +0000 (23:19 +0100)]
videolibrary: fix crash when entering an empty tvshow
jmarshallnz [Tue, 11 Feb 2014 05:17:38 +0000 (18:17 +1300)]
Merge pull request #4102 from Montellese/platinum_patches_only
platinum: add all currently applied patches
Trent Nelson [Tue, 11 Feb 2014 00:30:40 +0000 (17:30 -0700)]
Merge pull request #4132 from wsnipex/pulse
[configure] use pkg-config for pulse audio detection
jmarshallnz [Mon, 10 Feb 2014 23:18:15 +0000 (12:18 +1300)]
Merge pull request #4049 from elupus/srtfix
dvdplayer: make sure we restore output timestamps for text based subs
Trent Nelson [Mon, 10 Feb 2014 22:35:05 +0000 (15:35 -0700)]
Merge pull request #4099 from vkosh/configure-git
[configure] get git revision from xbmc git root
montellese [Sat, 8 Feb 2014 07:55:41 +0000 (08:55 +0100)]
settings: fix ISettingsHandler::OnSettingsSaved() definition
This fixes profile settings not being saved when when normal settings are saved
and prevents the Master lockcode from being saved to profiles.xml after it has
been changed in Settings -> System -> Master lock.
montellese [Sat, 8 Feb 2014 07:48:28 +0000 (08:48 +0100)]
settings: "masterlock.lockcode" is an action setting and not a string setting
montellese [Sat, 8 Feb 2014 07:47:46 +0000 (08:47 +0100)]
settings: also hide "debug.setextraloglevel" when logging is set in advancedsettings.xml
Trent Nelson [Mon, 10 Feb 2014 22:21:57 +0000 (15:21 -0700)]
Merge pull request #4183 from davilla/fix-self-assignment-warnings
fixed, compiler warning. this comes from boost upstream (https://svn.boost.org/trac/boost/ticket/4918)
jmarshallnz [Mon, 10 Feb 2014 20:32:10 +0000 (09:32 +1300)]
Merge pull request #4182 from Black09/delete-update-fix
Fixed: Update list if item was deleted from database but not from disk
jmarshallnz [Mon, 10 Feb 2014 18:53:01 +0000 (07:53 +1300)]
Merge pull request #4171 from xhaggi/record-action-mapping
[pvr] fix: missing action mapping for ACTION_RECORD
Trent Nelson [Mon, 10 Feb 2014 17:54:23 +0000 (10:54 -0700)]
Revert "[buildsys] Fix parallel build with static ffmpeg."
This reverts commit
ad815563a3837bbd9ea73c3645af55ec56cacb9a.
popcornmix [Mon, 10 Feb 2014 16:53:26 +0000 (16:53 +0000)]
[pisink] Report supported passthrough formats
popcornmix [Mon, 10 Feb 2014 16:54:54 +0000 (16:54 +0000)]
Revert "[rbp] Disable unsupport HD audio passthrough options"
xhaggi [Fri, 7 Feb 2014 18:28:34 +0000 (19:28 +0100)]
[pvr] fix: missing action mapping for ACTION_RECORD
This adds the missing button translator action "record" poiting to
ACTION_RECORD which is currently used in several PVR related windows,
but could not be used in key mappings.
It also adds a default implementation to GUIWindow which calls the
application player record functionality, so there is no need to use
XBMC.PlayerControls(record) in key mapping anymore.
Furthermore the default mapping for the record button in remote.xml is
changed to this new action.
jmarshallnz [Mon, 10 Feb 2014 00:14:00 +0000 (13:14 +1300)]
Merge pull request #4078 from afedchin/fix_gui_3d
[3d] fix stretched gui in sbs/ou mode when using hq scalers
jmarshallnz [Sun, 9 Feb 2014 21:42:57 +0000 (10:42 +1300)]
Merge pull request #4011 from fritsch/vdpau-settings
Linux: Gui Settings for HW Decoders
jmarshallnz [Sun, 9 Feb 2014 21:42:43 +0000 (10:42 +1300)]
Merge pull request #4179 from anssih/fix/cximage-CVE-2013-1438
[cximage] Fix denial of service via a crafted photo file (CVE-2013-1438)
Anton Fedchin [Thu, 23 Jan 2014 19:28:28 +0000 (23:28 +0400)]
[3d] fix stretched gui in sbs/ou mode when using hq scalers
fritsch [Sun, 9 Feb 2014 18:49:55 +0000 (19:49 +0100)]
XCode: Adjust to new DVDVideoCodec.cpp thx @davilla
Rainer Hochecker [Sun, 9 Feb 2014 18:06:32 +0000 (19:06 +0100)]
Add DVDVideoCodec.cpp to Visual Studio
fritsch [Sat, 11 Jan 2014 15:04:11 +0000 (16:04 +0100)]
Settings: Add description and examples to the new settings
Language: Add comments to every single lable to help translators
fritsch [Sun, 2 Feb 2014 09:50:57 +0000 (10:50 +0100)]
Settings: Use new Codec Settings function to hide settings for nvidia users