Merge remote-tracking branch 'upstream/master'

2 files changed, 19 insertions, 0 deletions

diff --git a/MediaBrowser.Model/Session/PlaybackReports.cs b/MediaBrowser.Model/Session/PlaybackReports.cs
index 24594fcb1..80524c06e 100644
--- a/MediaBrowser.Model/Session/PlaybackReports.cs
+++ b/MediaBrowser.Model/Session/PlaybackReports.cs
@@ -90,6 +90,19 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// <value>The volume level.</value>
         public int? VolumeLevel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the play method.
+        /// </summary>
+        /// <value>The play method.</value>
+        public PlayMethod PlayMethod { get; set; }
+    }
+
+    public enum PlayMethod
+    {
+        Transcode = 0,
+        DirectStream = 1,
+        DirectPlay = 2
     }
 
     /// <summary>
diff --git a/MediaBrowser.Model/Session/SessionInfoDto.cs b/MediaBrowser.Model/Session/SessionInfoDto.cs
index b9dcf996e..686af4849 100644
--- a/MediaBrowser.Model/Session/SessionInfoDto.cs
+++ b/MediaBrowser.Model/Session/SessionInfoDto.cs
@@ -233,5 +233,11 @@ namespace MediaBrowser.Model.Session
         /// </summary>
         /// <value>The now playing media version identifier.</value>
         public string MediaSourceId { get; set; }
+
+        /// <summary>
+        /// Gets or sets the play method.
+        /// </summary>
+        /// <value>The play method.</value>
+        public PlayMethod? PlayMethod { get; set; }
     }
 }