jmarshallnz [Mon, 9 Dec 2013 19:24:22 +0000 (11:24 -0800)]
Merge pull request #3562 from Karlson2k/vfs_update_small_02
[vfs] CFile: remove 'virtual' from destructor
jmarshallnz [Mon, 9 Dec 2013 19:23:52 +0000 (11:23 -0800)]
Merge pull request #3709 from bavison/cache_utf8_text
Add caching of text labels at the UTF8 level
Martijn Kaijser [Mon, 9 Dec 2013 18:02:18 +0000 (10:02 -0800)]
Merge pull request #3785 from ronie/confluence-rightbuttons
[Confluence] move buttons to the right side, improve navigation
Ben Avison [Mon, 9 Dec 2013 15:28:15 +0000 (15:28 +0000)]
Add caching of text labels at the UTF8 level
Previously, CGUITextLayout::Update converted its string argument from UTF8 to
UTF16, then passed it to CGUITextLayout::UpdateW, where it was compared
against a cached copy of the string (in its UTF16 form). However, the
conversion itself was taking up a reasonable chunk of CPU time.
This patch adds a similar cache of the string in its UTF8 form to the Update
method, and splits the non-cache part of UpdateW into a separate function, so
we can bypass it the case where we've tested it against the UTF8 cache.
I have measured the effect while the Videos window of the default skin was
open (but idle) on a Raspberry Pi, and this reduced the CPU usage by 2.9%
from 39.1% to 36.2%:
Before After
Mean StdDev Mean StdDev Confidence Change
IdleCPU% 39.1 0.9 36.2 0.5 100.0% +8.1%
Ben Avison [Mon, 9 Dec 2013 15:29:20 +0000 (15:29 +0000)]
Change the string comparison in CGUITextLayout::UpdateW to be case-sensitive
It seems likely that it was only case-insensitive due to the the default
seting of CStdStr::Equals. It's unlikely that you'd ever want to update a
string with another which is the same except for the case of one or more
characters, but if you did, I doubt you'd want to use the cached version if
so. And you're slowing down the comparison in all other cases to achieve that
dubious behaviour.
Memphiz [Mon, 9 Dec 2013 14:44:04 +0000 (06:44 -0800)]
Merge pull request #3772 from nigeljonez/nfsfix-14727
[nfs] Fix syncing issue from Trac #14727
Karlson2k [Mon, 2 Dec 2013 18:57:06 +0000 (22:57 +0400)]
CharsetConverter::ToUtf8: add ability to fail on bad character
Karlson2k [Thu, 21 Nov 2013 14:45:15 +0000 (18:45 +0400)]
StringUtils::Trim: add overload with trim chars parameter
Karlson2k [Thu, 21 Nov 2013 14:37:48 +0000 (18:37 +0400)]
StringUtils::TrimLeft/TrimRight: pass trimming chars as constant character strings
Sascha Montellese [Mon, 9 Dec 2013 09:04:05 +0000 (01:04 -0800)]
Merge pull request #3777 from Montellese/season_listing_fix
videolibrary: move logic for tvshow/season flattening from filesystem to GUI (fixes #14723)
Rainer Hochecker [Mon, 9 Dec 2013 06:31:50 +0000 (22:31 -0800)]
Merge pull request #3618 from siriuzwhite/avformat-hls-fix
fixed bug where ffmpeg doesn't keep custom http headers when playing hls stream
siriuzwhite [Mon, 11 Nov 2013 19:24:40 +0000 (20:24 +0100)]
ffmpeg: add patch for backport: fixed not keeping custom http headers
siriuzwhite [Sun, 10 Nov 2013 22:26:16 +0000 (23:26 +0100)]
[backport] fixed ffmpeg not keep custom http headers when playing hls stream
Nigel Jones [Sun, 8 Dec 2013 23:38:14 +0000 (12:38 +1300)]
[nfs] Fix library syncing (trac #14727) for edge-cases resulting from less-common NFS export configurations partially resulting from recent CStdString conversion.
Squashed commit of the following:
commit
1cd13db9822a5a609c232a614e67c361ca260f2d
Author: Nigel Jones <nigel@nigelj.com>
Date: Sun Dec 8 02:47:08 2013 +1300
[nfs] Recommendation from PR 3772 by jmarshallnz for code cleanup implemented avoiding the substr routine.
exportPath is only set if a valid export is found.
commit
be9d0b0aa42b4710a5005824c1d04f1a69120cbc
Merge: a43d406 d32ff6e
Author: Nigel Jones <nigel@nigelj.com>
Date: Sat Dec 7 03:09:32 2013 -0800
Merge pull request #1 from Memphiz/nfsfix-14727
[nfs] - handle special case when "/" is exported via nfs - we need to al...
commit
d32ff6e89bde24909fbf7e97acf0bfa5a8ae5ac7
Author: Memphiz <memphis@machzwo.de>
Date: Fri Dec 6 23:35:48 2013 +0100
[nfs] - handle special case when "/" is exported via nfs - we need to allow empty pathes here when accessing nfs://ip/ (path is empty here - export is "/").
commit
a43d40673887965041939181dab8dcd077049c92
Author: Nigel Jones <nigel@nigelj.com>
Date: Sat Dec 7 00:27:49 2013 +1300
[nfs] - Ensure that the right export is picked if multiple overlapping names may match with StartsWith.
commit
61fb6f567f0a229c1869bbb76524706914574ba9
Author: Nigel Jones <nigel@nigelj.com>
Date: Fri Dec 6 23:44:03 2013 +1300
[nfs] replacement fix for
dd4dd2e91bc083a23fe7b46ae4c291c6672d32e0 (issue #14727).
If the exportPath is the same as the path is then bypass the substr methods, and return the correct relativePath.
Memphiz [Sun, 8 Dec 2013 23:16:25 +0000 (15:16 -0800)]
Merge pull request #3776 from Memphiz/nfsunittest
[tests] - add unit test for nfs
Memphiz [Fri, 6 Dec 2013 23:41:24 +0000 (00:41 +0100)]
[nfs] - add unit tests for verifying proper splitting of nfs urls into export and relative path
Rainer Hochecker [Sun, 8 Dec 2013 19:28:39 +0000 (11:28 -0800)]
Merge pull request #3744 from FernetMenta/aefixes
Aefixes
ronie [Sat, 7 Dec 2013 23:48:05 +0000 (00:48 +0100)]
[Confluence] move buttons to the right side, improve navigation
Lars Op den Kamp [Sun, 8 Dec 2013 16:19:59 +0000 (08:19 -0800)]
Merge pull request #3784 from wsoltys/peripherals
[peripherals] fixed a ambiguous variable and replaced .size() by .empty()
Martijn Kaijser [Sun, 8 Dec 2013 14:25:24 +0000 (06:25 -0800)]
Merge pull request #3787 from jimfcarroll/fix-doxygen-markdown
Minor Codegenerator Doxygen Fix
Jim Carroll [Sun, 8 Dec 2013 13:08:08 +0000 (08:08 -0500)]
Fix codegenerator to handle the <emphasis> doxygen generated by just putting back the markdown.
Rainer Hochecker [Sat, 7 Dec 2013 09:56:59 +0000 (10:56 +0100)]
WASAPI: handle obsolete 7.1 wide layout
Rainer Hochecker [Fri, 6 Dec 2013 08:36:58 +0000 (09:36 +0100)]
WASAPI: try other channels layouts on init if requested one is not supported
Rainer Hochecker [Thu, 5 Dec 2013 17:42:50 +0000 (18:42 +0100)]
ActiveAE: fix incorrect return values of GetSpace
Rainer Hochecker [Wed, 4 Dec 2013 07:55:36 +0000 (08:55 +0100)]
ActiveAE: limit buffertime to 80ms
fritsch [Sun, 1 Dec 2013 19:22:55 +0000 (20:22 +0100)]
AESinkAlsa: Use 51Wide and 71Wide Maps when we need to do so
Andreas Zelend [Sun, 8 Dec 2013 07:11:25 +0000 (23:11 -0800)]
Merge pull request #3782 from wsoltys/reference
changed: pass CStreamDetailSubtitle as reference
ronie [Sun, 8 Dec 2013 01:51:02 +0000 (02:51 +0100)]
[Confluence] cosmetics - font colors
jmarshallnz [Sat, 7 Dec 2013 23:37:54 +0000 (15:37 -0800)]
Merge pull request #3587 from Nachtzuster/ma4_replaygain
fix: Use replaygain tags for .m4a type family files too, closes Ticket #13948
WiSo [Sat, 7 Dec 2013 22:39:51 +0000 (23:39 +0100)]
[peripherals] fixed a ambiguous variable and replaced .size() by .empty()
WiSo [Sat, 7 Dec 2013 22:14:34 +0000 (23:14 +0100)]
removed double assignment in EpgSearchFilter::Reset()
wsoltys [Sat, 7 Dec 2013 20:24:02 +0000 (12:24 -0800)]
Merge pull request #3781 from afedchin/dxva-hd-fix-warn
[dxva-hd] remove mistakenly redefined members
Anton Fedchin [Sat, 7 Dec 2013 18:52:50 +0000 (22:52 +0400)]
[dxva-hd] remove mistakenly redefined members after
04bb49cc4475778a82da86673d3f3486193c5354
WiSo [Sat, 7 Dec 2013 19:59:21 +0000 (20:59 +0100)]
changed: pass CStreamDetailSubtitle as reference
WiSo [Sat, 7 Dec 2013 18:42:06 +0000 (19:42 +0100)]
[WIN32] changed: log a more meaningful message if DXVAHD fails because the device doesn't support it.
Rainer Hochecker [Sun, 1 Dec 2013 18:30:22 +0000 (19:30 +0100)]
ActiveAE: let sink do channel mapping for 7.1
Rainer Hochecker [Sun, 1 Dec 2013 12:31:11 +0000 (13:31 +0100)]
AE: allow channel BC to be mixed into BL/BR os SL/SR
Rainer Hochecker [Sun, 1 Dec 2013 12:30:11 +0000 (13:30 +0100)]
AE: fix hidden setting stereo upmix if spdif is selected
Martijn Kaijser [Sat, 7 Dec 2013 17:47:02 +0000 (18:47 +0100)]
[cosmetic] cleanup copyright headers
Martijn Kaijser [Sat, 7 Dec 2013 17:24:04 +0000 (18:24 +0100)]
Joakim Plate [Sat, 7 Dec 2013 16:59:00 +0000 (08:59 -0800)]
Merge pull request #3751 from elupus/gles
Minor gles renderer cleanup and fixes
WiSo [Sat, 7 Dec 2013 16:39:25 +0000 (17:39 +0100)]
[WIN32] fixed: wrong member initialization
wsoltys [Sat, 7 Dec 2013 16:21:48 +0000 (08:21 -0800)]
Merge pull request #3589 from afedchin/dxva-hd
[dxva] added dxva-hd renderer as alternative native dxva video processing.
Karlson2k [Sat, 7 Dec 2013 16:00:40 +0000 (20:00 +0400)]
[win32] update PCRE depend package
.pdb files now included in package
wsoltys [Sat, 7 Dec 2013 16:15:31 +0000 (08:15 -0800)]
Merge pull request #3678 from Karlson2k/cleanup_smb_01
SMB: Cleanup
montellese [Sat, 7 Dec 2013 10:05:25 +0000 (11:05 +0100)]
get rid of two cast warnings
montellese [Sat, 7 Dec 2013 09:47:46 +0000 (10:47 +0100)]
videolibrary: move logic for tvshow/season flattening from filesystem to GUI (fixes #14723)
jmarshallnz [Sat, 7 Dec 2013 00:02:28 +0000 (16:02 -0800)]
Merge pull request #3775 from jmarshallnz/more_caching_of_bools_in_listitems
More caching of bools in listitems
Memphiz [Fri, 6 Dec 2013 23:40:56 +0000 (00:40 +0100)]
[nfs] - change splitUrlIntoExportAndPath so that it can be used with external exportlist - preparation for adding a unit test
Memphiz [Fri, 6 Dec 2013 19:04:29 +0000 (20:04 +0100)]
[test] - fix compile of TestCharsetConverter after
8f830c1b9a4446f9b68f0dbd693fcda2788eff26
Memphiz [Fri, 6 Dec 2013 19:10:22 +0000 (20:10 +0100)]
[tests] - fix compile of TestCPUInfo after string changes
ronie [Fri, 6 Dec 2013 22:56:54 +0000 (14:56 -0800)]
Merge pull request #3762 from xhaggi/confluence-pvr
[confluence] improve pvr timer and search view
xhaggi [Mon, 11 Nov 2013 14:48:50 +0000 (15:48 +0100)]
[confluence] improving skin code for search view
xhaggi [Sun, 10 Nov 2013 16:57:26 +0000 (17:57 +0100)]
[confluence] improving skin code for timer view
Jonathan Marshall [Sat, 23 Nov 2013 02:45:49 +0000 (15:45 +1300)]
[info] Have the infomanager invalidate infobools so that classes that hold them can call the infobool directly rather than going via the infomanager
Ben Avison [Thu, 21 Nov 2013 18:23:21 +0000 (18:23 +0000)]
[info] Add selective caching of infobools in list items
As noted in a TODO comment attached to CGUIInfoManager::GetBoolValue, caching
of infobools (both expression and single bools) is disabled whenever a
CGUIListItem pointer is provided. This is true whenever visibility is
evaluated for a control which is part of a list item (which is responsible
for a large portion of the controls in many windows), which obviously hurts
cache efficiency. However, many of the bools (including the leaf nodes of
expression infobools) aren't actually dependent upon which list item they're
attached to.
This patch adds a flag to each InfoBool object to indicate whether its value
depends upon the list item; if this isn't set, then the cache is re-enabled
even if a CGUIListItem pointer is provided. The flag is calculated at parse
time because it's quite tricky to evaluate - it applies to bools in any of
the following categories:
* a statically definied boolean condition in the range LISTITEM_START to
LISTITEM_END - for example, "ListItem.IsResumable"
* a (dynamically allocated) multi-info bool, that is to say, the result of a
string or integer operation on a list item attribute - for example
"substring(Listitem.mpaa,Rated R)"
* an expression that uses one or more of the above - for example
"Window.IsVisible(Videos) + !ListItem.IsResumable"
I measured the effect while the Videos window of the default skin was open
(but idle) on a Raspberry Pi, and this reduced the CPU usage by 3.2% from
45.1% to 41.9%:
Before After
Mean StdDev Mean StdDev Confidence Change
IdleCPU% 45.1 1.2 41.9 0.5 100.0% +7.7%
Jonathan Marshall [Fri, 22 Nov 2013 23:22:59 +0000 (12:22 +1300)]
[info] ensure we clear the window's conditional includes and visible condition on unload
Jonathan Marshall [Sat, 23 Nov 2013 00:34:21 +0000 (13:34 +1300)]
[info] use std::find_if() to find previous infobool
Jonathan Marshall [Sat, 23 Nov 2013 00:05:35 +0000 (13:05 +1300)]
[controls] GetVisibleCondition is only ever used to check if a visible condition exists, so replace with HasVisibleCondition
Jonathan Marshall [Fri, 22 Nov 2013 23:46:53 +0000 (12:46 +1300)]
[info] Made CGUIInfoManager::Register() return a shared_ptr to the InfoBool object
rather than an index into its cache of such objects. All places where
those index integers were stored are changed to store shared_ptrs, and
CGUIInfoManager::GetBoolValue() now accepts them instead.
This permits the lifetime of a registered bool to persist across calls of
CGUIInfoManager::Clear(), if necessary.
Jonathan Marshall [Fri, 22 Nov 2013 23:20:43 +0000 (12:20 +1300)]
[info] splits InfoSingle/Expression out from InfoBool.h
Jonathan Marshall [Sat, 23 Nov 2013 00:40:54 +0000 (13:40 +1300)]
[info] ToLower() an infobool expression prior to searching to save unnecessary caseless comparisons
Jonathan Marshall [Fri, 22 Nov 2013 23:16:13 +0000 (12:16 +1300)]
[info] CStdString -> std::string
Karlson2k [Fri, 6 Dec 2013 18:36:05 +0000 (22:36 +0400)]
Nigel Jones [Fri, 6 Dec 2013 10:03:51 +0000 (23:03 +1300)]
Revert "[nfs] - better fix for
fe97d68f87d6985b2bf57d8e942b36b5e7373066 - possibly fixes #14727 - thx jm for the idea :)"
This reverts commit
dd4dd2e91bc083a23fe7b46ae4c291c6672d32e0.
This commit created issues comparing paths when the export and the path was the same and did not contain a trailing slash, in addition, it removed the correct reversal of ordering of m_exportList generated by GetExportList.
Reference: http://trac.xbmc.org/ticket/14727#comment:12
Karlson2k [Fri, 6 Dec 2013 06:39:19 +0000 (22:39 -0800)]
Merge pull request #3750 from Karlson2k/update_utf8_check
Update UTF-8 string check
taxigps [Thu, 5 Dec 2013 23:38:47 +0000 (15:38 -0800)]
Merge pull request #3768 from taxigps/subtitle_addon
[subtitles] check and get idx/sub pair when download.
alanwww1 [Thu, 5 Dec 2013 22:28:05 +0000 (23:28 +0100)]
[lang] update of skin.confluence language files
alanwww1 [Thu, 5 Dec 2013 22:27:47 +0000 (23:27 +0100)]
[lang] update of core language files
alanwww1 [Thu, 5 Dec 2013 22:27:08 +0000 (23:27 +0100)]
[lang] update of internal addon language files
Rainer Hochecker [Thu, 5 Dec 2013 21:01:39 +0000 (13:01 -0800)]
Merge pull request #3764 from FernetMenta/mpegts
ffmpeg: backport mpegts fix for dts jumping backwards (trac 14622)
Karlson2k [Thu, 5 Dec 2013 19:50:02 +0000 (23:50 +0400)]
VideoInfoScanner::EnumerateEpisodeItem: don't use ToLower with UTF-8 strings, fixes #14728
Not needed as RegExps are done in caseless mode
amet [Thu, 5 Dec 2013 17:37:33 +0000 (20:37 +0300)]
[coreSubs] proper fix for cf85bdb , select services list if no subtitles are found
taxigps [Thu, 5 Dec 2013 08:16:56 +0000 (16:16 +0800)]
[subtitles] check and get idx/sub pair when download.
arnova [Thu, 5 Dec 2013 06:13:26 +0000 (22:13 -0800)]
Merge pull request #3699 from arnova/streamdetail_stack_time_fix
fixed: We can't grab the duration from the streamdetails for stacks
Memphiz [Wed, 4 Dec 2013 23:37:19 +0000 (00:37 +0100)]
[nfs] - better fix for
fe97d68f87d6985b2bf57d8e942b36b5e7373066 - possibly fixes #14727 - thx jm for the idea :)
Memphiz [Wed, 4 Dec 2013 23:36:09 +0000 (00:36 +0100)]
[nfs] - get rid of some CStdStrings in favour of std::string
popcornmix [Wed, 4 Dec 2013 23:21:42 +0000 (15:21 -0800)]
Merge pull request #3754 from popcornmix/fix_viewport_cache
[GLES] Fix for SBS rendering and cached viewport
Karlson2k [Wed, 4 Dec 2013 21:35:29 +0000 (01:35 +0400)]
Add missing includes of "system.h", fixes #14732
Memphiz [Wed, 4 Dec 2013 21:17:18 +0000 (22:17 +0100)]
[ios/atv2] - readd gitrev-posix which was wrongly removed in
05274bfcbcbbc96a5ee5a61bf4018b30719727f4 - its still needed in ios/atv2 packaging if we want to retain dsym files (on jenkins...)
Sascha Montellese [Wed, 4 Dec 2013 21:16:38 +0000 (13:16 -0800)]
Merge pull request #3767 from Voyager1/fixmovieset
[fix] Could not edit/assign movie to movie set after #3642
Voyager1 [Wed, 4 Dec 2013 19:45:08 +0000 (20:45 +0100)]
[fix] Could not edit/assign movie to movie set after #3642
due to https://github.com/Montellese/xbmc/commit/
e14fae38dec48cd1cd36f875f1ebde5396f43d57
Lars Op den Kamp [Wed, 4 Dec 2013 19:46:51 +0000 (11:46 -0800)]
Merge pull request #3733 from xhaggi/fix-epg-progress-indicator
[epg] fix: hide progress indicator if go forward in time
Lars Op den Kamp [Wed, 4 Dec 2013 19:31:03 +0000 (11:31 -0800)]
Merge pull request #3684 from Jalle19/pvr-small-fixes
Cleanup some of the PVR code
Lars Op den Kamp [Wed, 4 Dec 2013 19:29:33 +0000 (11:29 -0800)]
Merge pull request #3763 from xhaggi/fileitem-epginfotag-icon
[pvr] CFileItem: fallback to channel icon if epg icon is empty
Tobias Arrskog [Wed, 4 Dec 2013 10:22:54 +0000 (02:22 -0800)]
Merge pull request #3702 from elmerfud/master
fix for #14713: RSSDirectory Reading of Boxee Genre Incorrect
Rainer Hochecker [Wed, 4 Dec 2013 09:03:50 +0000 (10:03 +0100)]
ffmpeg: add patch for backport: mpegts-do-not-set-pts-for-missing-dts
Rainer Hochecker [Tue, 3 Dec 2013 09:03:04 +0000 (10:03 +0100)]
mpegts: do not set pts for missing dts in video streams
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
jmarshallnz [Tue, 3 Dec 2013 22:14:04 +0000 (14:14 -0800)]
Merge pull request #3669 from jmarshallnz/right_means_right
Control positioning: Make <right>, <bottom> measure from right and bottom
xhaggi [Tue, 3 Dec 2013 22:02:06 +0000 (23:02 +0100)]
[pvr] CFileItem: fallback to channel icon if epg icon is empty
Peter Frühberger [Tue, 3 Dec 2013 21:10:14 +0000 (13:10 -0800)]
Merge pull request #3755 from fritsch/revert-6d637d
Revert "Ensure that the decoder is init once only."
Joakim Plate [Tue, 3 Dec 2013 20:46:07 +0000 (21:46 +0100)]
fixup! renderer: add underlying support for 16bit textures on gles
Joakim Plate [Tue, 3 Dec 2013 20:44:34 +0000 (21:44 +0100)]
renderer: factor out logic for upgrading GL format to 16bit
Joakim Plate [Tue, 3 Dec 2013 20:25:33 +0000 (21:25 +0100)]
fixup! renderer: calculate source rect on upload GLES:EGL/CVRef/MediaCodec
ronie [Tue, 3 Dec 2013 17:04:13 +0000 (18:04 +0100)]
[confluence] update positioning so that <right> is measured from the right
Jonathan Marshall [Sun, 17 Nov 2013 22:09:48 +0000 (11:09 +1300)]
drop <centerx> and <centery> and use <centerleft|right|top|bottom> where right and bottom measure from the right and bottom
Jonathan Marshall [Sun, 17 Nov 2013 22:09:04 +0000 (11:09 +1300)]
<right> and <bottom> should measure from the right and bottom respectively
Jonathan Marshall [Sun, 17 Nov 2013 22:07:50 +0000 (11:07 +1300)]
fixes incorrect position computation in the case where right and center are given
jmarshallnz [Tue, 3 Dec 2013 19:22:26 +0000 (11:22 -0800)]
Merge pull request #3757 from Karlson2k/CArchive_upd_01
CArchive update
jmarshallnz [Tue, 3 Dec 2013 19:20:47 +0000 (11:20 -0800)]
Merge pull request #3759 from Karlson2k/CArchive_incl_clean_01
CArchive include cleanup