Merge pull request #2394 from MediaBrowser/dev

Dev

Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs

@@ -138,7 +138,7 @@ namespace Emby.Server.Implementations.Activity
 
             CreateLogEntry(new ActivityLogEntry
             {
-                Name = string.Format(_localization.GetLocalizedString("UserStoppedPlayingItemWithValues"), user.Name, item.Name),
+                Name = string.Format(_localization.GetLocalizedString("UserStoppedPlayingItemWithValues"), user.Name, Notifications.Notifications.GetItemName(item)),
                 Type = "PlaybackStopped",
                 ShortOverview = string.Format(_localization.GetLocalizedString("AppDeviceValues"), e.ClientName, e.DeviceName),
                 UserId = user.Id.ToString("N")
@@ -170,7 +170,7 @@ namespace Emby.Server.Implementations.Activity
 
             CreateLogEntry(new ActivityLogEntry
             {
-                Name = string.Format(_localization.GetLocalizedString("UserStartedPlayingItemWithValues"), user.Name, item.Name),
+                Name = string.Format(_localization.GetLocalizedString("UserStartedPlayingItemWithValues"), user.Name, Notifications.Notifications.GetItemName(item)),
                 Type = "PlaybackStart",
                 ShortOverview = string.Format(_localization.GetLocalizedString("AppDeviceValues"), e.ClientName, e.DeviceName),
                 UserId = user.Id.ToString("N")
@@ -235,10 +235,6 @@ namespace Emby.Server.Implementations.Activity
             });
         }
 
-        void _logManager_LoggerLoaded(object sender, EventArgs e)
-        {
-        }
-
         void _config_NamedConfigurationUpdated(object sender, ConfigurationUpdateEventArgs e)
         {
             CreateLogEntry(new ActivityLogEntry

Emby.Server.Implementations/Data/SqliteItemRepository.cs

@@ -372,7 +372,7 @@ namespace Emby.Server.Implementations.Data
 
             userDataRepo.Initialize(WriteLock, _connection);
 
-            _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(15));
+            _shrinkMemoryTimer = _timerFactory.Create(OnShrinkMemoryTimerCallback, null, TimeSpan.FromMinutes(1), TimeSpan.FromMinutes(30));
         }
 
         private void OnShrinkMemoryTimerCallback(object state)

Emby.Server.Implementations/Notifications/Notifications.cs

@@ -430,6 +430,23 @@ namespace Emby.Server.Implementations.Notifications
             return name;
         }
 
+        public static string GetItemName(BaseItemInfo item)
+        {
+            var name = item.Name;
+
+            if (!string.IsNullOrWhiteSpace(item.SeriesName))
+            {
+                name = item.SeriesName + " - " + name;
+            }
+
+            if (item.Artists != null && item.Artists.Count > 0)
+            {
+                name = item.Artists[0] + " - " + name;
+            }
+
+            return name;
+        }
+
         async void _userManager_UserCreated(object sender, GenericEventArgs<User> e)
         {
             var notification = new NotificationRequest

MediaBrowser.Api/Playback/BaseStreamingService.cs

@@ -2741,6 +2741,10 @@ namespace MediaBrowser.Api.Playback
             {
                 return null;
             }
+            if (string.Equals(codec, "aac_latm", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
 
             return codec;
         }

MediaBrowser.Model/LiveTv/LiveTvOptions.cs

@@ -11,7 +11,6 @@ namespace MediaBrowser.Model.LiveTv
         public string RecordingPath { get; set; }
         public string MovieRecordingPath { get; set; }
         public string SeriesRecordingPath { get; set; }
-        public bool EnableAutoOrganize { get; set; }
         public bool EnableRecordingEncoding { get; set; }
         public string RecordingEncodingFormat { get; set; }
         public bool EnableRecordingSubfolders { get; set; }

MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs

@@ -316,11 +316,11 @@ namespace MediaBrowser.XbmcMetadata.Savers
 
                     if ((stream.CodecTag ?? string.Empty).IndexOf("xvid", StringComparison.OrdinalIgnoreCase) != -1)
                     {
-                        codec = "xvid;";
+                        codec = "xvid";
                     }
                     else if ((stream.CodecTag ?? string.Empty).IndexOf("divx", StringComparison.OrdinalIgnoreCase) != -1)
                     {
-                        codec = "divx;";
+                        codec = "divx";
                     }
 
                     writer.WriteElementString("codec", codec);

Nuget/MediaBrowser.Common.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.692</version>
+        <version>3.0.693</version>
         <title>Emby.Common</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>

Nuget/MediaBrowser.Server.Core.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.692</version>
+        <version>3.0.693</version>
         <title>Emby.Server.Core</title>
         <authors>Emby Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Emby Server.</description>
         <copyright>Copyright © Emby 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.692" />
+            <dependency id="MediaBrowser.Common" version="3.0.693" />
         </dependencies>
     </metadata>
     <files>