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

8 files changed, 92 insertions, 31 deletions

diff --git a/MediaBrowser.Controller/Dlna/ControlRequest.cs b/MediaBrowser.Controller/Dlna/ControlRequest.cs
new file mode 100644
index 000000000..74e68b7d0
--- /dev/null
+++ b/MediaBrowser.Controller/Dlna/ControlRequest.cs
@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+
+namespace MediaBrowser.Controller.Dlna
+{
+    public class ControlRequest
+    {
+        public IDictionary<string, string> Headers { get; set; }
+
+        public string InputXml { get; set; }
+
+        public ControlRequest()
+        {
+            Headers = new Dictionary<string, string>();
+        }
+    }
+
+    public class ControlResponse
+    {
+        public IDictionary<string, string> Headers { get; set; }
+
+        public string Xml { get; set; }
+
+        public ControlResponse()
+        {
+            Headers = new Dictionary<string, string>();
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Dlna/IDlnaManager.cs b/MediaBrowser.Controller/Dlna/IDlnaManager.cs
index 521d17e01..bcccaaa2e 100644
--- a/MediaBrowser.Controller/Dlna/IDlnaManager.cs
+++ b/MediaBrowser.Controller/Dlna/IDlnaManager.cs
@@ -55,5 +55,27 @@ namespace MediaBrowser.Controller.Dlna
         /// <param name="deviceInfo">The device information.</param>
         /// <returns>DeviceProfile.</returns>
         DeviceProfile GetProfile(DeviceIdentification deviceInfo);
+
+        /// <summary>
+        /// Gets the server description XML.
+        /// </summary>
+        /// <param name="headers">The headers.</param>
+        /// <param name="serverUuId">The server uu identifier.</param>
+        /// <returns>System.String.</returns>
+        string GetServerDescriptionXml(IDictionary<string, string> headers, string serverUuId);
+
+        /// <summary>
+        /// Gets the content directory XML.
+        /// </summary>
+        /// <param name="headers">The headers.</param>
+        /// <returns>System.String.</returns>
+        string GetContentDirectoryXml(IDictionary<string, string> headers);
+
+        /// <summary>
+        /// Processes the control request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        /// <returns>ControlResponse.</returns>
+        ControlResponse ProcessControlRequest(ControlRequest request);
     }
 }
diff --git a/MediaBrowser.Controller/Entities/Audio/Audio.cs b/MediaBrowser.Controller/Entities/Audio/Audio.cs
index 8eb6236d1..0ca1ffde0 100644
--- a/MediaBrowser.Controller/Entities/Audio/Audio.cs
+++ b/MediaBrowser.Controller/Entities/Audio/Audio.cs
@@ -10,7 +10,7 @@ namespace MediaBrowser.Controller.Entities.Audio
     /// <summary>
     /// Class Audio
     /// </summary>
-    public class Audio : BaseItem, IHasMediaStreams, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasLookupInfo<SongInfo>, IHasSeries
+    public class Audio : BaseItem, IHasMediaStreams, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasLookupInfo<SongInfo>
     {
         public Audio()
         {
@@ -51,15 +51,6 @@ namespace MediaBrowser.Controller.Entities.Audio
             }
         }
 
-        [IgnoreDataMember]
-        public string SeriesName
-        {
-            get
-            {
-                return Album;
-            }
-        }
-
         /// <summary>
         /// Gets or sets the artist.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
index cce241542..277ec8b78 100644
--- a/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
+++ b/MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs
@@ -11,7 +11,7 @@ namespace MediaBrowser.Controller.Entities.Audio
     /// <summary>
     /// Class MusicAlbum
     /// </summary>
-    public class MusicAlbum : Folder, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasTags, IHasLookupInfo<AlbumInfo>, IHasSeries
+    public class MusicAlbum : Folder, IHasAlbumArtist, IHasArtist, IHasMusicGenres, IHasTags, IHasLookupInfo<AlbumInfo>
     {
         public List<Guid> SoundtrackIds { get; set; }
 
@@ -67,15 +67,6 @@ namespace MediaBrowser.Controller.Entities.Audio
             }
         }
 
