Merge pull request #3224 from MediaBrowser/dev

Dev

Emby.Dlna/ContentDirectory/ControlHandler.cs

@@ -1024,7 +1024,7 @@ private QueryResult<ServerItem> GetGenres(BaseItem parent, User user, InternalIt
         {
             var genresResult = _libraryManager.GetGenres(new InternalItemsQuery(user)
             {
-                AncestorIds = new[] { parent.Id.ToString("N") },
+                AncestorIds = new[] { parent.Id },
                 StartIndex = query.StartIndex,
                 Limit = query.Limit
             });
@@ -1042,7 +1042,7 @@ private QueryResult<ServerItem> GetMusicGenres(BaseItem parent, User user, Inter
         {
             var genresResult = _libraryManager.GetMusicGenres(new InternalItemsQuery(user)
             {
-                AncestorIds = new[] { parent.Id.ToString("N") },
+                AncestorIds = new[] { parent.Id },
                 StartIndex = query.StartIndex,
                 Limit = query.Limit
             });
@@ -1060,7 +1060,7 @@ private QueryResult<ServerItem> GetMusicAlbumArtists(BaseItem parent, User user,
         {
             var artists = _libraryManager.GetAlbumArtists(new InternalItemsQuery(user)
             {
-                AncestorIds = new[] { parent.Id.ToString("N") },
+                AncestorIds = new[] { parent.Id },
                 StartIndex = query.StartIndex,
                 Limit = query.Limit
             });
@@ -1078,7 +1078,7 @@ private QueryResult<ServerItem> GetMusicArtists(BaseItem parent, User user, Inte
         {
             var artists = _libraryManager.GetArtists(new InternalItemsQuery(user)
             {
-                AncestorIds = new[] { parent.Id.ToString("N") },
+                AncestorIds = new[] { parent.Id },
                 StartIndex = query.StartIndex,
                 Limit = query.Limit
             });
@@ -1096,7 +1096,7 @@ private QueryResult<ServerItem> GetFavoriteArtists(BaseItem parent, User user, I
         {
             var artists = _libraryManager.GetArtists(new InternalItemsQuery(user)
             {
-                AncestorIds = new[] { parent.Id.ToString("N") },
+                AncestorIds = new[] { parent.Id },
                 StartIndex = query.StartIndex,
                 Limit = query.Limit,
                 IsFavorite = true
@@ -1195,7 +1195,7 @@ private QueryResult<ServerItem> GetMusicArtistItems(BaseItem item, Guid? parentI
             {
                 Recursive = true,
                 ParentId = parentId,
-                ArtistIds = new[] { item.Id.ToString("N") },
+                ArtistIds = new[] { item.Id },
                 IncludeItemTypes = new[] { typeof(MusicAlbum).Name },
                 Limit = limit,
                 StartIndex = startIndex,
@@ -1215,7 +1215,7 @@ private QueryResult<ServerItem> GetGenreItems(BaseItem item, Guid? parentId, Use
             {
                 Recursive = true,
                 ParentId = parentId,
-                GenreIds = new[] { item.Id.ToString("N") },
+                GenreIds = new[] { item.Id },
                 IncludeItemTypes = new[] { typeof(Movie).Name, typeof(Series).Name },
                 Limit = limit,
                 StartIndex = startIndex,
@@ -1235,7 +1235,7 @@ private QueryResult<ServerItem> GetMusicGenreItems(BaseItem item, Guid? parentId
             {
                 Recursive = true,
                 ParentId = parentId,
-                GenreIds = new[] { item.Id.ToString("N") },
+                GenreIds = new[] { item.Id },
                 IncludeItemTypes = new[] { typeof(MusicAlbum).Name },
                 Limit = limit,
                 StartIndex = startIndex,
@@ -1291,7 +1291,7 @@ private QueryResult<ServerItem> GetItemsFromPerson(Person person, User user, int
         {
             var itemsResult = _libraryManager.GetItemsResult(new InternalItemsQuery(user)
             {
-                PersonIds = new[] { person.Id.ToString("N") },
+                PersonIds = new[] { person.Id },
                 IncludeItemTypes = new[] { typeof(Movie).Name, typeof(Series).Name, typeof(Trailer).Name },
                 OrderBy = new[] { ItemSortBy.SortName }.Select(i => new Tuple<string, SortOrder>(i, SortOrder.Ascending)).ToArray(),
                 Limit = limit,

Emby.Dlna/Didl/DidlBuilder.cs

@@ -161,11 +161,11 @@ public void WriteItemElement(DlnaOptions options,
             {
                 if (string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase))
                 {
-                    AddAudioResource(options, writer, hasMediaSources, deviceId, filter, streamInfo);
+                    AddAudioResource(options, writer, item, deviceId, filter, streamInfo);
                 }
                 else if (string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase))
                 {
-                    AddVideoResource(options, writer, hasMediaSources, deviceId, filter, streamInfo);
+                    AddVideoResource(options, writer, item, deviceId, filter, streamInfo);
                 }
             }
 
@@ -196,7 +196,7 @@ private string GetMimeType(string input)
             return mime;
         }
 
-        private void AddVideoResource(DlnaOptions options, XmlWriter writer, IHasMediaSources video, string deviceId, Filter filter, StreamInfo streamInfo = null)
+        private void AddVideoResource(DlnaOptions options, XmlWriter writer, BaseItem video, string deviceId, Filter filter, StreamInfo streamInfo = null)
         {
             if (streamInfo == null)
             {
@@ -303,7 +303,7 @@ private bool AddSubtitleElement(XmlWriter writer, SubtitleStreamInfo info)
             return true;
         }
 
-        private void AddVideoResource(XmlWriter writer, IHasMediaSources video, string deviceId, Filter filter, string contentFeatures, StreamInfo streamInfo)
+        private void AddVideoResource(XmlWriter writer, BaseItem video, string deviceId, Filter filter, string contentFeatures, StreamInfo streamInfo)
         {
             writer.WriteStartElement(string.Empty, "res", NS_DIDL);
 
@@ -501,7 +501,7 @@ private string GetDisplayName(BaseItem item, StubType? itemStubType, BaseItem co
             return item.Name;
         }
 
-        private void AddAudioResource(DlnaOptions options, XmlWriter writer, IHasMediaSources audio, string deviceId, Filter filter, StreamInfo streamInfo = null)
+        private void AddAudioResource(DlnaOptions options, XmlWriter writer, BaseItem audio, string deviceId, Filter filter, StreamInfo streamInfo = null)
         {
             writer.WriteStartElement(string.Empty, "res", NS_DIDL);
 
@@ -1183,7 +1183,7 @@ public static string GetClientId(Guid idValue, StubType? stubType)
             return id;
         }
 
-        public static string GetClientId(IHasMediaSources item)
+        public static string GetClientId(BaseItem item)
         {
             var id = item.Id.ToString("N");
 

Emby.Dlna/DlnaManager.cs

@@ -595,7 +595,6 @@ private void DumpProfiles()
 
         public void Dispose()
         {
-            GC.SuppressFinalize(this);
         }
     }
 }

Emby.Dlna/Main/DlnaEntryPoint.cs

@@ -364,7 +364,6 @@ public void Dispose()
                 _communicationsServer.Dispose();
                 _communicationsServer = null;
             }
-            GC.SuppressFinalize(this);
         }
 
         public void DisposeDevicePublisher()

Emby.Dlna/PlayTo/Device.cs

@@ -1147,7 +1147,6 @@ public void Dispose()
                 _disposed = true;
 
                 DisposeTimer();
-                GC.SuppressFinalize(this);
             }
         }
 

Emby.Dlna/PlayTo/PlayToController.cs

@@ -465,7 +465,7 @@ private PlaylistItem CreatePlaylistItem(BaseItem item, User user, long startPost
 
             var hasMediaSources = item as IHasMediaSources;
             var mediaSources = hasMediaSources != null
-                ? (_mediaSourceManager.GetStaticMediaSources(hasMediaSources, true, user))
+                ? (_mediaSourceManager.GetStaticMediaSources(item, true, user))
                 : new List<MediaSourceInfo>();
 
             var playlistItem = GetPlaylistItem(item, mediaSources, profile, _session.DeviceId, mediaSourceId, audioStreamIndex, subtitleStreamIndex);
@@ -644,7 +644,6 @@ public void Dispose()
                 _device.OnDeviceUnavailable = null;
 
                 _device.Dispose();
-                GC.SuppressFinalize(this);
             }
         }
 
@@ -831,7 +830,7 @@ public async Task<MediaSourceInfo> GetMediaSource(CancellationToken cancellation
                     return null;
                 }
 
-                MediaSource = await _mediaSourceManager.GetMediaSource(hasMediaSources, MediaSourceId, LiveStreamId, false, cancellationToken).ConfigureAwait(false);
+                MediaSource = await _mediaSourceManager.GetMediaSource(Item, MediaSourceId, LiveStreamId, false, cancellationToken).ConfigureAwait(false);
 
                 return MediaSource;
             }

Emby.Dlna/PlayTo/PlayToManager.cs

@@ -258,7 +258,6 @@ public void Dispose()
             }
 
             _disposed = true;
-            GC.SuppressFinalize(this);
         }
     }
 }

Emby.Dlna/Profiles/SamsungSmartTvProfile.cs

@@ -42,7 +42,7 @@ public SamsungSmartTvProfile()
                },
                new TranscodingProfile
                {
-                   Container = "ts,mpegts",
+                   Container = "ts",
                    AudioCodec = "ac3",
                    VideoCodec = "h264",
                    Type = DlnaProfileType.Video,

Emby.Dlna/Profiles/Xml/Samsung Smart TV.xml

@@ -50,7 +50,7 @@
   </DirectPlayProfiles>
   <TranscodingProfiles>
     <TranscodingProfile container="mp3" type="Audio" audioCodec="mp3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
-    <TranscodingProfile container="ts,mpegts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
+    <TranscodingProfile container="ts" type="Video" videoCodec="h264" audioCodec="ac3" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
     <TranscodingProfile container="jpeg" type="Photo" estimateContentLength="false" enableMpegtsM2TsMode="false" transcodeSeekInfo="Auto" copyTimestamps="false" context="Streaming" enableSubtitlesInManifest="false" minSegments="0" segmentLength="0" breakOnNonKeyFrames="false" />
   </TranscodingProfiles>
   <ContainerProfiles>

Emby.Drawing.ImageMagick/ImageMagickEncoder.cs

@@ -328,7 +328,6 @@ public void Dispose()
         {
             _disposed = true;
             Wand.CloseEnvironment();
-            GC.SuppressFinalize(this);
         }
 
         private void CheckDisposed()

Emby.Drawing.Skia/StripCollageBuilder.cs

@@ -83,7 +83,6 @@ private SKBitmap BuildThumbCollageBitmap(string[] paths, int width, int height)
 
                 for (int i = 0; i < 4; i++)
                 {
-                    SKCodecOrigin origin;
                     int newIndex;
 
                     using (var currentBitmap = GetNextValidImage(paths, imageIndex, out newIndex))
@@ -108,7 +107,12 @@ private SKBitmap BuildThumbCollageBitmap(string[] paths, int width, int height)
                                 using (var subset = image.Subset(SKRectI.Create(ix, 0, iSlice, iHeight)))
                                 {
                                     // draw image onto canvas
-                                    canvas.DrawImage(subset, (horizontalImagePadding * (i + 1)) + (iSlice * i), verticalSpacing);
+                                    canvas.DrawImage(subset ?? image, (horizontalImagePadding * (i + 1)) + (iSlice * i), verticalSpacing);
+
+                                    if (subset == null)
+                                    {
+                                        continue;
+                                    }
 
                                     using (var croppedBitmap = SKBitmap.FromImage(subset))
                                     {

Emby.Drawing/ImageProcessor.cs

@@ -912,8 +912,6 @@ public void Dispose()
             {
                 disposable.Dispose();
             }
-
-            GC.SuppressFinalize(this);
         }
 
         private void CheckDisposed()

Emby.Server.Implementations/Activity/ActivityLogEntryPoint.cs

@@ -491,7 +491,6 @@ public void Dispose()
             //_logManager.LoggerLoaded -= _logManager_LoggerLoaded;
 
             _appHost.ApplicationUpdated -= _appHost_ApplicationUpdated;
-            GC.SuppressFinalize(this);
         }
 
         /// <summary>

Emby.Server.Implementations/ApplicationHost.cs

@@ -974,7 +974,7 @@ protected void RegisterResources()
 
             var deviceRepo = new SqliteDeviceRepository(LogManager.GetLogger("DeviceManager"), ServerConfigurationManager, FileSystemManager, JsonSerializer);
             deviceRepo.Initialize();
-            DeviceManager = new DeviceManager(deviceRepo, UserManager, FileSystemManager, LibraryMonitor, ServerConfigurationManager, LogManager.GetLogger("DeviceManager"), NetworkManager);
+            DeviceManager = new DeviceManager(deviceRepo, LibraryManager, LocalizationManager, UserManager, FileSystemManager, LibraryMonitor, ServerConfigurationManager, LogManager.GetLogger("DeviceManager"), NetworkManager);
             RegisterSingleInstance<IDeviceRepository>(deviceRepo);
             RegisterSingleInstance(DeviceManager);
 
@@ -996,7 +996,7 @@ protected void RegisterResources()
             var connectionManager = new ConnectionManager(dlnaManager, ServerConfigurationManager, LogManager.GetLogger("UpnpConnectionManager"), HttpClient, new XmlReaderSettingsFactory());
             RegisterSingleInstance<IConnectionManager>(connectionManager);
 
-            CollectionManager = new CollectionManager(LibraryManager, FileSystemManager, LibraryMonitor, LogManager.GetLogger("CollectionManager"), ProviderManager);
+            CollectionManager = new CollectionManager(LibraryManager, ApplicationPaths, LocalizationManager, FileSystemManager, LibraryMonitor, LogManager.GetLogger("CollectionManager"), ProviderManager);
             RegisterSingleInstance(CollectionManager);
 
             PlaylistManager = new PlaylistManager(LibraryManager, FileSystemManager, LibraryMonitor, LogManager.GetLogger("PlaylistManager"), UserManager, ProviderManager);
@@ -2379,7 +2379,6 @@ public void Dispose()
                 _disposed = true;
 
                 Dispose(true);
-                GC.SuppressFinalize(this);
             }
         }
 

Emby.Server.Implementations/Channels/ChannelDynamicMediaSourceProvider.cs

@@ -18,13 +18,11 @@ public ChannelDynamicMediaSourceProvider(IChannelManager channelManager)
             _channelManager = (ChannelManager)channelManager;
         }
 
-        public Task<IEnumerable<MediaSourceInfo>> GetMediaSources(IHasMediaSources item, CancellationToken cancellationToken)
+        public Task<IEnumerable<MediaSourceInfo>> GetMediaSources(BaseItem item, CancellationToken cancellationToken)
         {
-            var baseItem = (BaseItem)item;
-
-            if (baseItem.SourceType == SourceType.Channel)
+            if (item.SourceType == SourceType.Channel)
             {
-                return _channelManager.GetDynamicMediaSources(baseItem, cancellationToken);
+                return _channelManager.GetDynamicMediaSources(item, cancellationToken);
             }
 
             return Task.FromResult<IEnumerable<MediaSourceInfo>>(new List<MediaSourceInfo>());

Emby.Server.Implementations/Channels/ChannelManager.cs

@@ -313,7 +313,7 @@ public async Task RefreshChannels(IProgress<double> progress, CancellationToken
 
         private Channel GetChannelEntity(IChannel channel)
         {
-            var item = GetChannel(GetInternalChannelId(channel.Name).ToString("N"));
+            var item = GetChannel(GetInternalChannelId(channel.Name));
 
             if (item == null)
             {
@@ -510,6 +510,11 @@ private string GetOfficialRating(ChannelParentalRating rating)
             }
         }
 
+        public Channel GetChannel(Guid id)
+        {
+            return _libraryManager.GetItemById(id) as Channel;
+        }
+
         public Channel GetChannel(string id)
         {
             return _libraryManager.GetItemById(id) as Channel;
@@ -610,7 +615,7 @@ public async Task<QueryResult<BaseItem>> GetLatestChannelItemsInternal(InternalI
                 // Avoid implicitly captured closure
                 var ids = query.ChannelIds;
                 channels = channels
-                    .Where(i => ids.Contains(GetInternalChannelId(i.Name).ToString("N")))
+                    .Where(i => ids.Contains(GetInternalChannelId(i.Name)))
                     .ToArray();
             }
 
@@ -656,7 +661,7 @@ private async Task RefreshLatestChannelItems(IChannel channel, CancellationToken
             var query = new InternalItemsQuery();
             query.Parent = internalChannel;
             query.EnableTotalRecordCount = false;
-            query.ChannelIds = new string[] { internalChannel.Id.ToString("N") };
+            query.ChannelIds = new Guid[] { internalChannel.Id };
 
             var result = await GetChannelItemsInternal(query, new SimpleProgress<double>(), cancellationToken).ConfigureAwait(false);
 
@@ -670,7 +675,7 @@ await GetChannelItemsInternal(new InternalItemsQuery
                     {
                         Parent = folder,
                         EnableTotalRecordCount = false,
-                        ChannelIds = new string[] { internalChannel.Id.ToString("N") }
+                        ChannelIds = new Guid[] { internalChannel.Id }
 
                     }, new SimpleProgress<double>(), cancellationToken).ConfigureAwait(false);
                 }
@@ -704,7 +709,7 @@ public async Task<QueryResult<BaseItem>> GetChannelItemsInternal(InternalItemsQu
             {
                 query.Parent = channel;
             }
-            query.ChannelIds = new string[] { };
+            query.ChannelIds = new Guid[] { };
 
             // Not yet sure why this is causing a problem
             query.GroupByPresentationUniqueKey = false;

Emby.Server.Implementations/Channels/ChannelPostScanTask.cs

@@ -69,7 +69,7 @@ private void CleanChannel(Guid id, CancellationToken cancellationToken)
             // Delete all channel items
             var allIds = _libraryManager.GetItemIds(new InternalItemsQuery
             {
-                ChannelIds = new[] { id.ToString("N") }
+                ChannelIds = new[] { id }
             });
 
             foreach (var deleteId in allIds)