Merging in latest dev

1 files changed, 7 insertions, 7 deletions

diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
index 756ff69178..364a47945b 100644
--- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs
+++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs
@@ -97,7 +97,7 @@ namespace MediaBrowser.Server.Implementations.Dto
 
                 if (byName != null && !(item is LiveTvChannel))
                 {
-                    //if (options.Fields.Contains(ItemFields.ItemCounts))
+                    if (options.Fields.Contains(ItemFields.ItemCounts))
                     {
                         var itemFilter = byName.GetItemFilter();
 
@@ -125,7 +125,7 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             if (byName != null && !(item is LiveTvChannel))
             {
-                //if (options.Fields.Contains(ItemFields.ItemCounts))
+                if (options.Fields.Contains(ItemFields.ItemCounts))
                 {
                     var itemFilter = byName.GetItemFilter();
 
@@ -261,7 +261,7 @@ namespace MediaBrowser.Server.Implementations.Dto
                 {
                     if (user == null)
                     {
-                        dto.MediaSources = hasMediaSources.GetMediaSources(true).ToList();
+                        dto.MediaSources = _mediaSourceManager().GetStaticMediaSources(hasMediaSources, true).ToList();
                     }
                     else
                     {
@@ -269,7 +269,7 @@ namespace MediaBrowser.Server.Implementations.Dto
                     }
                 }
             }
-
+            
             if (fields.Contains(ItemFields.Studios))
             {
                 AttachStudios(dto, item);
@@ -317,7 +317,7 @@ namespace MediaBrowser.Server.Implementations.Dto
         {
             var dto = GetBaseItemDtoInternal(item, options, user);
 
-            //if (options.Fields.Contains(ItemFields.ItemCounts))
+            if (options.Fields.Contains(ItemFields.ItemCounts))
             {
                 SetItemByNameInfo(item, dto, taggedItems, user);
             }
@@ -1280,7 +1280,7 @@ namespace MediaBrowser.Server.Implementations.Dto
                     }
                     else
                     {
-                        mediaStreams = iHasMediaSources.GetMediaSources(true).First().MediaStreams;
+                        mediaStreams = _mediaSourceManager().GetStaticMediaSources(iHasMediaSources, true).First().MediaStreams;
                     }
 
                     dto.MediaStreams = mediaStreams;
@@ -1453,7 +1453,7 @@ namespace MediaBrowser.Server.Implementations.Dto
             var tvChannel = item as LiveTvChannel;
             if (tvChannel != null)
             {
-                dto.MediaSources = tvChannel.GetMediaSources(true).ToList();
+                dto.MediaSources = _mediaSourceManager().GetStaticMediaSources(tvChannel, true).ToList();
             }
 
             var channelItem = item as IChannelItem;