From 0ef2b46106937c8acbab8e2a6a1e08affb823d31 Mon Sep 17 00:00:00 2001
From: Claus Vium <clausvium@gmail.com>
Date: Tue, 5 Feb 2019 09:49:46 +0100
Subject: Remove custom Threading

---
 .../Net/BasePeriodicWebSocketListener.cs              | 19 ++++++++-----------
 MediaBrowser.Controller/Session/SessionInfo.cs        |  8 ++++----
 2 files changed, 12 insertions(+), 15 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
index 4e7e1c8ed..4242a00e2 100644
--- a/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
@@ -6,7 +6,6 @@ using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Threading;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Controller.Net
@@ -23,8 +22,8 @@ namespace MediaBrowser.Controller.Net
         /// <summary>
         /// The _active connections
         /// </summary>
-        protected readonly List<Tuple<IWebSocketConnection, CancellationTokenSource, ITimer, TStateType>> ActiveConnections =
-            new List<Tuple<IWebSocketConnection, CancellationTokenSource, ITimer, TStateType>>();
+        protected readonly List<Tuple<IWebSocketConnection, CancellationTokenSource, Timer, TStateType>> ActiveConnections =
+            new List<Tuple<IWebSocketConnection, CancellationTokenSource, Timer, TStateType>>();
 
         /// <summary>
         /// Gets the name.
@@ -44,8 +43,6 @@ namespace MediaBrowser.Controller.Net
         /// </summary>
         protected ILogger Logger;
 
-        protected ITimerFactory TimerFactory { get; private set; }
-
         protected BasePeriodicWebSocketListener(ILogger logger)
         {
             if (logger == null)
@@ -111,7 +108,7 @@ namespace MediaBrowser.Controller.Net
             Logger.LogDebug("{1} Begin transmitting over websocket to {0}", message.Connection.RemoteEndPoint, GetType().Name);
 
             var timer = SendOnTimer ?
-                TimerFactory.Create(TimerCallback, message.Connection, Timeout.Infinite, Timeout.Infinite) :
+                new Timer(TimerCallback, message.Connection, Timeout.Infinite, Timeout.Infinite) :
                 null;
 
             var state = new TStateType
@@ -122,7 +119,7 @@ namespace MediaBrowser.Controller.Net
 
             lock (ActiveConnections)
             {
-                ActiveConnections.Add(new Tuple<IWebSocketConnection, CancellationTokenSource, ITimer, TStateType>(message.Connection, cancellationTokenSource, timer, state));
+                ActiveConnections.Add(new Tuple<IWebSocketConnection, CancellationTokenSource, Timer, TStateType>(message.Connection, cancellationTokenSource, timer, state));
             }
 
             if (timer != null)
@@ -139,7 +136,7 @@ namespace MediaBrowser.Controller.Net
         {
             var connection = (IWebSocketConnection)state;
 
-            Tuple<IWebSocketConnection, CancellationTokenSource, ITimer, TStateType> tuple;
+            Tuple<IWebSocketConnection, CancellationTokenSource, Timer, TStateType> tuple;
 
             lock (ActiveConnections)
             {
@@ -162,7 +159,7 @@ namespace MediaBrowser.Controller.Net
 
         protected void SendData(bool force)
         {
-            Tuple<IWebSocketConnection, CancellationTokenSource, ITimer, TStateType>[] tuples;
+            Tuple<IWebSocketConnection, CancellationTokenSource, Timer, TStateType>[] tuples;
 
             lock (ActiveConnections)
             {
@@ -190,7 +187,7 @@ namespace MediaBrowser.Controller.Net
             }
         }
 
-        private async void SendData(Tuple<IWebSocketConnection, CancellationTokenSource, ITimer, TStateType> tuple)
+        private async void SendData(Tuple<IWebSocketConnection, CancellationTokenSource, Timer, TStateType> tuple)
         {
             var connection = tuple.Item1;
 
@@ -249,7 +246,7 @@ namespace MediaBrowser.Controller.Net
         /// Disposes the connection.
         /// </summary>
         /// <param name="connection">The connection.</param>
-        private void DisposeConnection(Tuple<IWebSocketConnection, CancellationTokenSource, ITimer, TStateType> connection)
+        private void DisposeConnection(Tuple<IWebSocketConnection, CancellationTokenSource, Timer, TStateType> connection)
         {
             Logger.LogDebug("{1} stop transmitting over websocket to {0}", connection.Item1.RemoteEndPoint, GetType().Name);
 
diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs
index d698795dd..f0e81e8e7 100644
--- a/MediaBrowser.Controller/Session/SessionInfo.cs
+++ b/MediaBrowser.Controller/Session/SessionInfo.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Linq;
+using System.Threading;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.Session;
-using MediaBrowser.Model.Threading;
 using Microsoft.Extensions.Logging;
 
 namespace MediaBrowser.Controller.Session
@@ -268,10 +268,10 @@ namespace MediaBrowser.Controller.Session
         }
 
         private readonly object _progressLock = new object();
-        private ITimer _progressTimer;
+        private Timer _progressTimer;
         private PlaybackProgressInfo _lastProgressInfo;
 
-        public void StartAutomaticProgress(ITimerFactory timerFactory, PlaybackProgressInfo progressInfo)
+        public void StartAutomaticProgress(PlaybackProgressInfo progressInfo)
         {
             if (_disposed)
             {
@@ -284,7 +284,7 @@ namespace MediaBrowser.Controller.Session
 
                 if (_progressTimer == null)
                 {
-                    _progressTimer = timerFactory.Create(OnProgressTimerCallback, null, 1000, 1000);
+                    _progressTimer = new Timer(OnProgressTimerCallback, null, 1000, 1000);
                 }
                 else
                 {
-- 
cgit v1.2.3