aboutsummaryrefslogtreecommitdiff
path: root/Emby.Server.Implementations/ServerManager/ServerManager.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-11-08 14:55:32 -0500
committerGitHub <noreply@github.com>2016-11-08 14:55:32 -0500
commit82c46a84e4ce7419a92e6c5674de92d69b6ae11a (patch)
treec7263a8e6aaf43680a2de2d3ae00be15be6cd1ad /Emby.Server.Implementations/ServerManager/ServerManager.cs
parenta86e9fa73dd159db89efd2ae3e206f45a53c784c (diff)
parente8c70da2b6044243d8352af8358dd701afe570e5 (diff)
Merge pull request #2277 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Server.Implementations/ServerManager/ServerManager.cs')
-rw-r--r--Emby.Server.Implementations/ServerManager/ServerManager.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/Emby.Server.Implementations/ServerManager/ServerManager.cs b/Emby.Server.Implementations/ServerManager/ServerManager.cs
index 83ce0b6a3..f660d01ec 100644
--- a/Emby.Server.Implementations/ServerManager/ServerManager.cs
+++ b/Emby.Server.Implementations/ServerManager/ServerManager.cs
@@ -15,7 +15,7 @@ using System.Threading.Tasks;
using MediaBrowser.Common.IO;
using MediaBrowser.Model.IO;
using MediaBrowser.Model.Services;
-using MediaBrowser.Model.TextEncoding;
+using MediaBrowser.Model.Text;
namespace Emby.Server.Implementations.ServerManager
{
@@ -75,8 +75,8 @@ namespace Emby.Server.Implementations.ServerManager
private readonly List<IWebSocketListener> _webSocketListeners = new List<IWebSocketListener>();
private bool _disposed;
- private readonly IMemoryStreamProvider _memoryStreamProvider;
- private readonly IEncoding _textEncoding;
+ private readonly IMemoryStreamFactory _memoryStreamProvider;
+ private readonly ITextEncoding _textEncoding;
/// <summary>
/// Initializes a new instance of the <see cref="ServerManager" /> class.
@@ -86,7 +86,7 @@ namespace Emby.Server.Implementations.ServerManager
/// <param name="logger">The logger.</param>
/// <param name="configurationManager">The configuration manager.</param>
/// <exception cref="System.ArgumentNullException">applicationHost</exception>
- public ServerManager(IServerApplicationHost applicationHost, IJsonSerializer jsonSerializer, ILogger logger, IServerConfigurationManager configurationManager, IMemoryStreamProvider memoryStreamProvider, IEncoding textEncoding)
+ public ServerManager(IServerApplicationHost applicationHost, IJsonSerializer jsonSerializer, ILogger logger, IServerConfigurationManager configurationManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding)
{
if (applicationHost == null)
{