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

Fix PKC changing subtitles on playback start unnecessarily

Browse source
This commit is contained in:
croneter 2021-12-22 13:38:50 +01:00
parent f3ef6bdfe6
commit d8c96fa699
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
resources/lib/playlist_func.py
View file

@ -357,6 +357,7 @@ class PlaylistItem(object):
PF.change_video_stream(plex_stream_index, self.api.part_id()) PF.change_video_stream(plex_stream_index, self.api.part_id())
def _set_kodi_stream_if_different(self, kodi_index, typus): def _set_kodi_stream_if_different(self, kodi_index, typus):
"""Will always activate subtitles."""
if typus == 'video': if typus == 'video':
current = js.get_current_video_stream_index(self.playerid) current = js.get_current_video_stream_index(self.playerid)
if current != kodi_index: if current != kodi_index:
@ -371,16 +372,32 @@ class PlaylistItem(object):
app.APP.player.setAudioStream(kodi_index) app.APP.player.setAudioStream(kodi_index)
else: else:
LOG.debug('Not switching audio stream (no change)') LOG.debug('Not switching audio stream (no change)')
elif typus == 'subtitle':
current = js.get_current_subtitle_stream_index(self.playerid)
enabled = js.get_subtitle_enabled(self.playerid)
if current != kodi_index:
LOG.debug('Switching subtitle stream')
app.APP.player.setAudioStream(kodi_index)
else:
LOG.debug('Not switching subtitle stream (no change)')
if not enabled:
LOG.debug('Enabling subtitles')
app.APP.player.showSubtitles(True)
else:
raise RuntimeError('Unknown stream type %s' % typus)
def switch_to_plex_stream(self, typus): def switch_to_plex_stream(self, typus):
try: try:
plex_index, language_tag = self.active_plex_stream_index(typus) plex_index, language_tag = self.active_plex_stream_index(typus)
except TypeError: except TypeError:
# Only happens if Plex did not provide us with a suitable sub
# Meaning Plex tells us to deactivate subs
LOG.debug('Deactivating Kodi subtitles because the PMS ' LOG.debug('Deactivating Kodi subtitles because the PMS '
'told us to not show any subtitles') 'told us to not show any subtitles')
app.APP.player.showSubtitles(False) app.APP.player.showSubtitles(False)
self._current_kodi_sub_stream_enabled = False self._current_kodi_sub_stream_enabled = False
return return
# Rest: video, audio and activated subs
LOG.debug('The PMS wants to display %s stream with Plex id %s and ' LOG.debug('The PMS wants to display %s stream with Plex id %s and '
'languageTag %s', typus, plex_index, language_tag) 'languageTag %s', typus, plex_index, language_tag)
try: try:
@ -396,13 +413,7 @@ class PlaylistItem(object):
typus, kodi_index, plex_index) typus, kodi_index, plex_index)
# If we're choosing an "illegal" index, this function does # If we're choosing an "illegal" index, this function does
# need seem to fail nor log any errors # need seem to fail nor log any errors
if typus == 'audio': self._set_kodi_stream_if_different(kodi_index, typus)
self._set_kodi_stream_if_different(kodi_index, 'audio')
elif typus == 'subtitle':
app.APP.player.setSubtitleStream(kodi_index)
app.APP.player.showSubtitles(True)
elif typus == 'video':
self._set_kodi_stream_if_different(kodi_index, 'video')
if typus == 'audio': if typus == 'audio':
self._current_kodi_audio_stream = kodi_index self._current_kodi_audio_stream = kodi_index
elif typus == 'subtitle': elif typus == 'subtitle':