-        [IgnoreDataMember]
-        public string SeriesName
-        {
-            get
-            {
-                return AlbumArtist;
-            }
-        }
-
         /// <summary>
         /// Override this to true if class should be grouped under a container in indicies
         /// The container class should be defined via IndexContainer
diff --git a/MediaBrowser.Controller/LiveTv/LiveStreamInfo.cs b/MediaBrowser.Controller/LiveTv/LiveStreamInfo.cs
index 8e1f94178..019c9d31a 100644
--- a/MediaBrowser.Controller/LiveTv/LiveStreamInfo.cs
+++ b/MediaBrowser.Controller/LiveTv/LiveStreamInfo.cs
@@ -1,4 +1,6 @@
-
+using MediaBrowser.Model.Entities;
+using System.Collections.Generic;
+
 namespace MediaBrowser.Controller.LiveTv
 {
     public class LiveStreamInfo
@@ -20,5 +22,22 @@ namespace MediaBrowser.Controller.LiveTv
         /// </summary>
         /// <value>The identifier.</value>
         public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets the media container.
+        /// </summary>
+        /// <value>The media container.</value>
+        public string MediaContainer { get; set; }
+
+        /// <summary>
+        /// Gets or sets the media streams.
+        /// </summary>
+        /// <value>The media streams.</value>
+        public List<MediaStream> MediaStreams { get; set; }
+
+        public LiveStreamInfo()
+        {
+            MediaStreams = new List<MediaStream>();
+        }
     }
 }
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 3082d12ca..692a7a92e 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -78,6 +78,7 @@
     <Compile Include="Channels\Channel.cs" />
     <Compile Include="Collections\CollectionCreationOptions.cs" />
     <Compile Include="Collections\ICollectionManager.cs" />
+    <Compile Include="Dlna\ControlRequest.cs" />
     <Compile Include="Dlna\IDlnaManager.cs" />
     <Compile Include="Drawing\IImageProcessor.cs" />
     <Compile Include="Drawing\ImageFormat.cs" />
diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
index 9c757503c..8ca482b11 100644
--- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
+++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
@@ -103,8 +103,9 @@ namespace MediaBrowser.Controller.Resolvers
             ".wav",
             ".ape",
             ".ogg",
-            ".oga"
-
+            ".oga",
+            ".asf",
+            ".mp4"
         };
 
         private static readonly Dictionary<string, string> AudioFileExtensionsDictionary = AudioFileExtensions.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);
diff --git a/MediaBrowser.Controller/Session/ISessionController.cs b/MediaBrowser.Controller/Session/ISessionController.cs
index 1d5fbf359..d4612acb5 100644
--- a/MediaBrowser.Controller/Session/ISessionController.cs
+++ b/MediaBrowser.Controller/Session/ISessionController.cs
@@ -36,14 +36,6 @@ namespace MediaBrowser.Controller.Session
         Task SendPlayCommand(PlayRequest command, CancellationToken cancellationToken);
 
         /// <summary>
-        /// Sends the browse command.
-        /// </summary>
-        /// <param name="command">The command.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        Task SendBrowseCommand(BrowseRequest command, CancellationToken cancellationToken);
-
-        /// <summary>
         /// Sends the playstate command.
         /// </summary>
         /// <param name="command">The command.</param>
@@ -96,6 +88,22 @@ namespace MediaBrowser.Controller.Session
         /// <param name="cancellationToken">The cancellation token.</param>
         /// <returns>Task.</returns>
         Task SendSessionEndedNotification(SessionInfoDto sessionInfo, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Sends the playback start notification.
+        /// </summary>
+        /// <param name="sessionInfo">The session information.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task SendPlaybackStartNotification(SessionInfoDto sessionInfo, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Sends the playback start notification.
+        /// </summary>
+        /// <param name="sessionInfo">The session information.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        Task SendPlaybackStoppedNotification(SessionInfoDto sessionInfo, CancellationToken cancellationToken);
         
         /// <summary>
         /// Sends the server restart notification.