mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 03:26:07 +02:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
7d4356b12a
3 changed files with 12 additions and 3 deletions
|
@ -160,7 +160,7 @@ namespace MediaBrowser.Api.Playback.Hls
|
|||
|
||||
if (!string.IsNullOrEmpty(state.VideoRequest.Level))
|
||||
{
|
||||
args += " -level 3" + state.VideoRequest.Level;
|
||||
args += " -level " + state.VideoRequest.Level;
|
||||
}
|
||||
|
||||
if (state.SubtitleStream != null)
|
||||
|
|
|
@ -153,7 +153,7 @@ namespace MediaBrowser.Api.Playback.Progressive
|
|||
|
||||
if (!string.IsNullOrEmpty(state.VideoRequest.Level))
|
||||
{
|
||||
args += " -level 3" + state.VideoRequest.Level;
|
||||
args += " -level " + state.VideoRequest.Level;
|
||||
}
|
||||
|
||||
if (state.SubtitleStream != null)
|
||||
|
|
|
@ -774,7 +774,16 @@ namespace MediaBrowser.Controller.Entities
|
|||
progress.Report((90 * percent) + 10);
|
||||
});
|
||||
|
||||
await ((Folder)child).ValidateChildren(innerProgress, cancellationToken, recursive: recursive).ConfigureAwait(false);
|
||||
await ((Folder) child).ValidateChildren(innerProgress, cancellationToken, recursive).ConfigureAwait(false);
|
||||
}
|
||||
else
|
||||
{
|
||||
percentages.TryUpdate(child.Id, 1, percentages[child.Id]);
|
||||
|
||||
var percent = percentages.Values.Sum();
|
||||
percent /= list.Count;
|
||||
|
||||
progress.Report((90 * percent) + 10);
|
||||
}
|
||||
}));
|
||||
|
||||
|
|
Loading…
Reference in a new issue