[SCM] kodi-pvr-hts/master: Merge remote-tracking branch 'upstream/Jarvis'

Wed Mar 2 23:02:02 UTC 2016

[lang] updated language files from Transifex
Merge pull request #196 from hudokkow/Jarvis_butler
[travis] Use correct badge
HTSPDemuxer: fix m_seekTime race in CHTSPDemuxer::Seek, fixes #188
Merge pull request #189 from Jalle19/jarvis-merge-fixe
fix merge error which causes subscriptionSeek to fail
Merge pull request #183 from Jalle19/jarvis-updates
bump version to 2.2.13
change .travis.yml to clone the Jarvis branch of Kodi
append HTS_SOURCES_TVHEADEND_STATUS to HTS_SOURCES
add Profile.h to CMakeLists.txt
Enable build testing on OS X as well
Extend the build tests to leverage the awesome complaining power of clang
demuxer: do not call flush when skip failed
timeshift: m_seeking must be released in the ParseSubscriptionSkip
demuxer: move m_seeking setup to the right place, fix m_seeking/m_changeSpeed initialization
demuxer - flush packet queue also on speed changes
demuxer - Seek - set m_seekTime variable to zero before Wait()
muxer - flush the queued packets with wrong pts on seek
[lang] updated language files from Transifex
Merge pull request #170 from ksooo/fix-schedules-dirty-flag
Merge pull request #171 from ksooo/coverity-once-again
fix compiler warning: -Wsign-compare
Fix schedules dirty flag handling.
Merge pull request #166 from afedchin/fix_log_win
fixed crash in logger on windows.
[lang] updated language files from Transifex
Merge pull request #165 from Jalle19/travis
add Travis CI badge to the README
add initial .travis.yml
Merge pull request #164 from Jalle19/logger-improvements
set a default logger implementation (fixes CID 12979: Uninitialized members (UNINIT_CTOR))
minor refactoring (separate implementation file), fixed a typo
Merge pull request #159 from Jalle19/windows-build-fix
correct SetBoolSetting() method signature (oldValue should be boolean)
use static_cast<> to silence some MSVC compiler warnings
prefix log levels with LEVEL_ to avoid naming collision with a macro on Windows
add missing include (required on Windows at least)
Merge pull request #163 from Jalle19/log-percentage-2
fix crash when logging certain strings by properly using format strings in the log implementation
Merge pull request #156 from Jalle19/readme-build-instructions
add intial build instructions to the README
Merge pull request #145 from Glenn-1990/htspv25
update changelog
Merge pull request #157 from Jalle19/log-levels
Merge pull request #158 from Jalle19/async-state-namespaced
Implement proper timerec and autorec update methods.
Use removal as lifetime for htspv25+
[lang] updated language files from Transifex
[lang] automatic syntax corrections for the en_GB language file
move AsyncState to tvheadend/utilities
move AsyncState::GetState() implementation to the .cpp file
removed a seemingly unnecessary log call
change ignored subscriptionStart log message level to DEBUG
fix missing method (merge/rebase snafu)
Merge pull request #127 from Jalle19/new-logger
change some semantics and make the log message prefix configurable
replace the tvhxxx() macros with a separate logger utility
Merge pull request #152 from ksooo/fix-enable-disable-timers
update changelog
Fix UpdateTimer to allow enable/disable of timers created by timerecs and autorecs
Merge pull request #151 from ksooo/fix-cancel-recording
update changelog
Fix cancel recording for timers created by autorec or timerec.
Merge pull request #147 from Glenn-1990/restart
fixed: restart subscription after reconnection
update changelog
Merge pull request #138 from Glenn-1990/settings
update changelog
[settings] refactor settings dialog
[settings] add defaults for DVR priority, lifetime and dubdetec
[settings] limit the amount of lifetime settings in the GUI
Merge pull request #142 from Glenn-1990/settings_fix
update changelog
[settings] fix invalid addon restarts
[settings] fix approximate time setting
[lang] updated language files from Transifex
Merge pull request #137 from ksooo/fix-buildbreaker
Fix WIN32 build breaker (added missing include for std::min)
Merge pull request #125 from Glenn-1990/removal
update changelog
Remove actual file when lifetime expires
Merge pull request #133 from ksooo/add-oneshot-timer-enable-support
Added support for oneshot timer enable/disable (HTSP v23 feature), closes #131
Merge pull request #132 from ksooo/compiler-warnings
Removed unused vars from ChannelTuningPredictor::PredictNextChannelId
Merge pull request #130 from ksooo/fix-subscription-member-init
class Subscription: Fix member init order.
Merge pull request #129 from ksooo/fix-settings-init
Fix Settings ctor initialization, closes #128
Merge pull request #119 from Jalle19/selectable-profile
pass the streaming profile to use to the demuxer so it gets used (closes #40)
add a setting to select which streaming profile should be used, and display an error notification during startup if the specified profile name is not valid
add support for retrieving the list of available stremaing profiles from the server
Merge pull request #122 from Glenn-1990/dvr_conflict
Merge pull request #123 from Glenn-1990/typo
Parse subscriptionError also for dvr entries
Fix recording state parsing
Merge pull request #121 from Glenn-1990/subscription
Refactor subscription to class
Merge pull request #117 from Jalle19/predictive-tuning-improvements
add some comments to the predictive tuning logic
drop an unnecessary check
lower the subscription weight of the current subscription before promoting an old subscription to "normal" weight, otherwise we may end up with two normal weight subscriptions simultaneously (fixes #91)
create a separate class for figuring out which channel should be tuned to when doing predictive tuning. This new approach has the benefit that it operates on iterators instead of raw numbers, meaning the prediction works as expected even when there are gaps in the channel numbers (fixes #115)
Merge pull request #116 from ksooo/coverity-oct-2015
Coverity: class Entity member init order
Refactor settings, step 2 (Coverity, refactor defaults, data encapsulation, remove settings global vars).
Merge pull request #114 from Jalle19/clion-cleanup
fixed various complaints by CLion
Merge pull request #111 from Jalle19/ignore-addon-xml
Merge pull request #113 from Jalle19/settings-singleton
refactored Settings into a singleton class so it can be included separately instead of having to go through client.h (which is where the "tvh" pointer is declared)
moved Settings.h to the tvheadend/ subdirectory to reflect its actual namespace
Merge pull request #72 from Jalle19/refactor-entities
bumped version to 2.2.9
ignore the auto-generated addon.xml file
fix some comparison operators, fixes issue where "unknown channel 0" appears when the first channel update comes through
alternate the log message when adding/updating channels
factor out the various status structs to separate files under the tvheadend::status namespace
Merge pull request #110 from Jalle19/coverity-badge
add Coverity scan badge to README.md (fixes #108)
Fixes for issues that went wrong during the last rebase
drop unused UPDATE macro
prefix all member fields with m_
make Schedule::events private and provide a read-write getter for it
remove Schedule::channel and use the schedule's ID to represent the channel ID it belongs to
delete schedules before deleting events, otherwise we end up deleting events unnecessarily in case the schedule is being deleted anyway
make Recording class's fields private and use setters/getters
when a recording/timer is updated, always update recordings too
add Recording::GetTimerType()
move timer type definitions to Recording.h
make Event class's fields private and use setters/getters
make Channel class's fields private and use setters/getters
factor out "id" to the Entity base class and expose it only through get/set
add a utility file with a method to erase elements of a map using a lambda. This makes removing dirty entities much more concise.
factored out channels, tags, recordings, timers, events and schedules to separate files, deriving from an Entity base class which provides the "dirty" functionality
remove pointless "update" boolean, we only use it for logging
Merge pull request #105 from ksooo/add-recordings-subtitle-support
recordings: add support for episode name (aka subtitle)
Merge pull request #97 from Glenn-1990/start_stoptime
update changelog
[settings] rework predictive tuning settings, only valid inputs should be allowed
[settings] optimalisation
[settings] add setting for autorec start stop time behaviour
Merge pull request #104 from Jalle19/fix-malformed-adddvrentry
don't treat "channel" as required in dvrEntryAdd messages, fixes #74
Merge pull request #100 from Jalle19/try-fix-seek
remove unused includes and using statements
simplify CHTSPVFS drastically by removing the intermediate circular buffer and threading. Fixes #92, fixes #99.
reduce connection mutex lock scope in CHTSPVFS
Merge pull request #101 from ksooo/pvr-api-4-1-0
Update to PVR addon API v4.1.0
Merge pull request #96 from ksooo/pvr-api-4-0-0
Update to PVR addon API v4.0.0
Merge pull request #83 from metaron-uk/master3
Bump Addon / Changelog
Minimal Support for PVR API 3.0.0
Merge pull request #90 from ksooo/improve-sleep-and-wake
Improve connection handling on suspend/wakeup.
Merge pull request #89 from ksooo/fix-timer-epg-tag-handling
Fix: Use epg data only for creation of epg-based timers.
Merge pull request #84 from hudokkow/dynamicduo
Automatically fill in platform and library name
Merge pull request #82 from Glenn-1990/pretune
Update changelog
[fix] predictive tuning uses subscriptions instead of tuners.
Use the weight from tvheadend when we don't use predictive tuning, this restores the old behaviour.
[fix] weight is not reduced when switching to an other demuxer under some circumstances.
[fix] adjust weight to better match the server configuration, we need a lower weight for predictive tuning than the lowest possible streaming weight a user can set in tvh.
Merge pull request #87 from metaron-uk/timeLord
Fix RecordingBase::LocaltimeToUTC
Merge pull request #86 from ksooo/fix-autorec-start-stop-handling
Autorec: Fix handling of start end stop time.
Merge pull request #80 from wsnipex/master
[debian] also bump version in changelog
[debian] provide a transitional package for kodi-pvr-tvheadend-hts
Merge pull request #73 from ksooo/timeshift-buffer-time-start-end
Coverity: Fixed CID 102604, CID 102605
Timeshift API: Add support for GetBufferTimeStart() and GetBufferTimeEnd().
Merge pull request #71 from Jalle19/drop-cstdstring
drop CStdString
Merge pull request #70 from Jalle19/gitignore
added initial .gitignore
Merge pull request #68 from ksooo/heap-alloc-timer-types
Merge pull request #67 from Glenn-1990/satpos
Merge pull request #23 from martinwilli/predictive-tuning
Implement predictive tuning using multiple tuners
bump addon version
API: GetTimerTypes: Heap-allocate TimerType instances to avoid stack overflow.
Merge pull request #66 from hudokkow/api210
Bump add-on
Support for PVR API 2.1.0
include satpos in mux description
Merge pull request #65 from hudokkow/installpath
Merge pull request #62 from ksooo/fix-instant-timer-support
bump add-on for alpha1 release
Fix support for instant timers.
Merge pull request #61 from wsnipex/master
[debian packaging]: fix library install path
Merge pull request #59 from ksooo/pvr-api-2-0-0
Bumped API version to 2.0.0, addon version to 2.2.1
Merge pull request #57 from ksooo/series-recordings-coverity
Fix: Coverity: ID 101275: Code maintainability issues  (UNUSED_VALUE)
Merge pull request #38 from ksooo/series-recording-support
Add support for series recordings.
Merge pull request #56 from adamsutton/master
fix bug causing recordings not to display for older TVH
Merge pull request #52 from hudokkow/cmakelist_lang
Fix CMakeLists.txt language resource folder
[lang] update of language files from Transifex
Merge pull request #49 from ksooo/fix-epg-data-update
Fixed EPG events update (some data was not updated correctly)
Merge pull request #47 from ksooo/imagecache_compat
Fixed channel icon compatibility issue with recent tvheadend servers.
Merge pull request #44 from ksooo/fix-htsp-version-check
Fixed: do not show HTSP version mismatch error if tvheadend server is down
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: da14e25d0ec59a47da93dd88bdc66e1c16d94238
X-Git-Newrev: 4dc398ff1337ec61dea38685719108f1cd20f7b0

The following commit has been merged in the master branch:
commit 950b51136b6252b5d7976526fc67333e8f938327
Merge: da14e25d0ec59a47da93dd88bdc66e1c16d94238 3c673b5b29fc26c203c79f7df58680af50a1afa7
Author: Tobias Grimm <git at e-tobi.net>
Date:   Wed Mar 2 23:29:12 2016 +0100

    Merge remote-tracking branch 'upstream/Jarvis'

-- 
kodi-pvr-hts packaging