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

8 files changed, 24 insertions, 43 deletions

diff --git a/MediaBrowser.Model/Configuration/LiveTvOptions.cs b/MediaBrowser.Model/Configuration/LiveTvOptions.cs
index ae8aeb200e..575f0b8637 100644
--- a/MediaBrowser.Model/Configuration/LiveTvOptions.cs
+++ b/MediaBrowser.Model/Configuration/LiveTvOptions.cs
@@ -3,5 +3,6 @@
     public class LiveTvOptions
     {
         public int? GuideDays { get; set; }
+        public string ActiveService { get; set; }
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/NotificationType.cs b/MediaBrowser.Model/Configuration/NotificationType.cs
index 0ddcf42517..d8043b0e14 100644
--- a/MediaBrowser.Model/Configuration/NotificationType.cs
+++ b/MediaBrowser.Model/Configuration/NotificationType.cs
@@ -6,6 +6,10 @@ namespace MediaBrowser.Model.Configuration
         ApplicationUpdateInstalled,
         AudioPlayback,
         GamePlayback,
+        VideoPlayback,
+        AudioPlaybackStopped,
+        GamePlaybackStopped,
+        VideoPlaybackStopped,
         InstallationFailed,
         PluginError,
         PluginInstalled,
@@ -14,7 +18,6 @@ namespace MediaBrowser.Model.Configuration
         NewLibraryContent,
         NewLibraryContentMultiple,
         ServerRestartRequired,
-        TaskFailed,
-        VideoPlayback
+        TaskFailed
     }
 }
\ No newline at end of file
diff --git a/MediaBrowser.Model/Dlna/DeviceProfile.cs b/MediaBrowser.Model/Dlna/DeviceProfile.cs
index 42ba5840cf..a3e217ef3a 100644
--- a/MediaBrowser.Model/Dlna/DeviceProfile.cs
+++ b/MediaBrowser.Model/Dlna/DeviceProfile.cs
@@ -318,44 +318,5 @@ namespace MediaBrowser.Model.Dlna
             }
             return null;
         }
-
-        public ResponseProfile GetPhotoMediaProfile(string container, int? width, int? height)
-        {
-            container = (container ?? string.Empty).TrimStart('.');
-
-            foreach (var i in ResponseProfiles)
-            {
-                if (i.Type != DlnaProfileType.Photo)
-                {
-                    continue;
-                }
-
-                List<string> containers = i.GetContainers().ToList();
-                if (containers.Count > 0 && !containers.Contains(container, StringComparer.OrdinalIgnoreCase))
-                {
-                    continue;
-                }
-
-                ConditionProcessor conditionProcessor = new ConditionProcessor();
-
-                var anyOff = false;
-                foreach (ProfileCondition c in i.Conditions)
-                {
-                    if (!conditionProcessor.IsImageConditionSatisfied(c, width, height))
-                    {
-                        anyOff = true;
-                        break;
-                    }
-                }
-
-                if (anyOff)
-                {
-                    continue;
-                }
-
-                return i;
-            }
-            return null;
-        }
     }
 }
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index c469d97d62..9f88261841 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -134,6 +134,12 @@ namespace MediaBrowser.Model.Dto
         public string CustomRating { get; set; }
 
         /// <summary>
+        /// Gets or sets the channel identifier.
+        /// </summary>
+        /// <value>The channel identifier.</value>
+        public string ChannelId { get; set; }
+        
+        /// <summary>
         /// Gets or sets the overview.
         /// </summary>
         /// <value>The overview.</value>
diff --git a/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs b/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
index 4371ddae49..07a4b5f605 100644
--- a/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
+++ b/MediaBrowser.Model/Entities/LibraryUpdateInfo.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Entities
 {
diff --git a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
index 0a4a52cd5f..aa697fee3d 100644
--- a/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
+++ b/MediaBrowser.Model/Providers/RemoteSubtitleInfo.cs
@@ -16,4 +16,10 @@ namespace MediaBrowser.Model.Providers
         public int? DownloadCount { get; set; }
         public bool? IsHashMatch { get; set; }
     }
+
+    public class SubtitleProviderInfo
+    {
+        public string Name { get; set; }
+        public string Id { get; set; }
+    }
 }
diff --git a/MediaBrowser.Model/Querying/ItemSortBy.cs b/MediaBrowser.Model/Querying/ItemSortBy.cs
index c91e0bafa8..14b80853ac 100644
--- a/MediaBrowser.Model/Querying/ItemSortBy.cs
+++ b/MediaBrowser.Model/Querying/ItemSortBy.cs
@@ -82,5 +82,6 @@ namespace MediaBrowser.Model.Querying
         public const string Studio = "Studio";
         public const string Players = "Players";
         public const string GameSystem = "GameSystem";
+        public const string IsFavoriteOrLiked = "IsFavoriteOrLiked";
     }
 }
diff --git a/MediaBrowser.Model/Session/SessionCapabilities.cs b/MediaBrowser.Model/Session/SessionCapabilities.cs
index 290b0e4d47..767df8f1c1 100644
--- a/MediaBrowser.Model/Session/SessionCapabilities.cs
+++ b/MediaBrowser.Model/Session/SessionCapabilities.cs
@@ -8,6 +8,10 @@ namespace MediaBrowser.Model.Session
 
         public List<string> SupportedCommands { get; set; }
 
+        public bool SupportsMediaControl { get; set; }
+
+        public string MessageCallbackUrl { get; set; }
+
         public SessionCapabilities()
         {
             PlayableMediaTypes = new List<string>();