aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-12-30Merge pull request #8709 from ↵jenkins4kodi
xhaggi/jarvis/fix-pvr-populate-visible-groups-only-via-jsonrpc
2015-12-30Merge pull request #8707 from Razzeee/jarvis-disable-ratings-for-pluginsjenkins4kodi
2015-12-29[fix][pvr] don't populate hidden groups over json-rpcxhaggi
2015-12-29[fix][pvr] m_gridIndex array index out of boundxhaggi
2015-12-29[EPG] Fix 'GoToNow' to select the currently active epg event of selected ↵Kai Sommerfeld
channel.
2015-12-29Disable ratings button for pluginsKolja Lampe
2015-12-29Merge pull request #8648 from DaveTBlake/Jarvis_ARTISTStagID3v23Dave Blake
Fix (ALBUM)ARTISTS tag processing to allow for item separator
2015-12-29[fix][pvr] wrong group if channel switched by its internal idxhaggi
2015-12-29Merge pull request #8588 from hudokkow/redacted_Jjenkins4kodi
2015-12-29Merge pull request #8698 from ronie/keymap-jarvisronie
fix duplicate key mapping
2015-12-29fix duplicate key mappingronie
2015-12-29Merge pull request #8691 from stefansaraev/jarvis-udevjenkins4kodi
2015-12-28[lang] updated language files from Transifex for Skin Confluencetxtranslation
2015-12-28[lang] updated language files from Transifextxtranslation
2015-12-28Merge pull request #8693 from fritsch/ffmpeg-mp3jenkins4kodi
2015-12-28FFmpeg: Bump to 2.8.4-Jarvis-rc1-mp3fritsch
2015-12-28Merge pull request #8688 from xhaggi/jarvis/pvr-fix-switch-channel-by-idSascha Woo
[backport][pvr] - fix selecting a channel by id via json-rpc
2015-12-28[udevprovider] browse disk dialog is not wanted for blu-raysStefan Saraev
2015-12-28[pvr] - fix selecting a channel by id via json-rpcRainer Hochecker
2015-12-28Merge pull request #8681 from Montellese/Jarvis_jsonrpc_fix_broadcast_runtimejenkins4kodi
2015-12-28Merge pull request #8673 from koying/droidRotateMartijn Kaijser
FIX: [droid] handle video rotation
2015-12-28[jsonrpc] CEpgInfoTag: fix serialization of "runtime" as an integer (in ↵montellese
minutes) instead of as a string Conflicts: xbmc/interfaces/json-rpc/schema/version.txt
2015-12-28Merge pull request #8670 from MartijnKaijser/8659jenkins4kodi
2015-12-26FIX: [droid] handle video rotationChris "Koying" Browet
2015-12-26Merge pull request #8671 from MartijnKaijser/8658jenkins4kodi
2015-12-26Fix compile error on msvs2013jun.jiang
2015-12-26Fix assertion fail in Cutil::GetExternalStreamDetailsFromFilenamejun.jiang
2015-12-24Merge pull request #8635 from MaxKellermann/deadlocksMartijn Kaijser
Fix a whole bunch of deadlocks
2015-12-22[lang] updated language files from Transifex for Skin Confluencetxtranslation
2015-12-22[lang] updated language files from Transifextxtranslation
2015-12-22Allow for item separator in ARTISTS and ALBUMARTISTS tags.DaveTBlake
2015-12-22Merge pull request #8647 from ksooo/jarvis-fix-cancel-recordingKai Sommerfeld
[PVR] Fix: Abort of active recordings must be possible even if associated timer is read-only
2015-12-22Merge pull request #8637 from DaveTBlake/Jarvis_JSONPLaylistArtistjenkins4kodi
2015-12-22Merge pull request #8646 from NedScott/Jarvis-missing_numbersMartijn Kaijser
Correct numeric input for newer PVR windows
2015-12-22[PVR] Fix: Abort of active recordings must be possible even if associated ↵Kai Sommerfeld
timer is read-only
2015-12-22Merge pull request #8640 from stefansaraev/jarvis-ffMartijn Kaijser
FFmpeg: Bump to 2.8.4-Jarvis-rc1
2015-12-22Merge pull request #8642 from ksooo/jarvis-fix-remote-virtualkeybord-backKai Sommerfeld
[keymaps] remote.xml: virtualkeyboard,numericinput: back now maps to 'back', not 'backspace' anymore
2015-12-21Correct numeric input for newer PVR windowsNed Scott
Jarvis version of https://github.com/xbmc/xbmc/pull/8337 Numeric keys were defaulting to JumpSMS in a few PVR windows. This corrects them to be numeric input. Plus, some xbmc -> kodi and notes clean up similar to https://github.com/xbmc/xbmc/pull/8591
2015-12-21[keymaps] remote.xml: virtualkeyboard,numericinput: back now maps to 'back', ↵Kai Sommerfeld
not 'backspace' anymore
2015-12-21Merge pull request #8605 from stefansaraev/udev-jarvisjenkins4kodi
2015-12-21Merge pull request #8639 from Razzeee/Jarvis-dont-crash-on-taglibMartijn Kaijser
Prevent taglib from crashing kodi
2015-12-21Merge pull request #8638 from Razzeee/jarvis-dialogs-ratingsMartijn Kaijser
Select previously selected values in userratings selectdialogs
2015-12-21Merge pull request #8633 from klusark/patch-2Martijn Kaijser
Use two full size members instead of using a static array as a union
2015-12-21FFmpeg: Bump to 2.8.4-Jarvis-rc1fritsch
2015-12-21Prevent taglib from crashing kodiKolja Lampe
2015-12-21Select previously selected values in userratings selectdialogsKolja Lampe
Conflicts: xbmc/music/dialogs/GUIDialogMusicInfo.cpp
2015-12-21Fix Playlist.Getitems returning empty artist array by spltting artist desc ↵DaveTBlake
string at separator.
2015-12-21epg/EpgContainer: fix deadlock bug in LoadFromDB()Max Kellermann
This bug was observed because JobWorker deadlocked inside EPG::CEpgContainer::LoadFromDB(), waiting for g_graphicsContext; main thread holding g_graphicsContext, waiting for PVR::CPVRGUIInfo::m_critSection; PVRGUIInfo holding PVR::CPVRGUIInfo::m_critSection, waiting for CEpgContainer::m_critSection. Circle closed. There are many, many more deadlock bugs in the PVR code. Mutexes are used in a very inconsistent way; sometimes, thread-unsafe objects are not locked at all, and sometimes, mutex are held for too long while calling other functions that will lock another mutex, eventually leading to a circular deadlock.
2015-12-21pvr: fix a bunch of deadlock bugsMax Kellermann
Unlock m_critSection whenever calling a global object's method. This is very important to avoid deadlocks, because the callees may take another lock, which may lead to a deadlock. One of these bugs was observed because JobWorker deadlocked inside EPG::CEpgContainer::LoadFromDB(), waiting for g_graphicsContext; main thread holding g_graphicsContext, waiting for PVR::CPVRGUIInfo::m_critSection; PVRGUIInfo holding PVR::CPVRGUIInfo::m_critSection, waiting for CEpgContainer::m_critSection. Circle closed. There are many, many more deadlock bugs in the PVR code. Mutexes are used in a very inconsistent way; sometimes, thread-unsafe objects are not locked at all, and sometimes, mutex are held for too long while calling other functions that will lock another mutex, eventually leading to a circular deadlock.
2015-12-21pvr/PVRManager: make m_pvrWindowIds "const"Max Kellermann
The "const" clarifies that this is a read-only variable that does not need mutex protection.