diff options
| author | Techywarrior <techywarrior@gmail.com> | 2013-03-28 22:52:21 -0700 |
|---|---|---|
| committer | Techywarrior <techywarrior@gmail.com> | 2013-03-28 22:52:21 -0700 |
| commit | 7d4356b12a6f428a075747a445cc75a6744f8f5d (patch) | |
| tree | 385294cdbcccc8c0f8b3802e4555f8444a6105ab | |
| parent | 67862d0a41066a7063d8a948d5a7f6e3f67156e5 (diff) | |
| parent | 874244a2effe85901339eddf1bef7e0bee8cf5ca (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/VideoHlsService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Api/Playback/Progressive/VideoService.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Entities/Folder.cs | 11 |
3 files changed, 12 insertions, 3 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs index 0e43794c3..8825db68e 100644 --- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs @@ -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) diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs index e756bc314..a2fec6521 100644 --- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs +++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs @@ -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) diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs index 6b954d110..83f29e58b 100644 --- a/MediaBrowser.Controller/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -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); } })); |