Merge pull request #1515 from croneter/py3-fix-versions

Fix auto-picking of video stream if several video versions are available
This commit is contained in:
croneter 2021-06-05 15:44:20 +02:00 committed by GitHub
commit defa43d596
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 1 deletions

View file

@ -665,6 +665,11 @@ msgctxt "#30545"
msgid "Force transcode pictures" msgid "Force transcode pictures"
msgstr "" msgstr ""
# PKC Settings - Playback
msgctxt "#30546"
msgid "Pick the first video if several versions are present"
msgstr ""
# Welcome to Plex notification # Welcome to Plex notification
msgctxt "#33000" msgctxt "#33000"
msgid "Welcome" msgid "Welcome"

View file

@ -205,7 +205,7 @@ class Media(object):
count += 1 count += 1
if (count > 1 and ( if (count > 1 and (
(self.plex_type != v.PLEX_TYPE_CLIP and (self.plex_type != v.PLEX_TYPE_CLIP and
utils.settings('bestQuality') == 'false') utils.settings('firstVideoStream') == 'false')
or or
(self.plex_type == v.PLEX_TYPE_CLIP and (self.plex_type == v.PLEX_TYPE_CLIP and
utils.settings('bestTrailer') == 'false'))): utils.settings('bestTrailer') == 'false'))):

View file

@ -114,6 +114,7 @@
<setting id="askCinema" type="bool" label="30519" default="false" visible="eq(-1,true)" subsetting="true" /> <setting id="askCinema" type="bool" label="30519" default="false" visible="eq(-1,true)" subsetting="true" />
<setting id="trailerNumber" type="slider" label="39000" default="3" visible="eq(-2,true)" range="1,1,15" option="int" /> <setting id="trailerNumber" type="slider" label="39000" default="3" visible="eq(-2,true)" range="1,1,15" option="int" />
<setting id="enableSkipIntro" type="bool" label="30525" default="true" /><!-- Enable skipping of intros --> <setting id="enableSkipIntro" type="bool" label="30525" default="true" /><!-- Enable skipping of intros -->
<setting id="firstVideoStream" type="bool" label="30546" default="false" /><!-- Pick the first video if several versions are present -->
<setting id="ignoreSpecialsNextEpisodes" type="bool" label="30527" default="false" /> <setting id="ignoreSpecialsNextEpisodes" type="bool" label="30527" default="false" />
<setting id="resumeJumpBack" type="slider" label="30521" default="10" range="0,1,120" option="int" visible="false"/> <setting id="resumeJumpBack" type="slider" label="30521" default="10" range="0,1,120" option="int" visible="false"/>
<setting type="sep" /> <setting type="sep" />