mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-03 20:33:27 +02:00
Merge pull request #11287 from Shadowghost/spelling
Fix some spelling mistakes
This commit is contained in:
commit
46071e4628
|
@ -191,7 +191,7 @@ namespace Emby.Server.Implementations.Library
|
||||||
|
|
||||||
if (user is not null)
|
if (user is not null)
|
||||||
{
|
{
|
||||||
SetDefaultAudioAndSubtitleStreamIndexes(item, source, user);
|
SetDefaultAudioAndSubtitleStreamIndices(item, source, user);
|
||||||
|
|
||||||
if (item.MediaType == MediaType.Audio)
|
if (item.MediaType == MediaType.Audio)
|
||||||
{
|
{
|
||||||
|
@ -296,7 +296,7 @@ namespace Emby.Server.Implementations.Library
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
_logger.LogError(ex, "Error getting media sources");
|
_logger.LogError(ex, "Error getting media sources");
|
||||||
return Enumerable.Empty<MediaSourceInfo>();
|
return [];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -339,7 +339,7 @@ namespace Emby.Server.Implementations.Library
|
||||||
{
|
{
|
||||||
foreach (var source in sources)
|
foreach (var source in sources)
|
||||||
{
|
{
|
||||||
SetDefaultAudioAndSubtitleStreamIndexes(item, source, user);
|
SetDefaultAudioAndSubtitleStreamIndices(item, source, user);
|
||||||
|
|
||||||
if (item.MediaType == MediaType.Audio)
|
if (item.MediaType == MediaType.Audio)
|
||||||
{
|
{
|
||||||
|
@ -360,7 +360,7 @@ namespace Emby.Server.Implementations.Library
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(language))
|
if (string.IsNullOrEmpty(language))
|
||||||
{
|
{
|
||||||
return Array.Empty<string>();
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
var culture = _localizationManager.FindLanguageInfo(language);
|
var culture = _localizationManager.FindLanguageInfo(language);
|
||||||
|
@ -369,14 +369,15 @@ namespace Emby.Server.Implementations.Library
|
||||||
return culture.ThreeLetterISOLanguageNames;
|
return culture.ThreeLetterISOLanguageNames;
|
||||||
}
|
}
|
||||||
|
|
||||||
return new string[] { language };
|
return [language];
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetDefaultSubtitleStreamIndex(MediaSourceInfo source, UserItemData userData, User user, bool allowRememberingSelection)
|
private void SetDefaultSubtitleStreamIndex(MediaSourceInfo source, UserItemData userData, User user, bool allowRememberingSelection)
|
||||||
{
|
{
|
||||||
if (userData.SubtitleStreamIndex.HasValue
|
if (userData.SubtitleStreamIndex.HasValue
|
||||||
&& user.RememberSubtitleSelections
|
&& user.RememberSubtitleSelections
|
||||||
&& user.SubtitleMode != SubtitlePlaybackMode.None && allowRememberingSelection)
|
&& user.SubtitleMode != SubtitlePlaybackMode.None
|
||||||
|
&& allowRememberingSelection)
|
||||||
{
|
{
|
||||||
var index = userData.SubtitleStreamIndex.Value;
|
var index = userData.SubtitleStreamIndex.Value;
|
||||||
// Make sure the saved index is still valid
|
// Make sure the saved index is still valid
|
||||||
|
@ -390,7 +391,7 @@ namespace Emby.Server.Implementations.Library
|
||||||
var preferredSubs = NormalizeLanguage(user.SubtitleLanguagePreference);
|
var preferredSubs = NormalizeLanguage(user.SubtitleLanguagePreference);
|
||||||
|
|
||||||
var defaultAudioIndex = source.DefaultAudioStreamIndex;
|
var defaultAudioIndex = source.DefaultAudioStreamIndex;
|
||||||
var audioLangage = defaultAudioIndex is null
|
var audioLanguage = defaultAudioIndex is null
|
||||||
? null
|
? null
|
||||||
: source.MediaStreams.Where(i => i.Type == MediaStreamType.Audio && i.Index == defaultAudioIndex).Select(i => i.Language).FirstOrDefault();
|
: source.MediaStreams.Where(i => i.Type == MediaStreamType.Audio && i.Index == defaultAudioIndex).Select(i => i.Language).FirstOrDefault();
|
||||||
|
|
||||||
|
@ -398,9 +399,9 @@ namespace Emby.Server.Implementations.Library
|
||||||
source.MediaStreams,
|
source.MediaStreams,
|
||||||
preferredSubs,
|
preferredSubs,
|
||||||
user.SubtitleMode,
|
user.SubtitleMode,
|
||||||
audioLangage);
|
audioLanguage);
|
||||||
|
|
||||||
MediaStreamSelector.SetSubtitleStreamScores(source.MediaStreams, preferredSubs, user.SubtitleMode, audioLangage);
|
MediaStreamSelector.SetSubtitleStreamScores(source.MediaStreams, preferredSubs, user.SubtitleMode, audioLanguage);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetDefaultAudioStreamIndex(MediaSourceInfo source, UserItemData userData, User user, bool allowRememberingSelection)
|
private void SetDefaultAudioStreamIndex(MediaSourceInfo source, UserItemData userData, User user, bool allowRememberingSelection)
|
||||||
|
@ -421,7 +422,7 @@ namespace Emby.Server.Implementations.Library
|
||||||
source.DefaultAudioStreamIndex = MediaStreamSelector.GetDefaultAudioStreamIndex(source.MediaStreams, preferredAudio, user.PlayDefaultAudioTrack);
|
source.DefaultAudioStreamIndex = MediaStreamSelector.GetDefaultAudioStreamIndex(source.MediaStreams, preferredAudio, user.PlayDefaultAudioTrack);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetDefaultAudioAndSubtitleStreamIndexes(BaseItem item, MediaSourceInfo source, User user)
|
public void SetDefaultAudioAndSubtitleStreamIndices(BaseItem item, MediaSourceInfo source, User user)
|
||||||
{
|
{
|
||||||
// Item would only be null if the app didn't supply ItemId as part of the live stream open request
|
// Item would only be null if the app didn't supply ItemId as part of the live stream open request
|
||||||
var mediaType = item?.MediaType ?? MediaType.Video;
|
var mediaType = item?.MediaType ?? MediaType.Video;
|
||||||
|
@ -526,7 +527,7 @@ namespace Emby.Server.Implementations.Library
|
||||||
var item = request.ItemId.IsEmpty()
|
var item = request.ItemId.IsEmpty()
|
||||||
? null
|
? null
|
||||||
: _libraryManager.GetItemById(request.ItemId);
|
: _libraryManager.GetItemById(request.ItemId);
|
||||||
SetDefaultAudioAndSubtitleStreamIndexes(item, clone, user);
|
SetDefaultAudioAndSubtitleStreamIndices(item, clone, user);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new Tuple<LiveStreamResponse, IDirectStreamProvider>(new LiveStreamResponse(clone), liveStream as IDirectStreamProvider);
|
return new Tuple<LiveStreamResponse, IDirectStreamProvider>(new LiveStreamResponse(clone), liveStream as IDirectStreamProvider);
|
||||||
|
|
|
@ -124,16 +124,16 @@ namespace Emby.Server.Implementations.Library
|
||||||
}
|
}
|
||||||
else if (mode == SubtitlePlaybackMode.Always)
|
else if (mode == SubtitlePlaybackMode.Always)
|
||||||
{
|
{
|
||||||
// always load the most suitable full subtitles
|
// Always load the most suitable full subtitles
|
||||||
filteredStreams = sortedStreams.Where(s => !s.IsForced).ToList();
|
filteredStreams = sortedStreams.Where(s => !s.IsForced).ToList();
|
||||||
}
|
}
|
||||||
else if (mode == SubtitlePlaybackMode.OnlyForced)
|
else if (mode == SubtitlePlaybackMode.OnlyForced)
|
||||||
{
|
{
|
||||||
// always load the most suitable full subtitles
|
// Always load the most suitable full subtitles
|
||||||
filteredStreams = sortedStreams.Where(s => s.IsForced).ToList();
|
filteredStreams = sortedStreams.Where(s => s.IsForced).ToList();
|
||||||
}
|
}
|
||||||
|
|
||||||
// load forced subs if we have found no suitable full subtitles
|
// Load forced subs if we have found no suitable full subtitles
|
||||||
var iterStreams = filteredStreams is null || filteredStreams.Count == 0
|
var iterStreams = filteredStreams is null || filteredStreams.Count == 0
|
||||||
? sortedStreams.Where(s => s.IsForced && string.Equals(s.Language, audioTrackLanguage, StringComparison.OrdinalIgnoreCase))
|
? sortedStreams.Where(s => s.IsForced && string.Equals(s.Language, audioTrackLanguage, StringComparison.OrdinalIgnoreCase))
|
||||||
: filteredStreams;
|
: filteredStreams;
|
||||||
|
|
|
@ -138,7 +138,7 @@ namespace MediaBrowser.Controller.Library
|
||||||
|
|
||||||
MediaProtocol GetPathProtocol(string path);
|
MediaProtocol GetPathProtocol(string path);
|
||||||
|
|
||||||
void SetDefaultAudioAndSubtitleStreamIndexes(BaseItem item, MediaSourceInfo source, User user);
|
void SetDefaultAudioAndSubtitleStreamIndices(BaseItem item, MediaSourceInfo source, User user);
|
||||||
|
|
||||||
Task AddMediaInfoWithProbe(MediaSourceInfo mediaSource, bool isAudio, string cacheKey, bool addProbeDelay, bool isLiveStream, CancellationToken cancellationToken);
|
Task AddMediaInfoWithProbe(MediaSourceInfo mediaSource, bool isAudio, string cacheKey, bool addProbeDelay, bool isLiveStream, CancellationToken cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue