Merge remote-tracking branch 'remotes/jellyfin/api-migration' into api-audio

# Conflicts:
#	Emby.Server.Implementations/ApplicationHost.cs
#	Jellyfin.Api/Helpers/TranscodingJobHelper.cs

1 files changed, 8 insertions, 0 deletions

diff --git a/MediaBrowser.Api/TranscodingJob.cs b/MediaBrowser.Api/TranscodingJob.cs
index 8c24e3ce1..bfc311a27 100644
--- a/MediaBrowser.Api/TranscodingJob.cs
+++ b/MediaBrowser.Api/TranscodingJob.cs
@@ -32,6 +32,7 @@ namespace MediaBrowser.Api
         /// </summary>
         /// <value>The path.</value>
         public MediaSourceInfo MediaSource { get; set; }
+
         public string Path { get; set; }
         /// <summary>
         /// Gets or sets the type.
@@ -43,6 +44,7 @@ namespace MediaBrowser.Api
         /// </summary>
         /// <value>The process.</value>
         public Process Process { get; set; }
+
         public ILogger Logger { get; private set; }
         /// <summary>
         /// Gets or sets the active request count.
@@ -62,18 +64,23 @@ namespace MediaBrowser.Api
         public object ProcessLock = new object();
 
         public bool HasExited { get; set; }
+
         public bool IsUserPaused { get; set; }
 
         public string Id { get; set; }
 
         public float? Framerate { get; set; }
+
         public double? CompletionPercentage { get; set; }
 
         public long? BytesDownloaded { get; set; }
+
         public long? BytesTranscoded { get; set; }
+
         public int? BitRate { get; set; }
 
         public long? TranscodingPositionTicks { get; set; }
+
         public long? DownloadPositionTicks { get; set; }
 
         public TranscodingThrottler TranscodingThrottler { get; set; }
@@ -81,6 +88,7 @@ namespace MediaBrowser.Api
         private readonly object _timerLock = new object();
 
         public DateTime LastPingDate { get; set; }
+
         public int PingTimeout { get; set; }
 
         public TranscodingJob(ILogger logger)