aboutsummaryrefslogtreecommitdiff
path: root/Jellyfin.Server
diff options
context:
space:
mode:
authorcvium <clausvium@gmail.com>2019-01-16 20:50:40 +0100
committerClaus Vium <clausvium@gmail.com>2019-01-20 06:30:50 +0100
commitb35dcbb9f02c27d2d84ee3281a60d654a3fb1259 (patch)
tree12049e17ac9e6cdbe2e7fec5ec7a886cff8a8c6d /Jellyfin.Server
parent3a5e3ade01ab4b4fccca03ba2da969f03d5564f1 (diff)
Remove MediaBrowser.Text since it violates licenses and is overall hacky
Diffstat (limited to 'Jellyfin.Server')
-rw-r--r--Jellyfin.Server/CoreAppHost.cs1
-rw-r--r--Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs11
2 files changed, 5 insertions, 7 deletions
diff --git a/Jellyfin.Server/CoreAppHost.cs b/Jellyfin.Server/CoreAppHost.cs
index b18562a69..6832fe743 100644
--- a/Jellyfin.Server/CoreAppHost.cs
+++ b/Jellyfin.Server/CoreAppHost.cs
@@ -32,7 +32,6 @@ namespace Jellyfin.Server
Logger,
Certificate,
StreamHelper,
- TextEncoding,
NetworkManager,
SocketFactory,
CryptographyProvider,
diff --git a/Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs b/Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs
index 89337b6b7..ef75644d7 100644
--- a/Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs
+++ b/Jellyfin.Server/SocketSharp/WebSocketSharpListener.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
using System.Collections.Generic;
using System.Security.Cryptography.X509Certificates;
using System.Threading;
@@ -12,7 +12,6 @@ using MediaBrowser.Model.IO;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Services;
using MediaBrowser.Model.System;
-using MediaBrowser.Model.Text;
using Microsoft.Extensions.Logging;
using SocketHttpListener.Net;
@@ -25,7 +24,6 @@ namespace Jellyfin.SocketSharp
private readonly ILogger _logger;
private readonly X509Certificate _certificate;
private readonly IStreamHelper _streamHelper;
- private readonly ITextEncoding _textEncoding;
private readonly INetworkManager _networkManager;
private readonly ISocketFactory _socketFactory;
private readonly ICryptoProvider _cryptoProvider;
@@ -36,12 +34,13 @@ namespace Jellyfin.SocketSharp
private CancellationTokenSource _disposeCancellationTokenSource = new CancellationTokenSource();
private CancellationToken _disposeCancellationToken;
- public WebSocketSharpListener(ILogger logger, X509Certificate certificate, IStreamHelper streamHelper, ITextEncoding textEncoding, INetworkManager networkManager, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, bool enableDualMode, IFileSystem fileSystem, IEnvironmentInfo environment)
+ public WebSocketSharpListener(ILogger logger, X509Certificate certificate, IStreamHelper streamHelper,
+ INetworkManager networkManager, ISocketFactory socketFactory, ICryptoProvider cryptoProvider,
+ bool enableDualMode, IFileSystem fileSystem, IEnvironmentInfo environment)
{
_logger = logger;
_certificate = certificate;
_streamHelper = streamHelper;
- _textEncoding = textEncoding;
_networkManager = networkManager;
_socketFactory = socketFactory;
_cryptoProvider = cryptoProvider;
@@ -62,7 +61,7 @@ namespace Jellyfin.SocketSharp
public void Start(IEnumerable<string> urlPrefixes)
{
if (_listener == null)
- _listener = new HttpListener(_logger, _cryptoProvider, _socketFactory, _networkManager, _textEncoding, _streamHelper, _fileSystem, _environment);
+ _listener = new HttpListener(_logger, _cryptoProvider, _socketFactory, _networkManager, _streamHelper, _fileSystem, _environment);
_listener.EnableDualMode = _enableDualMode;