diff options
| -rw-r--r-- | Emby.Drawing/ImageProcessor.cs | 2 | ||||
| -rw-r--r-- | Emby.Server.Implementations/ApplicationHost.cs | 26 | ||||
| -rw-r--r-- | Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs | 5 | ||||
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 4 | ||||
| -rw-r--r-- | SharedVersion.cs | 2 |
6 files changed, 30 insertions, 11 deletions
diff --git a/Emby.Drawing/ImageProcessor.cs b/Emby.Drawing/ImageProcessor.cs index 0363aa8df..f5a05db05 100644 --- a/Emby.Drawing/ImageProcessor.cs +++ b/Emby.Drawing/ImageProcessor.cs @@ -810,7 +810,7 @@ namespace Emby.Drawing } catch (Exception ex) { - _logger.Error("Error enhancing image", ex); + _logger.ErrorException("Error enhancing image", ex); } return new Tuple<string, DateTime, bool>(originalImagePath, dateModified, inputImageSupportsTransparency); diff --git a/Emby.Server.Implementations/ApplicationHost.cs b/Emby.Server.Implementations/ApplicationHost.cs index f08750b76..59f521eb5 100644 --- a/Emby.Server.Implementations/ApplicationHost.cs +++ b/Emby.Server.Implementations/ApplicationHost.cs @@ -1853,7 +1853,31 @@ namespace Emby.Server.Implementations "mbintros.dll", "embytv.dll", "Messenger.dll", - "MediaBrowser.Plugins.TvMazeProvider.dll" + "MediaBrowser.Plugins.TvMazeProvider.dll", + "MBBookshelf.dll", + "MediaBrowser.Channels.Adult.YouJizz.dll", + "MediaBrowser.Channels.Vine-co.dll", + "MediaBrowser.Plugins.Vimeo.dll", + "MediaBrowser.Channels.Vevo.dll", + "MediaBrowser.Plugins.Twitch.dll", + "MediaBrowser.Channels.SvtPlay.dll", + "MediaBrowser.Plugins.SoundCloud.dll", + "MediaBrowser.Plugins.SnesBox.dll", + "MediaBrowser.Plugins.RottenTomatoes.dll", + "MediaBrowser.Plugins.Revision3.dll", + "MediaBrowser.Plugins.NesBox.dll", + "MBChapters.dll", + "MediaBrowser.Channels.LeagueOfLegends.dll", + "MediaBrowser.Plugins.ADEProvider.dll", + "MediaBrowser.Channels.BallStreams.dll", + "MediaBrowser.Channels.Adult.Beeg.dll", + "ChannelDownloader.dll", + "Hamstercat.Emby.EmbyBands.dll", + "EmbyTV.dll", + "MediaBrowser.Channels.HitboxTV.dll", + "MediaBrowser.Channels.HockeyStreams.dll", + "MediaBrowser.Plugins.ITV.dll", + "MediaBrowser.Plugins.Lastfm.dll" }; return !exclude.Contains(filename ?? string.Empty, StringComparer.OrdinalIgnoreCase); diff --git a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs index e334370df..8fb0d4f3e 100644 --- a/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs +++ b/Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs @@ -185,11 +185,6 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp if (_listener != null) { - foreach (var prefix in _listener.Prefixes.ToList()) - { - _listener.Prefixes.Remove(prefix); - } - _listener.Close(); } diff --git a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs index 62906f5d4..ed8b3074b 100644 --- a/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs +++ b/Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs @@ -143,7 +143,7 @@ namespace Emby.Server.Implementations.LiveTv stream = info.Item1; directStreamProvider = info.Item2; - allowLiveStreamProbe = false; + //allowLiveStreamProbe = false; } else { diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index a10a0bec8..657b9c959 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -1032,11 +1032,11 @@ namespace MediaBrowser.Controller.MediaEncoding { if (sourceBitrate <= 2000000) { - sourceBitrate *= 2; + sourceBitrate = Convert.ToInt32(sourceBitrate * 2.5); } else if (sourceBitrate <= 3000000) { - sourceBitrate = Convert.ToInt32(sourceBitrate * 1.5); + sourceBitrate = Convert.ToInt32(sourceBitrate * 2); } var bitrate = Math.Min(sourceBitrate, requestedBitrate); diff --git a/SharedVersion.cs b/SharedVersion.cs index a6ec5c0d1..016e036f8 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,3 +1,3 @@ using System.Reflection; -[assembly: AssemblyVersion("3.2.30.25")] +[assembly: AssemblyVersion("3.2.30.26")] |