From ca308bc3c9372173887f41e16fd74241f844f39f Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Mon, 21 Mar 2016 23:31:35 -0400
Subject: [PATCH] update progress ping

---
 MediaBrowser.Api/ApiEntryPoint.cs                        | 9 +++++++++
 MediaBrowser.Api/UserLibrary/PlaystateService.cs         | 5 -----
 .../Library/PlaybackProgressEventArgs.cs                 | 3 +++
 .../Session/SessionManager.cs                            | 4 +++-
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/MediaBrowser.Api/ApiEntryPoint.cs b/MediaBrowser.Api/ApiEntryPoint.cs
index 47a339d2be..117ff2305d 100644
--- a/MediaBrowser.Api/ApiEntryPoint.cs
+++ b/MediaBrowser.Api/ApiEntryPoint.cs
@@ -63,6 +63,15 @@ namespace MediaBrowser.Api
             _mediaSourceManager = mediaSourceManager;
 
             Instance = this;
+            _sessionManager.PlaybackProgress += _sessionManager_PlaybackProgress;
+        }
+
+        void _sessionManager_PlaybackProgress(object sender, PlaybackProgressEventArgs e)
+        {
+            if (!string.IsNullOrWhiteSpace(e.PlaySessionId))
+            {
+                PingTranscodingJob(e.PlaySessionId, e.IsPaused);
+            }
         }
 
         /// <summary>
diff --git a/MediaBrowser.Api/UserLibrary/PlaystateService.cs b/MediaBrowser.Api/UserLibrary/PlaystateService.cs
index ddb73c2a68..0a96a5b06c 100644
--- a/MediaBrowser.Api/UserLibrary/PlaystateService.cs
+++ b/MediaBrowser.Api/UserLibrary/PlaystateService.cs
@@ -335,11 +335,6 @@ namespace MediaBrowser.Api.UserLibrary
 
         public void Post(ReportPlaybackProgress request)
         {
-            if (!string.IsNullOrWhiteSpace(request.PlaySessionId))
-            {
-                ApiEntryPoint.Instance.PingTranscodingJob(request.PlaySessionId, request.IsPaused);
-            }
-
             request.SessionId = GetSession().Result.Id;
 
             var task = _sessionManager.OnPlaybackProgress(request);
diff --git a/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs b/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs
index 50528c6aec..bcf39558e1 100644
--- a/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs
+++ b/MediaBrowser.Controller/Library/PlaybackProgressEventArgs.cs
@@ -15,11 +15,14 @@ namespace MediaBrowser.Controller.Library
         public BaseItem Item { get; set; }
         public BaseItemInfo MediaInfo { get; set; }
         public string MediaSourceId { get; set; }
+        public bool IsPaused { get; set; }
 
         public string DeviceId { get; set; }
         public string DeviceName { get; set; }
         public string ClientName { get; set; }
 
+        public string PlaySessionId { get; set; }
+      
         public PlaybackProgressEventArgs()
         {
             Users = new List<User>();
diff --git a/MediaBrowser.Server.Implementations/Session/SessionManager.cs b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
index 824e5e0e8a..98127d39ad 100644
--- a/MediaBrowser.Server.Implementations/Session/SessionManager.cs
+++ b/MediaBrowser.Server.Implementations/Session/SessionManager.cs
@@ -705,7 +705,9 @@ namespace MediaBrowser.Server.Implementations.Session
                 MediaInfo = info.Item,
                 DeviceName = session.DeviceName,
                 ClientName = session.Client,
-                DeviceId = session.DeviceId
+                DeviceId = session.DeviceId,
+                IsPaused = info.IsPaused,
+                PlaySessionId = info.PlaySessionId
 
             }, _logger);