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

Revert "Attempt to fix widget playback"

Browse source 
This reverts commit 4be376faac.
This commit is contained in:
croneter 2018-02-21 08:47:44 +01:00
parent 4be376faac
commit d4b5dc99a1
1 changed files with 21 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
resources/lib/playback.py
View file

@ -5,7 +5,7 @@ from logging import getLogger
from threading import Thread from threading import Thread
from urllib import urlencode from urllib import urlencode
from xbmc import Player, sleep, getCondVisibility from xbmc import Player, sleep
from PlexAPI import API from PlexAPI import API
from PlexFunctions import GetPlexMetadata, init_plex_playqueue from PlexFunctions import GetPlexMetadata, init_plex_playqueue
@ -47,10 +47,8 @@ def playback_triage(plex_id=None, plex_type=None, path=None, resolve=True):
the first pass - e.g. if you're calling this function from the original the first pass - e.g. if you're calling this function from the original
service.py Python instance service.py Python instance
""" """
# Widget playback? Pain in the butt... LOG.info('playback_triage called with plex_id %s, plex_type %s, path %s',
widget = getCondVisibility('Window.IsActive(home)') plex_id, plex_type, path)
LOG.info('playback_triage called with plex_id %s, plex_type %s, path %s,'
' widget playback: %s', plex_id, plex_type, path, widget)
if not state.AUTHENTICATED: if not state.AUTHENTICATED:
LOG.error('Not yet authenticated for PMS, abort starting playback') LOG.error('Not yet authenticated for PMS, abort starting playback')
if resolve is True: if resolve is True:
@ -70,18 +68,18 @@ def playback_triage(plex_id=None, plex_type=None, path=None, resolve=True):
playqueue.items[pos] playqueue.items[pos]
except IndexError: except IndexError:
# Release our default.py before starting our own Kodi player instance # Release our default.py before starting our own Kodi player instance
if resolve is True and not widget: if resolve is True:
state.PKC_CAUSED_STOP = True state.PKC_CAUSED_STOP = True
result = Playback_Successful() result = Playback_Successful()
result.listitem = PKC_ListItem(path='PKC_Dummy_Path_Which_Fails') result.listitem = PKC_ListItem(path='PKC_Dummy_Path_Which_Fails')
pickle_me(result) pickle_me(result)
playback_init(plex_id, plex_type, playqueue, widget) playback_init(plex_id, plex_type, playqueue)
else: else:
# kick off playback on second pass # kick off playback on second pass
conclude_playback(playqueue, pos) conclude_playback(playqueue, pos)
def playback_init(plex_id, plex_type, playqueue, widget): def playback_init(plex_id, plex_type, playqueue):
""" """
Playback setup if Kodi starts playing an item for the first time. Playback setup if Kodi starts playing an item for the first time.
""" """
@ -121,47 +119,24 @@ def playback_init(plex_id, plex_type, playqueue, widget):
# Should already be empty, but just in case # Should already be empty, but just in case
PL.get_playlist_details_from_xml(playqueue, xml) PL.get_playlist_details_from_xml(playqueue, xml)
stack = _prep_playlist_stack(xml) stack = _prep_playlist_stack(xml)
if widget: # Sleep a bit to let setResolvedUrl do its thing - bit ugly
# Need to use setResolvedUrl when using widgets :-( sleep(200)
# Grab the very first item of our stack _process_stack(playqueue, stack)
stack_item = stack.pop(0)
# Get the PKC playlist element
item = PL.playlist_item_from_xml(playqueue,
stack_item['xml_video_element'],
stack_item['kodi_id'],
stack_item['kodi_type'])
item.playcount = stack_item['playcount']
item.offset = stack_item['offset']
item.part = stack_item['part']
item.id = stack_item['id']
item.force_transcode = state.FORCE_TRANSCODE
# Only add our very first item to our playqueue
playqueue.items.append(item)
# Conclude the playback with setResolvedUrl
LOG.debug('Start concluding playback for 1st widget element')
conclude_playback(playqueue, 0)
LOG.debug('Add remaining items to playqueues for widget playback')
_process_stack(playqueue, stack)
else:
# Sleep a bit to let setResolvedUrl do its thing - bit ugly
sleep(200)
_process_stack(playqueue, stack)
# New thread to release this one sooner (e.g. harddisk spinning up)
thread = Thread(target=Player().play,
args=(playqueue.kodi_pl, ))
thread.setDaemon(True)
LOG.info('Done initializing PKC playback, starting Kodi player')
# By design, PKC will start Kodi playback using Player().play(). Kodi
# caches paths like our plugin://pkc. If we use Player().play() between
# 2 consecutive startups of exactly the same Kodi library item, Kodi's
# cache will have been flushed for some reason. Hence the 2nd call for
# plugin://pkc will be lost; Kodi will try to startup playback for an
# empty path: log entry is "CGUIWindowVideoBase::OnPlayMedia <missing
# path>"
thread.start()
# Reset some playback variables # Reset some playback variables
state.CONTEXT_MENU_PLAY = False state.CONTEXT_MENU_PLAY = False
state.FORCE_TRANSCODE = False state.FORCE_TRANSCODE = False
# New thread to release this one sooner (e.g. harddisk spinning up)
thread = Thread(target=Player().play,
args=(playqueue.kodi_pl, ))
thread.setDaemon(True)
LOG.info('Done initializing PKC playback, starting Kodi player')
# By design, PKC will start Kodi playback using Player().play(). Kodi
# caches paths like our plugin://pkc. If we use Player().play() between
# 2 consecutive startups of exactly the same Kodi library item, Kodi's
# cache will have been flushed for some reason. Hence the 2nd call for
# plugin://pkc will be lost; Kodi will try to startup playback for an empty
# path: log entry is "CGUIWindowVideoBase::OnPlayMedia <missing path>"
thread.start()
def _prep_playlist_stack(xml): def _prep_playlist_stack(xml):