michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse Source
This commit is contained in:
Techywarrior 2013-03-28 22:52:21 -07:00
commit 7d4356b12a
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
View File

@ -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)

2
MediaBrowser.Api/Playback/Progressive/VideoService.cs
View File

@ -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)

11
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -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);
}
}));