Merge remote-tracking branch 'upstream/master' into tmdb-missing-episodes

# Conflicts:
#	Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs

1 files changed, 14 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Session/PlayMethod.cs b/MediaBrowser.Model/Session/PlayMethod.cs
index 8067627843..2bd11cc91a 100644
--- a/MediaBrowser.Model/Session/PlayMethod.cs
+++ b/MediaBrowser.Model/Session/PlayMethod.cs
@@ -1,11 +1,23 @@
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Model.Session
 {
+    /// <summary>
+    /// The play method.
+    /// </summary>
     public enum PlayMethod
     {
+        /// <summary>
+        /// The media is transcoded before it is sent to the client.
+        /// </summary>
         Transcode = 0,
+
+        /// <summary>
+        /// The media is remuxed into a compatible container but the streams are not re-encoded.
+        /// </summary>
         DirectStream = 1,
+
+        /// <summary>
+        /// The media is sent to the client as-is.
+        /// </summary>
         DirectPlay = 2
     }
 }