mirror of
https://github.com/jellyfin/jellyfin-kodi.git
synced 2024-11-10 04:06:11 +00:00
Merge pull request #508 from venomousZealot/master
Use jellyfin's DisplayTitle for audio and subtitle streams
This commit is contained in:
commit
f64b250d91
1 changed files with 2 additions and 36 deletions
|
@ -557,23 +557,6 @@ class PlayUtils(object):
|
||||||
|
|
||||||
return path
|
return path
|
||||||
|
|
||||||
def get_commercial_codec_name(self, codec, profile):
|
|
||||||
NAMES = {
|
|
||||||
'ac3': 'Dolby Digital',
|
|
||||||
'eac3': 'Dolby Digital+',
|
|
||||||
'truehd': 'Dolby TrueHD',
|
|
||||||
'dts': 'DTS'
|
|
||||||
}
|
|
||||||
|
|
||||||
if profile == 'DTS-HD MA':
|
|
||||||
return 'DTS-HD Master Audio'
|
|
||||||
if profile == 'DTS-HD HRA':
|
|
||||||
return 'DTS-HD High Resolution Audio'
|
|
||||||
if codec in NAMES:
|
|
||||||
return NAMES[codec]
|
|
||||||
|
|
||||||
return codec.upper()
|
|
||||||
|
|
||||||
def get_audio_subs(self, source, audio=None, subtitle=None):
|
def get_audio_subs(self, source, audio=None, subtitle=None):
|
||||||
|
|
||||||
''' For transcoding only
|
''' For transcoding only
|
||||||
|
@ -597,14 +580,7 @@ class PlayUtils(object):
|
||||||
|
|
||||||
if stream_type == 'Audio':
|
if stream_type == 'Audio':
|
||||||
|
|
||||||
profile = stream['Profile'] if 'Profile' in stream else None
|
track = stream['DisplayTitle']
|
||||||
codec = self.get_commercial_codec_name(stream['Codec'], profile)
|
|
||||||
channel = stream.get('ChannelLayout', "").capitalize()
|
|
||||||
|
|
||||||
if 'Language' in stream:
|
|
||||||
track = "%s - %s %s" % (stream['Language'].capitalize(), codec, channel)
|
|
||||||
else:
|
|
||||||
track = "%s %s" % (codec, channel)
|
|
||||||
|
|
||||||
audio_streams[track] = index
|
audio_streams[track] = index
|
||||||
|
|
||||||
|
@ -617,17 +593,7 @@ class PlayUtils(object):
|
||||||
if not avail_for_extraction and not allow_burned_subs:
|
if not avail_for_extraction and not allow_burned_subs:
|
||||||
continue
|
continue
|
||||||
|
|
||||||
codec = self.get_commercial_codec_name(stream['Codec'], None)
|
track = stream['DisplayTitle']
|
||||||
|
|
||||||
if 'Language' in stream:
|
|
||||||
track = "%s - %s" % (stream['Language'].capitalize(), codec)
|
|
||||||
else:
|
|
||||||
track = "%s" % codec
|
|
||||||
|
|
||||||
if stream['IsDefault']:
|
|
||||||
track = "%s - Default" % track
|
|
||||||
if stream['IsForced']:
|
|
||||||
track = "%s - Forced" % track
|
|
||||||
|
|
||||||
subs_streams[track] = index
|
subs_streams[track] = index
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue