From ccb95a016990f508247edf11977f7746d2767b72 Mon Sep 17 00:00:00 2001 From: croneter Date: Sat, 1 Jun 2019 12:23:27 +0200 Subject: [PATCH] Fix Kodi always playing the same file version of a video --- resources/lib/context_entry.py | 2 +- resources/lib/playback.py | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/lib/context_entry.py b/resources/lib/context_entry.py index f26bba62..3d302dca 100644 --- a/resources/lib/context_entry.py +++ b/resources/lib/context_entry.py @@ -142,7 +142,7 @@ class ContextMenu(object): v.KODI_PLAYLIST_TYPE_FROM_KODI_TYPE[self.kodi_type]) playqueue.clear() app.PLAYSTATE.context_menu_play = True - handle = self.api.path(force_first_media=False, force_addon=True) + handle = self.api.path(force_addon=True) handle = 'RunPlugin(%s)' % handle xbmc.executebuiltin(handle.encode('utf-8')) diff --git a/resources/lib/playback.py b/resources/lib/playback.py index 6aabdd51..52417ac6 100644 --- a/resources/lib/playback.py +++ b/resources/lib/playback.py @@ -176,10 +176,9 @@ def _playback_init(plex_id, plex_type, playqueue, pos): if (xbmc.getCondVisibility('Window.IsVisible(Home.xml)') and plex_type in v.PLEX_VIDEOTYPES and playqueue.kodi_pl.size() > 1): - LOG.debug('Detected widget playback for videos') # playqueue.kodi_pl.size() could return more than one - since playback # was initiated from the audio queue! - pass + LOG.debug('Detected widget playback for videos') elif playqueue.kodi_pl.size() > 1: # Special case - we already got a filled Kodi playqueue try: @@ -328,7 +327,7 @@ def _prep_playlist_stack(xml): # Need to redirect again to PKC to conclude playback path = api.path() listitem = api.create_listitem() - listitem.setPath(utils.try_encode(path)) + listitem.setPath(path.encode('utf-8')) else: # Will add directly via the Kodi DB path = None @@ -409,7 +408,7 @@ def _conclude_playback(playqueue, pos): LOG.info('Did not get a playurl, aborting playback silently') _ensure_resolve(abort=True) return - listitem.setPath(utils.try_encode(playurl)) + listitem.setPath(playurl.encode('utf-8')) if item.playmethod == 'DirectStream': listitem.setSubtitles(api.cache_external_subs()) elif item.playmethod == 'Transcode':