diff options
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs | 4 | ||||
| -rw-r--r-- | Emby.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Api/Images/ImageService.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Sync/ISyncManager.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Sync/ISyncProvider.cs | 4 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Common.nuspec | 2 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Server.Core.nuspec | 4 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
8 files changed, 17 insertions, 18 deletions
diff --git a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs index af4c7f3e7..113cb33f4 100644 --- a/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs +++ b/Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs @@ -151,7 +151,9 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts Id = channel.Path.GetMD5().ToString("N"), IsInfiniteStream = true, - IsRemote = true + IsRemote = true, + + IgnoreDts = true }; mediaSource.InferTotalBitrate(); diff --git a/Emby.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs index 52bd0a504..0c9eb0f1b 100644 --- a/Emby.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/SystemUpdateTask.cs @@ -71,8 +71,6 @@ namespace Emby.Server.Implementations.ScheduledTasks // Create a progress object for the update check var updateInfo = await _appHost.CheckForApplicationUpdate(cancellationToken, new SimpleProgress<double>()).ConfigureAwait(false); - progress.Report(10); - if (!updateInfo.IsUpdateAvailable) { Logger.Debug("No application update available."); @@ -87,15 +85,7 @@ namespace Emby.Server.Implementations.ScheduledTasks { Logger.Info("Update Revision {0} available. Updating...", updateInfo.AvailableVersion); - EventHandler<double> innerProgressHandler = (sender, e) => progress.Report(e * .9 + .1); - - var innerProgress = new SimpleProgress<double>(); - innerProgress.ProgressChanged += innerProgressHandler; - - await _appHost.UpdateApplication(updateInfo.Package, cancellationToken, innerProgress).ConfigureAwait(false); - - // Release the event handler - innerProgress.ProgressChanged -= innerProgressHandler; + await _appHost.UpdateApplication(updateInfo.Package, cancellationToken, progress).ConfigureAwait(false); } else { diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs index 221755916..f6c97e091 100644 --- a/MediaBrowser.Api/Images/ImageService.cs +++ b/MediaBrowser.Api/Images/ImageService.cs @@ -17,6 +17,7 @@ using System.Threading.Tasks; using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.IO; +using MediaBrowser.Controller.LiveTv; using MediaBrowser.Model.IO; using MediaBrowser.Model.Services; @@ -567,7 +568,9 @@ namespace MediaBrowser.Api.Images }).ToList() : new List<IImageEnhancer>(); - var cropwhitespace = request.Type == ImageType.Logo || request.Type == ImageType.Art; + var cropwhitespace = request.Type == ImageType.Logo || + request.Type == ImageType.Art + || (request.Type == ImageType.Primary && item is LiveTvChannel); if (request.CropWhitespace.HasValue) { diff --git a/MediaBrowser.Controller/Sync/ISyncManager.cs b/MediaBrowser.Controller/Sync/ISyncManager.cs index fbcb549ad..291632ea5 100644 --- a/MediaBrowser.Controller/Sync/ISyncManager.cs +++ b/MediaBrowser.Controller/Sync/ISyncManager.cs @@ -90,6 +90,8 @@ namespace MediaBrowser.Controller.Sync /// </summary> IEnumerable<SyncTarget> GetSyncTargets(string userId); + IEnumerable<SyncTarget> GetSyncTargets(string userId, bool? supportsRemoteSync); + /// <summary> /// Supportses the synchronize. /// </summary> diff --git a/MediaBrowser.Controller/Sync/ISyncProvider.cs b/MediaBrowser.Controller/Sync/ISyncProvider.cs index ef34bfe69..aa4b36427 100644 --- a/MediaBrowser.Controller/Sync/ISyncProvider.cs +++ b/MediaBrowser.Controller/Sync/ISyncProvider.cs @@ -11,6 +11,8 @@ namespace MediaBrowser.Controller.Sync /// <value>The name.</value> string Name { get; } + bool SupportsRemoteSync { get; } + /// <summary> /// Gets the synchronize targets. /// </summary> @@ -27,6 +29,6 @@ namespace MediaBrowser.Controller.Sync public interface IHasUniqueTargetIds { - + } } diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index cb4d372a5..660961a34 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>MediaBrowser.Common</id> - <version>3.0.705</version> + <version>3.0.707</version> <title>Emby.Common</title> <authors>Emby Team</authors> <owners>ebr,Luke,scottisafool</owners> diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index 76846b98c..9b80ba0ab 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <metadata> <id>MediaBrowser.Server.Core</id> - <version>3.0.705</version> + <version>3.0.707</version> <title>Emby.Server.Core</title> <authors>Emby Team</authors> <owners>ebr,Luke,scottisafool</owners> @@ -12,7 +12,7 @@ <description>Contains core components required to build plugins for Emby Server.</description> <copyright>Copyright © Emby 2013</copyright> <dependencies> - <dependency id="MediaBrowser.Common" version="3.0.705" /> + <dependency id="MediaBrowser.Common" version="3.0.707" /> </dependencies> </metadata> <files> diff --git a/SharedVersion.cs b/SharedVersion.cs index a12afc2e9..a64c002ce 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.25.4")] +[assembly: AssemblyVersion("3.2.25.5")] |