Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1031 from croneter/fix-resume

Browse source 
Fix resume when starting playback via PMS or when force transcoding
This commit is contained in:
croneter 2019-11-01 13:33:54 +01:00 committed by GitHub
commit dc12c89385
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
resources/lib/playback.py
View file

@ -177,7 +177,7 @@ def _playlist_playback(plex_id):
_conclude_playback(playqueue, pos=0) _conclude_playback(playqueue, pos=0)
def _playback_init(plex_id, plex_type, playqueue, pos, force_resume): def _playback_init(plex_id, plex_type, playqueue, pos, resume):
""" """
Playback setup if Kodi starts playing an item for the first time. Playback setup if Kodi starts playing an item for the first time.
""" """
@ -212,8 +212,18 @@ def _playback_init(plex_id, plex_type, playqueue, pos, force_resume):
# playqueues # playqueues
# Release default.py # Release default.py
_ensure_resolve() _ensure_resolve()
LOG.debug('Using force_resume %s', force_resume) api = API(xml[0])
resume = force_resume or False if (app.PLAYSTATE.context_menu_play and
api.resume_point() and
api.plex_type in v.PLEX_VIDEOTYPES):
# User chose to either play via PMS or to force transcode
# Need to prompt whether we should resume_playback
resume = resume_dialog(int(api.resume_point()))
if resume is None:
# User cancelled dialog
return
LOG.debug('Using resume %s', resume)
resume = resume or False
trailers = False trailers = False
if (not resume and plex_type == v.PLEX_TYPE_MOVIE and if (not resume and plex_type == v.PLEX_TYPE_MOVIE and
utils.settings('enableCinema') == "true"): utils.settings('enableCinema') == "true"):
@ -292,6 +302,7 @@ def resume_dialog(resume):
# "Resume from {0:s}" # "Resume from {0:s}"
# "Start from beginning" # "Start from beginning"
resume = datetime.timedelta(seconds=resume) resume = datetime.timedelta(seconds=resume)
LOG.debug('Showing PKC resume dialog for resume: %s', resume)
answ = utils.dialog('contextmenu', answ = utils.dialog('contextmenu',
[utils.lang(12022).replace('{0:s}', '{0}').format(unicode(resume)), [utils.lang(12022).replace('{0:s}', '{0}').format(unicode(resume)),
utils.lang(12021)]) utils.lang(12021)])