Merge remote-tracking branch 'origin/bug_453_multiepg_no_more_ask_bouquet'
make new multi epg bouquet handling optional via usage config "Multi-EPG bouquet selection (Yes/No)" option default is the old behaviour refs bug #453
Merge branch 'bug_723_infobarext_pvr'
do not show extensions menu plugins which require servicelist in pvr playback mode (works around bug #723)
put out an error message on instant record on non invalid services refs #718
more robust timer sanity check / autoincrement handling, small code cleanup fixes bug #718
Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst'
show Multi EPG in epg selection list
experimentally merge audio + subtitle streams selection dialogs into one
Playback/Skipping fixes / cleanup by A. Holst * Jumping between marks in the movie, with "<" and ">", doesn't work well when there are cut marks in the movie. Especially jumping backwards will fail if there is a mark in a cut out region that is to be jumped over. (InfoBarGenerics.py, chunks 3 and 4) * Now when rewind works at all platforms also at low speeds, the rewind speeds x2 and x4 should be added again to the default. (UsageConfig.py, chunk 1) * Cleanup some obsolete code: SeekBackHack and non-smooth winding. None of these can be used anymore, but remnants were left in the code and in the configuration alternatives. It is high time to clean these out. (setup.xml, UsageConfig.py chunk 2, InfoBarGenerics.py chunks 1 and 2, DVDPlayer) * In the position gauge of the movie player, marks in the movie are shown as red dots. Long time ago the last position was also shown as a red dot, which was bad because it was confused with the marks, so it was removed. However, jumping between marks in the movie with "<" and ">" also stops at the last position, which is useful e.g. if you don't automatically start playing from the last position. The code below adds the last position back to the position gauge as a green dot, to distinguish it from the red ones. (epositiongauge.cpp) refs bug #570
show timeshift state widget even in state play this fixes bug #332
fixes bug #342 change action map help text for long info button press
lib/python/Screens/InfoBarGenerics.py: [PATCH 2/3] use non-visual bouquet selector in multiepg
fixes bug #288 last playing position for recorded services was stored only if between 1% and 99% of the recording's length. this lead to voodoo for the user, since long recordings naturally have a longer 1% than short ones. so the 1% rule is gone now and we display the position of the marker in the message box, asking the user if playing should continue at this position.
Merge branch 'bug_274_disable_fast_winding_for_non_ts'
InfoBarGenerics.py: rename timer to fix automatic infobar hide after channel change
InfoBarGenerics.py: fix handling for unused key indication when two times the same key is pressed, small cleanup
InfoBarGenerics.py: small cleanup
show a short symbol when a unhandled key is pressed this fixes bug #293
InfoBarGenerics.py: small fix