Merge branch 'api-migration' into api-syncplay

# Conflicts:
#	MediaBrowser.Api/SyncPlay/SyncPlayService.cs

5 files changed, 20 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Session/ClientCapabilities.cs b/MediaBrowser.Model/Session/ClientCapabilities.cs
index 51db66d21..d3878ca30 100644
--- a/MediaBrowser.Model/Session/ClientCapabilities.cs
+++ b/MediaBrowser.Model/Session/ClientCapabilities.cs
@@ -13,15 +13,19 @@ namespace MediaBrowser.Model.Session
         public string[] SupportedCommands { get; set; }
 
         public bool SupportsMediaControl { get; set; }
+
         public bool SupportsContentUploading { get; set; }
+
         public string MessageCallbackUrl { get; set; }
 
         public bool SupportsPersistentIdentifier { get; set; }
+
         public bool SupportsSync { get; set; }
 
         public DeviceProfile DeviceProfile { get; set; }
 
         public string AppStoreUrl { get; set; }
+
         public string IconUrl { get; set; }
 
         public ClientCapabilities()
diff --git a/MediaBrowser.Model/Session/PlayRequest.cs b/MediaBrowser.Model/Session/PlayRequest.cs
index 62b68b49e..d57bed171 100644
--- a/MediaBrowser.Model/Session/PlayRequest.cs
+++ b/MediaBrowser.Model/Session/PlayRequest.cs
@@ -7,7 +7,7 @@ using MediaBrowser.Model.Services;
 namespace MediaBrowser.Model.Session
 {
     /// <summary>
-    /// Class PlayRequest
+    /// Class PlayRequest.
     /// </summary>
     public class PlayRequest
     {
@@ -19,7 +19,7 @@ namespace MediaBrowser.Model.Session
         public Guid[] ItemIds { get; set; }
 
         /// <summary>
-        /// Gets or sets the start position ticks that the first item should be played at
+        /// Gets or sets the start position ticks that the first item should be played at.
         /// </summary>
         /// <value>The start position ticks.</value>
         [ApiMember(Name = "StartPositionTicks", Description = "The starting position of the first item.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
@@ -39,8 +39,11 @@ namespace MediaBrowser.Model.Session
         public Guid ControllingUserId { get; set; }
 
         public int? SubtitleStreamIndex { get; set; }
+
         public int? AudioStreamIndex { get; set; }
+
         public string MediaSourceId { get; set; }
+
         public int? StartIndex { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
index 6b4cfe4f0..21bcabf1d 100644
--- a/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackProgressInfo.cs
@@ -105,6 +105,7 @@ namespace MediaBrowser.Model.Session
         public RepeatMode RepeatMode { get; set; }
 
         public QueueItem[] NowPlayingQueue { get; set; }
+
         public string PlaylistItemId { get; set; }
     }
 
@@ -118,6 +119,7 @@ namespace MediaBrowser.Model.Session
     public class QueueItem
     {
         public Guid Id { get; set; }
+
         public string PlaylistItemId { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Session/PlaybackStopInfo.cs b/MediaBrowser.Model/Session/PlaybackStopInfo.cs
index b0827ac99..aa29bb249 100644
--- a/MediaBrowser.Model/Session/PlaybackStopInfo.cs
+++ b/MediaBrowser.Model/Session/PlaybackStopInfo.cs
@@ -62,6 +62,7 @@ namespace MediaBrowser.Model.Session
         public string NextMediaType { get; set; }
 
         public string PlaylistItemId { get; set; }
+
         public QueueItem[] NowPlayingQueue { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Session/TranscodingInfo.cs b/MediaBrowser.Model/Session/TranscodingInfo.cs
index d6dc83413..e832c2f6f 100644
--- a/MediaBrowser.Model/Session/TranscodingInfo.cs
+++ b/MediaBrowser.Model/Session/TranscodingInfo.cs
@@ -8,17 +8,25 @@ namespace MediaBrowser.Model.Session
     public class TranscodingInfo
     {
         public string AudioCodec { get; set; }
+
         public string VideoCodec { get; set; }
+
         public string Container { get; set; }
+
         public bool IsVideoDirect { get; set; }
+
         public bool IsAudioDirect { get; set; }
+
         public int? Bitrate { get; set; }
 
         public float? Framerate { get; set; }
+
         public double? CompletionPercentage { get; set; }
 
         public int? Width { get; set; }
+
         public int? Height { get; set; }
+
         public int? AudioChannels { get; set; }
 
         public TranscodeReason[] TranscodeReasons { get; set; }