Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

2 files changed, 26 insertions, 1 deletions

diff --git a/MediaBrowser.Model/Entities/BaseItemInfo.cs b/MediaBrowser.Model/Entities/BaseItemInfo.cs
index faf6fd47a0..49f3e2d8ff 100644
--- a/MediaBrowser.Model/Entities/BaseItemInfo.cs
+++ b/MediaBrowser.Model/Entities/BaseItemInfo.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Runtime.Serialization;
 
 namespace MediaBrowser.Model.Entities
@@ -6,6 +7,7 @@ namespace MediaBrowser.Model.Entities
     /// <summary>
     /// This is a stub class containing only basic information about an item
     /// </summary>
+    [DebuggerDisplay("Name = {Name}, ID = {Id}, Type = {Type}")]
     public class BaseItemInfo
     {
         /// <summary>
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 1336316495..a8f751c104 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -1,9 +1,12 @@
-
+using System.Collections.Generic;
+using System.Diagnostics;
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
     /// Class MediaStream
     /// </summary>
+    [DebuggerDisplay("StreamType = {Type}")]
     public class MediaStream
     {
         /// <summary>
@@ -145,4 +148,24 @@ namespace MediaBrowser.Model.Entities
         /// </summary>
         Subtitle
     }
+
+    public class MediaInfo
+    {
+        /// <summary>
+        /// Gets or sets the media streams.
+        /// </summary>
+        /// <value>The media streams.</value>
+        public List<MediaStream> MediaStreams { get; set; }
+
+        /// <summary>
+        /// Gets or sets the format.
+        /// </summary>
+        /// <value>The format.</value>
+        public string Format { get; set; }
+
+        public MediaInfo()
+        {
+            MediaStreams = new List<MediaStream>();
+        }
+    }
 }